Restructured for new style RPMs, etc. Can build all the RPMs from a

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 3cc6ae6f3cd98c82432f8b754bc68106559fd717..7dedea8ec4691131a1b455c55e2ced8e58baa936 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -17,11 +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)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-       CPPUNIT_LIBS="$(CPPUNIT_LIBS)" 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: ###
 
@@ -29,7 +30,7 @@ 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 memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splitter statbar tab 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 memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
 
 clean: 
        -if exist .\*.o del .\*.o
@@ -94,6 +95,7 @@ clean:
        $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C tab -f makefile.gcc $(MAKEARGS) clean
@@ -291,6 +293,9 @@ sockets:
 sound: 
        $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all
 
+splash: 
+       $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all
+
 splitter: 
        $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all
 
@@ -330,4 +335,4 @@ 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 memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+.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 memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard