fix for dmc compilation of projects with more than one obj

[wxWidgets.git] / samples / sockets / makefile.g95

diff --git a/samples/sockets/makefile.g95 b/samples/sockets/makefile.g95
index 4d1b5983be0ad53921b97162a22f0d923ce61726..9b24b9725db22b53e91b72d81761d31fa4be2881 100644 (file)
--- a/samples/sockets/makefile.g95
+++ b/samples/sockets/makefile.g95
@@ -1,46 +1,19 @@
 #
 #

-# File:                makefile.unx
+# File:                makefile.g95

 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 # Makefile for server/client example (UNIX).
 
 #
 # "%W% %G%"
 #
 # 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)
-       $(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)
-       $(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:
 
 clean:

-       rm -f $(OBJECTS) server$(GUISUFFIX).exe client$(GUISUFFIX).exe core *.rsc *.res
+       make -f client.g95 clean
+       make -f server.g95 clean
+