Fixed/simplified Makefile

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

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 0a740e42d48c6c6a2d7ef2e00d741f1ac9dd2198..dc49e5273281650fc3129ff88b9691e32bb71ec0 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -12,31 +12,16 @@
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/sockets
-# 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/sockets # ':' for autoconf
 
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c .cxx
+# PROGRAM=minimal
 
-.cpp.o :
-       $(CXX) -c $(CXXFLAGS) -o $@ $<
+OBJECTS =$(PROGRAM).o
+DEPFILES=$(PROGRAM).d
 
-# Set defaults from configure
-include ../../src/make.env
+# this can't be called all
+dummy:
+       $(MAKE) PROGRAM=client all
+       $(MAKE) PROGRAM=server all
 
-all:   client@PROGRAM_EXT@ server@PROGRAM_EXT@
-
-sockets_resources.o:  sockets.rc
-       $(RESCOMP) -i $< -o $@ $(RESFLAGS)
-
-client@PROGRAM_EXT@:   client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o
-       $(CXX) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS)
-
-server@PROGRAM_EXT@:   server.o ../../lib/@WX_TARGET_LIBRARY@
-       $(CXX) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)
-
-clean:
-       rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core
+include ../../src/makeprog.env