Fix for VA 4.0

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

diff --git a/samples/typetest/makefile.g95 b/samples/typetest/makefile.g95
index 692a5095ad483a2d69f355d9dbbf0e66fae10565..9d067c2c70194454b515070104165ffe371932bb 100644 (file)
--- a/samples/typetest/makefile.g95
+++ b/samples/typetest/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 typetest example (UNIX).
+# 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)/typetest.$(OBJSUFF) $(OBJDIR)/typetest_resources.$(OBJSUFF)
-
-all:    $(OBJDIR) typetest$(GUISUFFIX)$(EXESUFF)
-
-wx:
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-typetest$(GUISUFFIX)$(EXESUFF):        $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o typetest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
-
-$(OBJDIR)/typetest.$(OBJSUFF): typetest.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ typetest.$(SRCSUFF)
+TARGET=typetest
+OBJECTS = $(TARGET).o
 
-$(OBJDIR)/typetest_resources.o:  typetest.rc
-       $(RESCOMP) -i typetest.rc -o $(OBJDIR)/typetest_resources.o $(RESFLAGS)
+include $(WXDIR)/src/makeprog.g95
 
-clean:
-       rm -f $(OBJECTS) typetest$(GUISUFFIX).exe core *.rsc *.res