From 73d28bdf3b40ab1624ef34e0562001e8788ca196 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Oct 2008 15:29:00 +0000 Subject: [PATCH] don't build memcheck (fails in release) and MFC (fails if MFC is not available) samples by default (#10031) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/makefile.bcc | 22 +++++++++++----------- samples/makefile.gcc | 12 ++++++------ samples/makefile.vc | 18 +++++++++--------- samples/makefile.wat | 18 +++++++++--------- samples/samples.bkl | 11 +++++++---- 5 files changed, 42 insertions(+), 39 deletions(-) diff --git a/samples/makefile.bcc b/samples/makefile.bcc index 40ad637370..1806d00a9d 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview 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 propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer clean: -if exist .\*.obj del .\*.obj @@ -198,10 +198,6 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mediaplayer.bat call mediaplayer.bat @del mediaplayer.bat - @echo cd memcheck >memcheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat - call memcheck.bat - @del memcheck.bat @echo cd menu >menu.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat call menu.bat @@ -346,6 +342,10 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat call mfc.bat @del mfc.bat + @echo cd memcheck >memcheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat + call memcheck.bat + @del memcheck.bat access: @echo cd access >access.bat @@ -569,12 +569,6 @@ mediaplayer: call mediaplayer.bat @del mediaplayer.bat -memcheck: - @echo cd memcheck >memcheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat - call memcheck.bat - @del memcheck.bat - menu: @echo cd menu >menu.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>menu.bat @@ -791,3 +785,9 @@ mfc: call mfc.bat @del mfc.bat +memcheck: + @echo cd memcheck >memcheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat + call memcheck.bat + @del memcheck.bat + diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 5e5f0961ff..7a0cd93ef1 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview 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 propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer clean: -if exist .\*.o del .\*.o @@ -77,7 +77,6 @@ clean: $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) clean @@ -114,6 +113,7 @@ clean: $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean access: $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all @@ -226,9 +226,6 @@ mdi: mediaplayer: $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all -memcheck: - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all - menu: $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all @@ -337,7 +334,10 @@ wrapsizer: mfc: $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview 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 propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +memcheck: + $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc memcheck SHELL := $(COMSPEC) diff --git a/samples/makefile.vc b/samples/makefile.vc index 83c3ca79cc..c6eb7996bc 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -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_dialogs sub_dialup sub_display sub_dnd sub_docview 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_propgrid 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_wrapsizer 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_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_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_propgrid 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_wrapsizer clean: -if exist .\*.obj del .\*.obj @@ -151,9 +151,6 @@ clean: cd mediaplayer $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" cd menu $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" @@ -262,6 +259,9 @@ clean: cd mfc $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" + cd memcheck + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" sub_access: cd access @@ -448,11 +448,6 @@ sub_mediaplayer: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -sub_memcheck: - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - sub_menu: cd menu $(MAKE) -f makefile.vc $(MAKEARGS) all @@ -633,3 +628,8 @@ sub_mfc: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +sub_memcheck: + cd memcheck + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/samples/makefile.wat b/samples/makefile.wat index 92e5acb772..2243d08b62 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -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 dialogs dialup display dnd docview 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 propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -167,9 +167,6 @@ clean : .SYMBOLIC cd mediaplayer wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) - cd memcheck - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) cd menu wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) @@ -278,6 +275,9 @@ clean : .SYMBOLIC cd mfc wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + cd memcheck + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) access : .SYMBOLIC cd access @@ -464,11 +464,6 @@ mediaplayer : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) -memcheck : .SYMBOLIC - cd memcheck - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - menu : .SYMBOLIC cd menu wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all @@ -649,3 +644,8 @@ mfc : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) +memcheck : .SYMBOLIC + cd memcheck + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/samples/samples.bkl b/samples/samples.bkl index 72aa66c28f..eef819235a 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -4,8 +4,11 @@ -