fix for dmc compilation of projects with more than one obj

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

diff --git a/samples/taskbar/makefile.g95 b/samples/taskbar/makefile.g95
index a26fef6cd7f63d559a2557197383a4202b678f48..6243ce86d19c13e705af7922efe2eb2d06fdcd8c 100644 (file)
--- a/samples/taskbar/makefile.g95
+++ b/samples/taskbar/makefile.g95
@@ -1,37 +1,16 @@
 #
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
 #
-# "%W% %G%"
-#
-# Makefile for taskbar example
+# Makefile for wxWindows sample (Cygwin/Mingw32).
 
 WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/makeg95.env
-
-OBJECTS = $(OBJDIR)/tbtest.$(OBJSUFF) $(OBJDIR)/tbtest_resources.$(OBJSUFF)
-
-all:    $(OBJDIR) tbtest$(GUISUFFIX)$(EXESUFF)
-
-wx:
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-tbtest$(GUISUFFIX)$(EXESUFF):  $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o tbtest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
-
-$(OBJDIR)/tbtest.$(OBJSUFF):   tbtest.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ tbtest.$(SRCSUFF)
+TARGET=tbtest
+OBJECTS = $(TARGET).o
 
-$(OBJDIR)/tbtest_resources.o:  tbtest.rc
-       $(RESCOMP) -i tbtest.rc -o $(OBJDIR)/tbtest_resources.o $(RESFLAGS)
+include $(WXDIR)/src/makeprog.g95
 
-clean:
-       rm -f $(OBJECTS) tbtest$(GUISUFFIX).exe core *.rsc *.res