From 9604c99ddf511a151e3b27b8b85a08d66c52ba7c Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 24 Oct 2007 19:42:40 +0000 Subject: [PATCH] makefiels updated to reflect removal of db sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/makefile.bcc | 15 ++------------- samples/makefile.gcc | 10 +++------- samples/makefile.vc | 12 ++---------- samples/makefile.wat | 12 ++---------- samples/samples.bkl | 1 - samples/samples.dsw | 12 ------------ 6 files changed, 9 insertions(+), 53 deletions(-) diff --git a/samples/makefile.bcc b/samples/makefile.bcc index 83c90d1018..386efc25cf 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -29,8 +29,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" \ - -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ @@ -44,7 +43,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### 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 .\*.obj del .\*.obj @@ -98,10 +97,6 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dataview.bat call dataview.bat @del dataview.bat - @echo cd db >db.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>db.bat - call db.bat - @del db.bat @echo cd dialogs >dialogs.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialogs.bat call dialogs.bat @@ -419,12 +414,6 @@ dataview: call dataview.bat @del dataview.bat -db: - @echo cd db >db.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>db.bat - call db.bat - @del db.bat - dialogs: @echo cd dialogs >dialogs.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialogs.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 1b300a9905..eb6ac66c11 100644 --- 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: diff --git a/samples/makefile.vc b/samples/makefile.vc index b55c8ed908..4ee7e2a15a 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -20,7 +20,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)" \ @@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ ### Targets: ### -all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc +all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc clean: -if exist .\*.obj del .\*.obj @@ -76,9 +76,6 @@ clean: cd dataview $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) - cd db - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd $(MAKEDIR) cd dialogs $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) @@ -323,11 +320,6 @@ sub_dataview: $(MAKE) -f makefile.vc $(MAKEARGS) all cd $(MAKEDIR) -sub_db: - cd db - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd $(MAKEDIR) - sub_dialogs: cd dialogs $(MAKE) -f makefile.vc $(MAKEARGS) all diff --git a/samples/makefile.wat b/samples/makefile.wat index 8f6aaf3117..5e94eba91e 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -37,7 +37,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)" & @@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & ### Targets: ### -all : .SYMBOLIC 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 : .SYMBOLIC 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 : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -92,9 +92,6 @@ clean : .SYMBOLIC cd dataview wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) - cd db - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) cd dialogs wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) @@ -339,11 +336,6 @@ dataview : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) -db : .SYMBOLIC - cd db - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - dialogs : .SYMBOLIC cd dialogs wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all diff --git a/samples/samples.bkl b/samples/samples.bkl index f18dc98779..adefdb639e 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -22,7 +22,6 @@ - diff --git a/samples/samples.dsw b/samples/samples.dsw index 4cdb7b40bb..a2b86b7a00 100644 --- a/samples/samples.dsw +++ b/samples/samples.dsw @@ -111,18 +111,6 @@ Package=<4> ############################################################################### -Project: "db"=.\db\db.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "dialogs"=.\dialogs\dialogs.dsp - Package Owner=<4> Package=<5> -- 2.45.2