generated makefiles after qa library creation

[wxWidgets.git] / src / makeprog.g95

diff --git a/src/makeprog.g95 b/src/makeprog.g95
index 391881439cbb9c2f580e397865f56da319d9f0ab..adc0ab29288efc165790e5137c445ab36faee40f 100644 (file)
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -7,17 +7,26 @@
 #
 # Include file for Cygwin/Mingw32 samples
 
-WXDIR = $(WXWIN)
+# WXDIR = $(WXWIN)
 
 include $(WXDIR)/src/makeg95.env
 
 all:    $(TARGET)$(GUISUFFIX)$(EXESUFF) $(TARGET)_resources.$(OBJSUFF) $(EXTRATARGETS)
 
 $(TARGET)$(GUISUFFIX)$(EXESUFF):       $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(WXLIB)
-       $(CC) $(LDFLAGS) -o $(TARGET)$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(LDLIBS)
+       $(CXX) $(ALL_LDFLAGS) -o $(TARGET)$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(LDLIBS)
 
 $(TARGET)_resources.o:  $(TARGET).rc
        $(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
 
 clean:
-       rm -f $(OBJECTS) $(TARGET)_resources.o $(TARGET).exe core *.rsc *.res
+       -$(RM) *.o
+       -$(RM) $(TARGET)_resources.o
+       -$(RM) core
+       -$(RM) *.rsc
+       -$(RM) *.res
+       -$(RM) *.exe
+
+cleanall: clean
+       -$(RM) $(TARGET).exe
+