[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / makeprog.g95

diff --git a/src/makeprog.g95 b/src/makeprog.g95
index fbe21342f660f26fc320c9f6ead9bd2ef394a5ed..adc0ab29288efc165790e5137c445ab36faee40f 100644 (file)
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -14,15 +14,19 @@ 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 *.o
-       rm -f $(TARGET)_resources.o
-       rm -f $(TARGET).exe 
-       rm -f core 
-       rm -f *.rsc
-       rm -f *.res
+       -$(RM) *.o
+       -$(RM) $(TARGET)_resources.o
+       -$(RM) core
+       -$(RM) *.rsc
+       -$(RM) *.res
+       -$(RM) *.exe
+
+cleanall: clean
+       -$(RM) $(TARGET).exe
+