Don't prematurely return from Create before appending the choices, and etc.

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 1b300a9905be32a439937a63a4bdbc1e4d6c1b46..eb6ac66c11c97a4613b505ca64888f3f71f5c85d 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -19,7 +19,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_OPENGL="$(USE_OPENGL)" 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)" \
@@ -33,7 +33,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: access animate artprov aui calendar caret collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean: 
        -if exist .\*.o del .\*.o
@@ -50,7 +50,6 @@ clean:
        $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C db -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean
@@ -149,9 +148,6 @@ controls:
 dataview: 
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all
 
-db: 
-       $(MAKE) -C db -f makefile.gcc $(MAKEARGS) all
-
 dialogs: 
        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all
 
@@ -335,7 +331,7 @@ wizard:
 mfc: 
        $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 
 # Dependencies tracking: