From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Fri, 23 Nov 2001 21:28:12 +0000 (+0000)
Subject: corrected makefiles following suggestion by MBN
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/846e4632b4a36c39efa991c1293eef21a98b5633

corrected makefiles following suggestion by MBN


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 9789fc0116..8e567db52c 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -12,28 +12,20 @@
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/ipc
-# the comment at the end of the next line is needed because otherwise autoconf
-# would remove this line completely - it contains a built-in hack to remove
-# any VPATH assignment not containing ':'
-VPATH = @PATH_IFS@$(top_srcdir)/samples/ipc # ':' for autoconf
 
-# Clears all default suffixes
-.SUFFIXES:	.o .cpp .c .cxx
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d
 
-.cpp.o :
-	$(CXX) -c $(CXXFLAGS) -o $@ $<
+# this target can't be called all
+all-both:
+	$(MAKE) PROGRAM=client all
+	$(MAKE) PROGRAM=server all
 
-# Set defaults from configure
-include ../../src/make.env
+# this target can't be called clean
+clean-both:
+	$(MAKE) PROGRAM=client clean
+	$(MAKE) PROGRAM=server clean
 
-all:	client server
-
-client:	client.o ../../lib/@WX_TARGET_LIBRARY@
-	$(CXX) $(LDFLAGS) -o client client.o $(LDLIBS)
-
-server:	server.o ../../lib/@WX_TARGET_LIBRARY@
-	$(CXX) $(LDFLAGS) -o server server.o $(LDLIBS)
-
-clean:
-	rm -f $(OBJECTS) $(PROGRAM) core
+include ../../src/makeprog.env
 
+-include $(DEPFILES)
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index dc49e52732..6ae9a0aa19 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -13,15 +13,19 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/sockets
 
-# PROGRAM=minimal
-
 OBJECTS =$(PROGRAM).o
 DEPFILES=$(PROGRAM).d
 
-# this can't be called all
-dummy:
+# this target can't be called all
+all-both:
 	$(MAKE) PROGRAM=client all
 	$(MAKE) PROGRAM=server all
 
+# this target can't be called clean
+clean-both:
+	$(MAKE) PROGRAM=client clean
+	$(MAKE) PROGRAM=server clean
+
 include ../../src/makeprog.env
 
+-include $(DEPFILES)