From 2b8f02fcc6bcd21dce57da7062db94d3ce8c913a Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Tue, 8 Aug 2006 20:46:49 +0000
Subject: [PATCH] Synchronize the gcc makefiles; make sure the demos are
 stripped; remove redundant strip commands.

---
 dos/gccdos.mak      | 6 ++----
 win32/gccwin32.mak  | 6 +++++-
 win32/mingwin32.mak | 6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dos/gccdos.mak b/dos/gccdos.mak
index 438fa7e7..1fd5f498 100644
--- a/dos/gccdos.mak
+++ b/dos/gccdos.mak
@@ -54,7 +54,7 @@ PDCLIBS		= $(LIBCURSES) $(LIBPANEL)
 ################################################################################
 .PHONY: all libs clean demos dist
 
-all:	$(PDCLIBS) $(DEMOS)
+all:	libs demos
 
 libs:	$(PDCLIBS)
 
@@ -65,6 +65,7 @@ clean:
 	-del *.exe
 
 demos:	$(DEMOS)
+	strip *.exe
 
 #------------------------------------------------------------------------
 
@@ -97,15 +98,12 @@ $(PANOBJS) : %.o: $(pandir)/%.c
 firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe: \
 %.exe: $(demodir)/%.c
 	$(CC) $(CCFLAGS) -o$@ $< $(LIBCURSES)
-	strip $@
 
 ptest.exe: $(demodir)/ptest.c $(PANEL_HEADER) $(LIBPANEL)
 	$(CC) $(CCFLAGS) -o$@ $< $(LIBCURSES) $(LIBPANEL)
-	strip $@
 
 tuidemo.exe: tuidemo.o tui.o
 	$(LINK) $(LDFLAGS) -o$@ tuidemo.o tui.o $(LIBCURSES)
-	strip $@
 
 tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H)
 	$(CC) -c $(CCFLAGS) -I$(demodir) -o$@ $<
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index 3babf6c1..34fb2f98 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -50,7 +50,11 @@ LIBPANEL	= panel.a
 PDCLIBS		= $(LIBCURSES) $(LIBPANEL)
 
 ################################################################################
-all:	$(PDCLIBS) $(DEMOS)
+.PHONY: all libs clean demos dist
+
+all:	libs demos
+
+libs:	$(PDCLIBS)
 
 clean:
 	-rm -f *.o
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index 716fe8de..91afdec4 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -50,7 +50,11 @@ LIBPANEL	= panel.a
 PDCLIBS		= $(LIBCURSES) $(LIBPANEL)
 
 ################################################################################
-all:	$(PDCLIBS) $(DEMOS)
+.PHONY: all libs clean demos dist
+
+all:	libs demos
+
+libs:	$(PDCLIBS)
 
 clean:
 	-del *.o