bakefile time!! (Mainly stuff for wxCocoa)

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 6982e0c86a61bbf2ec7ab2815ac8a57ce495f1c3..8ef3711f8dfa1657e8fff17417860ab059b1d1a8 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -17,10 +17,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        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)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       GCC_VERSION="$(GCC_VERSION)"
+       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
+       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -32,6 +34,11 @@ all: configtool emulator helpview tex2rtf helpgen
 
 clean: 
        -if exist .\*.o del .\*.o
+       $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) clean
 
 configtool: 
        $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all