set m_encoding in wxCSConv ctor from name

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

diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc
index 877a8ee15bd0b27c9a8231b8b899ac580dc8b55a..70b0401dd29c1e0d747bd8a832eeec34707c596f 100644 (file)
--- a/samples/html/makefile.gcc
+++ b/samples/html/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -17,10 +17,13 @@ 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_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       GCC_VERSION="$(GCC_VERSION)"
+       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+       USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
+       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: ###
 
@@ -32,6 +35,15 @@ all: about help helpview printing test virtual widget zip
 
 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 printing -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C test -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) clean
 
 about: 
        $(MAKE) -C about -f makefile.gcc $(MAKEARGS) all
@@ -58,3 +70,7 @@ zip:
        $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean about help helpview printing test virtual widget zip
+
+
+# Dependencies tracking:
+-include ./*.d