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 9789fc0116628f7f6d2cee34c300f1560abc2225..8e567db52c035817df946e44ffe920ebeacc32b8 100644 (file)
--- 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 dc49e5273281650fc3129ff88b9691e32bb71ec0..6ae9a0aa19853db8e64f9db4678adab6d6035dff 100644 (file)
--- 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)