fix for wxFrame parent which somehow wasn't committed yesterday

[wxWidgets.git] / samples / sockets / Makefile.in

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index ed5f74b03dc779080be2878fe3abe7f6a123e9c2..0a740e42d48c6c6a2d7ef2e00d741f1ac9dd2198 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -9,31 +9,34 @@
 #
 # Makefile for wxsocket example (UNIX).
 
-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
 top_builddir = ../..
-program_dir = samples/wxsocket
+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/wxsocket # ':' for autoconf
+VPATH = @PATH_IFS@$(top_srcdir)/samples/sockets # ':' for autoconf
 
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
 .cpp.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) -o $@ $<
 
 # Set defaults from configure
 include ../../src/make.env
 
-all:   client server
+all:   client@PROGRAM_EXT@ server@PROGRAM_EXT@
 
-client:        client.o ../../lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o client client.o $(LDLIBS)
+sockets_resources.o:  sockets.rc
+       $(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
-server:        server.o ../../lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o server server.o $(LDLIBS)
+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 $(OBJECTS) $(PROGRAM) core
+       rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core