Rationalised Cygwin sample makefiles

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

samples/dde/client.g95

@@ -0,0 +1,16 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../..
+
+TARGET=client
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+

samples/dde/ddesetup.h

@@ -15,7 +15,12 @@
  */
 
 // If 1, use real DDE. If 0, use TCP/IP
+
+#ifdef __WXMSW__
+#define wxUSE_DDE_FOR_SAMPLE 1
+#else
 #define wxUSE_DDE_FOR_SAMPLE 0
+#endif
 
 #if wxUSE_DDE_FOR_SAMPLE
 

samples/dde/makefile.g95

@@ -1,5 +1,5 @@
 #
-# File:		makefile.unx
+# File:		makefile.g95
 # Author:	Julian Smart
 # Created:	1993
 # Updated:	
@@ -9,38 +9,11 @@
 #
 # Makefile for server/client example (UNIX).
 
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/makeg95.env
-
-OBJECTS=$(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF)\
- $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF)
-
-all:	$(OBJDIR) server$(GUISUFFIX) client$(GUISUFFIX)
-
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-server$(GUISUFFIX): $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o server$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(LDLIBS)
-
-$(OBJDIR)/server.$(OBJSUFF):        server.$(SRCSUFF) server.h
-	$(CC) -c $(CPPFLAGS) -o $@ server.$(SRCSUFF)
-
-client$(GUISUFFIX): $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o client$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(LDLIBS)
-
-$(OBJDIR)/client.$(OBJSUFF):        client.$(SRCSUFF) client.h
-	$(CC) -c $(CPPFLAGS) -o $@ client.$(SRCSUFF)
-        
-$(OBJDIR)/server_resources.o:  server.rc
-	$(RESCOMP) -i server.rc -o $(OBJDIR)/server_resources.o $(RESFLAGS)
-
-$(OBJDIR)/client_resources.o:  client.rc
-	$(RESCOMP) -i client.rc -o $(OBJDIR)/client_resources.o $(RESFLAGS)
+all:
+	make -f client.g95 all
+	make -f server.g95 all
 
 clean:
-	rm -f $(OBJECTS) server$(GUISUFFIX).exe client$(GUISUFFIX).exe core *.rsc *.res
+	make -f client.g95 clean
+	make -f server.g95 clean
+

samples/dde/server.g95

@@ -0,0 +1,16 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../..
+
+TARGET=server
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+