Simplified html reading because previous one caused conflicts in wxUSE_STL=1.

[wxWidgets.git] / demos / makefile.gcc

diff --git a/demos/makefile.gcc b/demos/makefile.gcc
index 9a6c38b8df92c46b4ec76bba32c7ae251aeaffb8..2af13aa1f8aa747e0a319fbe43430f63deedb7a6 100644 (file)
--- a/demos/makefile.gcc
+++ b/demos/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,15 +12,16 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" MONOLITHIC="$(MONOLITHIC)" \
-       CXXFLAGS="$(CXXFLAGS)" VENDOR="$(VENDOR)" GCC_VERSION="$(GCC_VERSION)" \
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" LDFLAGS="$(LDFLAGS)" \
-       USE_OPENGL="$(USE_OPENGL)" DEBUG_FLAG="$(DEBUG_FLAG)" UNICODE="$(UNICODE)" \
-       CC="$(CC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
-       DEBUG_INFO="$(DEBUG_INFO)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
-       CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
-       USE_ODBC="$(USE_ODBC)"
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" 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)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       VENDOR="$(VENDOR)" CFG="$(CFG)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -30,11 +31,17 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" MONOLITHIC="$(MONOLITHIC)" \
 
 all: bombs dbbrowse forty fractal life poem
 
-bombs: 
-       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all
-
 clean: 
        -if exist .\*.o del .\*.o
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C dbbrowse -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean
+
+bombs: 
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all
 
 dbbrowse: 
        $(MAKE) -C dbbrowse -f makefile.gcc $(MAKEARGS) all
@@ -51,4 +58,4 @@ life:
 poem: 
        $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all bombs clean dbbrowse forty fractal life poem
+.PHONY: all clean bombs dbbrowse forty fractal life poem