rename the menu to avoid conflict with a standard Mac menu

[wxWidgets.git] / samples / html / makefile.gcc

diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc
index b15379e04f43b02d8fe14f635b1c4e3d2539c2a6..f011502cc149e12752692b47d47ae35204edcead 100644 (file)
--- a/samples/html/makefile.gcc
+++ b/samples/html/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -13,14 +13,19 @@ include ../../build/msw/config.gcc
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 ### 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)" \
        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)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       GCC_VERSION="$(GCC_VERSION)"
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
+       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" 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: ###
 
 
 ### Conditionally set variables: ###
 


@@ -32,6 +37,7 @@ all: about help helpview printing test virtual widget zip
 
 clean: 
        -if exist .\*.o del .\*.o
 
 clean: 
        -if exist .\*.o del .\*.o

+       -if exist .\*.d del .\*.d

        $(MAKE) -C about -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C about -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) clean


@@ -66,3 +72,7 @@ zip:
        $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean about help helpview printing test virtual widget zip
        $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean about help helpview printing test virtual widget zip

+
+
+# Dependencies tracking:
+-include ./*.d