Unix compilation fixes after last commit

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index cdde0658d6d090fff1333163db9bde4dbefaebb8..5d3083684fa54e10743d7d7982f2c94a35afb3a1 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -13,7 +13,7 @@ include ../build/msw/config.gcc
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
@@ -31,10 +31,11 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean: 
        -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
        $(MAKE) -C access -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
@@ -74,7 +75,6 @@ clean:
        $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) clean
@@ -90,7 +90,6 @@ clean:
        $(MAKE) -C propsize -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C richedit -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean
@@ -111,6 +110,7 @@ clean:
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
 
 access: 
        $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all
@@ -229,9 +229,6 @@ memcheck:
 menu: 
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
 
-mfc: 
-       $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
-
 minifram: 
        $(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) all
 
@@ -277,9 +274,6 @@ regtest:
 render: 
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
 
-richedit: 
-       $(MAKE) -C richedit -f makefile.gcc $(MAKEARGS) all
-
 rotate: 
        $(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) all
 
@@ -340,6 +334,11 @@ widgets:
 wizard: 
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+mfc: 
+       $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 
+# Dependencies tracking:
+-include ./*.d