Fix HTML-dependent samples being compiled when USE_HTML=0

Fixes #17780

samples/makefile.bcc

@@ -41,11 +41,29 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Conditionally set variables: ###
 
+!if "$(USE_HTML)" == "1"
+__aui___depname = aui
+!endif
+!if "$(USE_HTML)" == "1"
+__help___depname = help
+!endif
+!if "$(USE_HTML)" == "1"
+__htlbox___depname = htlbox
+!endif
+!if "$(USE_HTML)" == "1"
+__html___depname = html
+!endif
+!if "$(USE_HTML)" == "1"
+__richtext___depname = richtext
+!endif
+!if "$(USE_HTML)" == "1"
+__xrc___depname = xrc
+!endif
 
 
 ### Targets: ###
 
-all: access animate artprov aui calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc
+all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -394,11 +412,13 @@ artprov:
 	call artprov.bat
 	@del artprov.bat
 
+!if "$(USE_HTML)" == "1"
 aui: 
 	@echo cd aui >aui.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat
 	call aui.bat
 	@del aui.bat
+!endif
 
 calendar: 
 	@echo cd calendar >calendar.bat
@@ -532,23 +552,29 @@ grid:
 	call grid.bat
 	@del grid.bat
 
+!if "$(USE_HTML)" == "1"
 help: 
 	@echo cd help >help.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat
 	call help.bat
 	@del help.bat
+!endif
 
+!if "$(USE_HTML)" == "1"
 htlbox: 
 	@echo cd htlbox >htlbox.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat
 	call htlbox.bat
 	@del htlbox.bat
+!endif
 
+!if "$(USE_HTML)" == "1"
 html: 
 	@echo cd html >html.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat
 	call html.bat
 	@del html.bat
+!endif
 
 image: 
 	@echo cd image >image.bat
@@ -694,11 +720,13 @@ ribbon:
 	call ribbon.bat
 	@del ribbon.bat
 
+!if "$(USE_HTML)" == "1"
 richtext: 
 	@echo cd richtext >richtext.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat
 	call richtext.bat
 	@del richtext.bat
+!endif
 
 sashtest: 
 	@echo cd sashtest >sashtest.bat
@@ -850,11 +878,13 @@ wrapsizer:
 	call wrapsizer.bat
 	@del wrapsizer.bat
 
+!if "$(USE_HTML)" == "1"
 xrc: 
 	@echo cd xrc >xrc.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat
 	call xrc.bat
 	@del xrc.bat
+!endif
 
 memcheck: 
 	@echo cd memcheck >memcheck.bat

samples/makefile.gcc

@@ -34,11 +34,29 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 
 ### Conditionally set variables: ###
 
+ifeq ($(USE_HTML),1)
+__aui___depname = aui
+endif
+ifeq ($(USE_HTML),1)
+__help___depname = help
+endif
+ifeq ($(USE_HTML),1)
+__htlbox___depname = htlbox
+endif
+ifeq ($(USE_HTML),1)
+__html___depname = html
+endif
+ifeq ($(USE_HTML),1)
+__richtext___depname = richtext
+endif
+ifeq ($(USE_HTML),1)
+__xrc___depname = xrc
+endif
 
 
 ### Targets: ###
 
-all: access animate artprov aui calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc
+all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname)
 
 clean: 
 	-if exist .\*.o del .\*.o
@@ -134,8 +152,10 @@ animate:
 artprov: 
 	$(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all
 
+ifeq ($(USE_HTML),1)
 aui: 
 	$(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all
+endif
 
 calendar: 
 	$(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all
@@ -203,14 +223,20 @@ font:
 grid: 
 	$(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all
 
+ifeq ($(USE_HTML),1)
 help: 
 	$(MAKE) -C help -f makefile.gcc $(MAKEARGS) all
+endif
 
+ifeq ($(USE_HTML),1)
 htlbox: 
 	$(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all
+endif
 
+ifeq ($(USE_HTML),1)
 html: 
 	$(MAKE) -C html -f makefile.gcc $(MAKEARGS) all
+endif
 
 image: 
 	$(MAKE) -C image -f makefile.gcc $(MAKEARGS) all
@@ -284,8 +310,10 @@ render:
 ribbon: 
 	$(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all
 
+ifeq ($(USE_HTML),1)
 richtext: 
 	$(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
+endif
 
 sashtest: 
 	$(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all
@@ -362,8 +390,10 @@ wizard:
 wrapsizer: 
 	$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
 
+ifeq ($(USE_HTML),1)
 xrc: 
 	$(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all
+endif
 
 memcheck: 
 	$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all

samples/makefile.vc

@@ -32,11 +32,29 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Conditionally set variables: ###
 
+!if "$(USE_HTML)" == "1"
+__aui___depname = sub_aui
+!endif
+!if "$(USE_HTML)" == "1"
+__help___depname = sub_help
+!endif
+!if "$(USE_HTML)" == "1"
+__htlbox___depname = sub_htlbox
+!endif
+!if "$(USE_HTML)" == "1"
+__html___depname = sub_html
+!endif
+!if "$(USE_HTML)" == "1"
+__richtext___depname = sub_richtext
+!endif
+!if "$(USE_HTML)" == "1"
+__xrc___depname = sub_xrc
+!endif
 
 
 ### Targets: ###
 
-all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec 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_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer sub_xrc
+all: sub_access sub_animate sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -307,10 +325,12 @@ sub_artprov:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+!if "$(USE_HTML)" == "1"
 sub_aui: 
 	cd aui
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
+!endif
 
 sub_calendar: 
 	cd calendar
@@ -422,20 +442,26 @@ sub_grid:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+!if "$(USE_HTML)" == "1"
 sub_help: 
 	cd help
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
+!endif
 
+!if "$(USE_HTML)" == "1"
 sub_htlbox: 
 	cd htlbox
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
+!endif
 
+!if "$(USE_HTML)" == "1"
 sub_html: 
 	cd html
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
+!endif
 
 sub_image: 
 	cd image
@@ -557,10 +583,12 @@ sub_ribbon:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+!if "$(USE_HTML)" == "1"
 sub_richtext: 
 	cd richtext
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
+!endif
 
 sub_sashtest: 
 	cd sashtest
@@ -687,10 +715,12 @@ sub_wrapsizer:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+!if "$(USE_HTML)" == "1"
 sub_xrc: 
 	cd xrc
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
+!endif
 
 sub_flash: 
 	cd flash

samples/samples.bkl

@@ -15,7 +15,7 @@
     <subproject id="access" template="sub"/>
     <subproject id="animate" template="sub"/>
     <subproject id="artprov" template="sub"/>
-    <subproject id="aui" template="sub"/>
+    <subproject id="aui" template="sub" cond="USE_HTML=='1'"/>
     <subproject id="calendar" template="sub"/>
     <subproject id="caret" template="sub"/>
     <subproject id="clipboard" template="sub"/>
@@ -38,9 +38,9 @@
     <subproject id="exec" template="sub"/>
     <subproject id="font" template="sub"/>
     <subproject id="grid" template="sub"/>
-    <subproject id="help" template="sub"/>
+    <subproject id="help" template="sub" cond="USE_HTML=='1'"/>
-    <subproject id="htlbox" template="sub"/>
+    <subproject id="htlbox" template="sub" cond="USE_HTML=='1'"/>
-    <subproject id="html" template="sub"/>
+    <subproject id="html" template="sub" cond="USE_HTML=='1'"/>
     <subproject id="image" template="sub"/>
     <subproject id="internat" template="sub"/>
     <subproject id="ipc" template="sub"/>
@@ -65,7 +65,7 @@
     <subproject id="regtest" template="sub"/>
     <subproject id="render" template="sub"/>
     <subproject id="ribbon" template="sub"/>
-    <subproject id="richtext" template="sub"/>
+    <subproject id="richtext" template="sub" cond="USE_HTML=='1'"/>
     <subproject id="sashtest" template="sub"/>
     <subproject id="scroll" template="sub"/>
     <subproject id="secretstore" template="sub"/>
@@ -91,7 +91,7 @@
     <subproject id="widgets" template="sub"/>
     <subproject id="wizard" template="sub"/>
     <subproject id="wrapsizer" template="sub"/>
-    <subproject id="xrc" template="sub"/>
+    <subproject id="xrc" template="sub" cond="USE_HTML=='1'"/>
 
     <!--
         These samples don't always build (they need non-default wxWidgets