From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 7 Aug 2003 13:18:33 +0000 (+0000)
Subject: added all samples
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f820e98de02ee9c5d34f28372a2324d9b2909f6c?ds=inline

added all samples


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 1438286935..c30bd028ae 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
-!include ../build/config.bcc
+!include ../build/msw/config.bcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -23,32 +23,384 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Conditionally set variables: ###
 
-!if "$(USE_GUI)" == "0"
-__console___depname = console
-!endif
+
+MAKEARGS = 
 
 
 ### Targets: ###
 
-all: artprov $(__console___depname) dialogs image minimal
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg newgrid notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
+
+access: 
+	cd access
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
 
 artprov: 
-	(cd artprov && $(MAKE) all)
+	cd artprov
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+calendar: 
+	cd calendar
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+caret: 
+	cd caret
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+checklst: 
+	cd checklst
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
 
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
 
-!if "$(USE_GUI)" == "0"
+config: 
+	cd config
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
 console: 
-	(cd console && $(MAKE) all)
-!endif
+	cd console
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+controls: 
+	cd controls
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+db: 
+	cd db
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
 
 dialogs: 
-	(cd dialogs && $(MAKE) all)
+	cd dialogs
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+dialup: 
+	cd dialup
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+display: 
+	cd display
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+dnd: 
+	cd dnd
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+docview: 
+	cd docview
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+docvwmdi: 
+	cd docvwmdi
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+dragimag: 
+	cd dragimag
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+drawing: 
+	cd drawing
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+dynamic: 
+	cd dynamic
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+erase: 
+	cd erase
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+event: 
+	cd event
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+exec: 
+	cd exec
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+font: 
+	cd font
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+grid: 
+	cd grid
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+help: 
+	cd help
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+htlbox: 
+	cd htlbox
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+html: 
+	cd html
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
 
 image: 
-	(cd image && $(MAKE) all)
+	cd image
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+internat: 
+	cd internat
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+ipc: 
+	cd ipc
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+joytest: 
+	cd joytest
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+keyboard: 
+	cd keyboard
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+layout: 
+	cd layout
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+listbox: 
+	cd listbox
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+listctrl: 
+	cd listctrl
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+mdi: 
+	cd mdi
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+memcheck: 
+	cd memcheck
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+menu: 
+	cd menu
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+mfc: 
+	cd mfc
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+minifram: 
+	cd minifram
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
 
 minimal: 
-	(cd minimal && $(MAKE) all)
+	cd minimal
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+mobile: 
+	cd mobile
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+multimon: 
+	cd multimon
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+nativdlg: 
+	cd nativdlg
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+newgrid: 
+	cd newgrid
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+notebook: 
+	cd notebook
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+oleauto: 
+	cd oleauto
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+opengl: 
+	cd opengl
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+ownerdrw: 
+	cd ownerdrw
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+png: 
+	cd png
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+printing: 
+	cd printing
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+propsize: 
+	cd propsize
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+regtest: 
+	cd regtest
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+render: 
+	cd render
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+richedit: 
+	cd richedit
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+rotate: 
+	cd rotate
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+sashtest: 
+	cd sashtest
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+scroll: 
+	cd scroll
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+scrollsub: 
+	cd scrollsub
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+shaped: 
+	cd shaped
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+sockets: 
+	cd sockets
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+splitter: 
+	cd splitter
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+statbar: 
+	cd statbar
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+tab: 
+	cd tab
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+taskbar: 
+	cd taskbar
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+text: 
+	cd text
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+thread: 
+	cd thread
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+toolbar: 
+	cd toolbar
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+treectrl: 
+	cd treectrl
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+typetest: 
+	cd typetest
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+validate: 
+	cd validate
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+vscroll: 
+	cd vscroll
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+widgets: 
+	cd widgets
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+wizard: 
+	cd wizard
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
+
+wxtest: 
+	cd wxtest
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..
diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index e8758318e3..a0eaffc08a 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../build/config.gcc
+include ../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -15,33 +15,237 @@ include ../build/config.gcc
 
 ### Conditionally set variables: ###
 
-ifeq ($(USE_GUI),0)
-__console___depname = console
-endif
+
+MAKEARGS = GCC_VERSION=$(GCC_VERSION)
 
 
 ### Targets: ###
 
-all: artprov $(__console___depname) dialogs image minimal
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg newgrid notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
+
+access: 
+	$(MAKE) -C access -f makefile.gcc $(MAKEARGS) all
 
 artprov: 
-	(cd artprov && $(MAKE) all)
+	$(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all
+
+calendar: 
+	$(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all
+
+caret: 
+	$(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all
+
+checklst: 
+	$(MAKE) -C checklst -f makefile.gcc $(MAKEARGS) all
 
 clean: 
 	-if exist .\*.o del .\*.o
 
-ifeq ($(USE_GUI),0)
+config: 
+	$(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
+
 console: 
-	(cd console && $(MAKE) all)
-endif
+	$(MAKE) -C console -f makefile.gcc $(MAKEARGS) all
+
+controls: 
+	$(MAKE) -C controls -f makefile.gcc $(MAKEARGS) all
+
+db: 
+	$(MAKE) -C db -f makefile.gcc $(MAKEARGS) all
 
 dialogs: 
-	(cd dialogs && $(MAKE) all)
+	$(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all
+
+dialup: 
+	$(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) all
+
+display: 
+	$(MAKE) -C display -f makefile.gcc $(MAKEARGS) all
+
+dnd: 
+	$(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) all
+
+docview: 
+	$(MAKE) -C docview -f makefile.gcc $(MAKEARGS) all
+
+docvwmdi: 
+	$(MAKE) -C docvwmdi -f makefile.gcc $(MAKEARGS) all
+
+dragimag: 
+	$(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) all
+
+drawing: 
+	$(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all
+
+dynamic: 
+	$(MAKE) -C dynamic -f makefile.gcc $(MAKEARGS) all
+
+erase: 
+	$(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all
+
+event: 
+	$(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
+
+exec: 
+	$(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
+
+font: 
+	$(MAKE) -C font -f makefile.gcc $(MAKEARGS) all
+
+grid: 
+	$(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all
+
+help: 
+	$(MAKE) -C help -f makefile.gcc $(MAKEARGS) all
+
+htlbox: 
+	$(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all
+
+html: 
+	$(MAKE) -C html -f makefile.gcc $(MAKEARGS) all
 
 image: 
-	(cd image && $(MAKE) all)
+	$(MAKE) -C image -f makefile.gcc $(MAKEARGS) all
+
+internat: 
+	$(MAKE) -C internat -f makefile.gcc $(MAKEARGS) all
+
+ipc: 
+	$(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) all
+
+joytest: 
+	$(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) all
+
+keyboard: 
+	$(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) all
+
+layout: 
+	$(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all
+
+listbox: 
+	$(MAKE) -C listbox -f makefile.gcc $(MAKEARGS) all
+
+listctrl: 
+	$(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all
+
+mdi: 
+	$(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all
+
+memcheck: 
+	$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
+
+menu: 
+	$(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
+
+mfc: 
+	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
+
+minifram: 
+	$(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) all
 
 minimal: 
-	(cd minimal && $(MAKE) all)
+	$(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all
+
+mobile: 
+	$(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) all
+
+multimon: 
+	$(MAKE) -C multimon -f makefile.gcc $(MAKEARGS) all
+
+nativdlg: 
+	$(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
+
+newgrid: 
+	$(MAKE) -C newgrid -f makefile.gcc $(MAKEARGS) all
+
+notebook: 
+	$(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all
+
+oleauto: 
+	$(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) all
+
+opengl: 
+	$(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) all
+
+ownerdrw: 
+	$(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all
+
+png: 
+	$(MAKE) -C png -f makefile.gcc $(MAKEARGS) all
+
+printing: 
+	$(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
+
+propsize: 
+	$(MAKE) -C propsize -f makefile.gcc $(MAKEARGS) all
+
+regtest: 
+	$(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all
+
+render: 
+	$(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
+
+richedit: 
+	$(MAKE) -C richedit -f makefile.gcc $(MAKEARGS) all
+
+rotate: 
+	$(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) all
+
+sashtest: 
+	$(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all
+
+scroll: 
+	$(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all
+
+scrollsub: 
+	$(MAKE) -C scrollsub -f makefile.gcc $(MAKEARGS) all
+
+shaped: 
+	$(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all
+
+sockets: 
+	$(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) all
+
+splitter: 
+	$(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all
+
+statbar: 
+	$(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all
+
+tab: 
+	$(MAKE) -C tab -f makefile.gcc $(MAKEARGS) all
+
+taskbar: 
+	$(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all
+
+text: 
+	$(MAKE) -C text -f makefile.gcc $(MAKEARGS) all
+
+thread: 
+	$(MAKE) -C thread -f makefile.gcc $(MAKEARGS) all
+
+toolbar: 
+	$(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) all
+
+treectrl: 
+	$(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) all
+
+typetest: 
+	$(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all
+
+validate: 
+	$(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all
+
+vscroll: 
+	$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all
+
+widgets: 
+	$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all
+
+wizard: 
+	$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
+
+wxtest: 
+	$(MAKE) -C wxtest -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all artprov clean console dialogs image minimal
+.PHONY: all access artprov calendar caret checklst clean config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg newgrid notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
diff --git a/samples/makefile.vc b/samples/makefile.vc
index f39195e31e..9c8dace661 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include <../build/config.vc>
+!include <../build/msw/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -15,42 +15,382 @@
 
 ### Conditionally set variables: ###
 
-!if "$(USE_GUI)" == "0"
-__console___depname = console
-!endif
 
 
 ### Targets: ###
 
-all: artprov $(__console___depname) dialogs image minimal
+all: sub_access sub_artprov sub_calendar sub_caret sub_checklst sub_config sub_console sub_controls sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event 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_listbox sub_listctrl sub_mdi sub_memcheck sub_menu sub_mfc sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_newgrid sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_printing sub_propsize sub_regtest sub_render sub_richedit sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_splitter sub_statbar sub_tab sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wxtest
 
-artprov: 
+sub_access: 
+	cd access
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_artprov: 
 	cd artprov
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_calendar: 
+	cd calendar
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_caret: 
+	cd caret
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_checklst: 
+	cd checklst
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
 	cd $(MAKEDIR)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
 
-!if "$(USE_GUI)" == "0"
-console: 
+sub_config: 
+	cd config
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_console: 
 	cd console
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_controls: 
+	cd controls
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_db: 
+	cd db
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
 	cd $(MAKEDIR)
-!endif
 
-dialogs: 
+sub_dialogs: 
 	cd dialogs
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_dialup: 
+	cd dialup
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_display: 
+	cd display
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
 	cd $(MAKEDIR)
 
-image: 
+sub_dnd: 
+	cd dnd
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_docview: 
+	cd docview
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_docvwmdi: 
+	cd docvwmdi
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_dragimag: 
+	cd dragimag
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_drawing: 
+	cd drawing
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_dynamic: 
+	cd dynamic
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_erase: 
+	cd erase
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_event: 
+	cd event
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_exec: 
+	cd exec
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_font: 
+	cd font
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_grid: 
+	cd grid
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_help: 
+	cd help
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_htlbox: 
+	cd htlbox
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_html: 
+	cd html
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_image: 
 	cd image
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_internat: 
+	cd internat
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_ipc: 
+	cd ipc
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_joytest: 
+	cd joytest
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_keyboard: 
+	cd keyboard
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_layout: 
+	cd layout
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_listbox: 
+	cd listbox
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_listctrl: 
+	cd listctrl
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_mdi: 
+	cd mdi
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_memcheck: 
+	cd memcheck
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_menu: 
+	cd menu
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_mfc: 
+	cd mfc
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_minifram: 
+	cd minifram
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
 	cd $(MAKEDIR)
 
-minimal: 
+sub_minimal: 
 	cd minimal
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_mobile: 
+	cd mobile
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_multimon: 
+	cd multimon
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_nativdlg: 
+	cd nativdlg
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_newgrid: 
+	cd newgrid
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_notebook: 
+	cd notebook
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_oleauto: 
+	cd oleauto
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_opengl: 
+	cd opengl
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_ownerdrw: 
+	cd ownerdrw
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_png: 
+	cd png
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_printing: 
+	cd printing
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_propsize: 
+	cd propsize
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_regtest: 
+	cd regtest
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_render: 
+	cd render
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_richedit: 
+	cd richedit
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_rotate: 
+	cd rotate
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_sashtest: 
+	cd sashtest
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_scroll: 
+	cd scroll
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_scrollsub: 
+	cd scrollsub
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_shaped: 
+	cd shaped
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_sockets: 
+	cd sockets
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_splitter: 
+	cd splitter
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_statbar: 
+	cd statbar
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_tab: 
+	cd tab
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_taskbar: 
+	cd taskbar
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_text: 
+	cd text
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_thread: 
+	cd thread
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_toolbar: 
+	cd toolbar
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_treectrl: 
+	cd treectrl
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_typetest: 
+	cd typetest
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_validate: 
+	cd validate
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_vscroll: 
+	cd vscroll
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_widgets: 
+	cd widgets
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_wizard: 
+	cd wizard
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
+sub_wxtest: 
+	cd wxtest
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
 	cd $(MAKEDIR)
diff --git a/samples/makefile.wat b/samples/makefile.wat
index 8de333b285..d83b533fd3 100644
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../build/config.wat
+!include ../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -27,23 +27,40 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
-__console___depname =
-!ifeq USE_GUI 0
-__console___depname = console
-!endif
 
 ### Variables: ###
 
 
+MAKEARGS = 
 
 
 ### Targets: ###
 
-all : .SYMBOLIC artprov $(__console___depname) dialogs image minimal
+all : .SYMBOLIC access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg newgrid notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
+
+access : .SYMBOLIC 
+	cd access
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
 
 artprov : .SYMBOLIC 
 	cd artprov
-	wmake $(__MAKEOPTS__) all
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+calendar : .SYMBOLIC 
+	cd calendar
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+caret : .SYMBOLIC 
+	cd caret
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+checklst : .SYMBOLIC 
+	cd checklst
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
 clean : .SYMBOLIC 
@@ -52,24 +69,347 @@ clean : .SYMBOLIC
 	-if exist .\*.lbc del .\*.lbc
 	-if exist .\*.ilk del .\*.ilk
 
-!ifeq USE_GUI 0
+config : .SYMBOLIC 
+	cd config
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
 console : .SYMBOLIC 
 	cd console
-	wmake $(__MAKEOPTS__) all
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+controls : .SYMBOLIC 
+	cd controls
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+db : .SYMBOLIC 
+	cd db
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
-!endif
 
 dialogs : .SYMBOLIC 
 	cd dialogs
-	wmake $(__MAKEOPTS__) all
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+dialup : .SYMBOLIC 
+	cd dialup
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+display : .SYMBOLIC 
+	cd display
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+dnd : .SYMBOLIC 
+	cd dnd
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+docview : .SYMBOLIC 
+	cd docview
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+docvwmdi : .SYMBOLIC 
+	cd docvwmdi
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+dragimag : .SYMBOLIC 
+	cd dragimag
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+drawing : .SYMBOLIC 
+	cd drawing
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+dynamic : .SYMBOLIC 
+	cd dynamic
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+erase : .SYMBOLIC 
+	cd erase
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+event : .SYMBOLIC 
+	cd event
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+exec : .SYMBOLIC 
+	cd exec
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+font : .SYMBOLIC 
+	cd font
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+grid : .SYMBOLIC 
+	cd grid
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+help : .SYMBOLIC 
+	cd help
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+htlbox : .SYMBOLIC 
+	cd htlbox
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+html : .SYMBOLIC 
+	cd html
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
 image : .SYMBOLIC 
 	cd image
-	wmake $(__MAKEOPTS__) all
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+internat : .SYMBOLIC 
+	cd internat
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+ipc : .SYMBOLIC 
+	cd ipc
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+joytest : .SYMBOLIC 
+	cd joytest
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+keyboard : .SYMBOLIC 
+	cd keyboard
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+layout : .SYMBOLIC 
+	cd layout
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+listbox : .SYMBOLIC 
+	cd listbox
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+listctrl : .SYMBOLIC 
+	cd listctrl
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+mdi : .SYMBOLIC 
+	cd mdi
+	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
+	cd $(WATCOM_CWD)
+
+mfc : .SYMBOLIC 
+	cd mfc
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+minifram : .SYMBOLIC 
+	cd minifram
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
 minimal : .SYMBOLIC 
 	cd minimal
-	wmake $(__MAKEOPTS__) all
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+mobile : .SYMBOLIC 
+	cd mobile
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+multimon : .SYMBOLIC 
+	cd multimon
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+nativdlg : .SYMBOLIC 
+	cd nativdlg
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+newgrid : .SYMBOLIC 
+	cd newgrid
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+notebook : .SYMBOLIC 
+	cd notebook
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+oleauto : .SYMBOLIC 
+	cd oleauto
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+opengl : .SYMBOLIC 
+	cd opengl
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+ownerdrw : .SYMBOLIC 
+	cd ownerdrw
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+png : .SYMBOLIC 
+	cd png
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+printing : .SYMBOLIC 
+	cd printing
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+propsize : .SYMBOLIC 
+	cd propsize
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+regtest : .SYMBOLIC 
+	cd regtest
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+render : .SYMBOLIC 
+	cd render
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+richedit : .SYMBOLIC 
+	cd richedit
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+rotate : .SYMBOLIC 
+	cd rotate
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+sashtest : .SYMBOLIC 
+	cd sashtest
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+scroll : .SYMBOLIC 
+	cd scroll
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+scrollsub : .SYMBOLIC 
+	cd scrollsub
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+shaped : .SYMBOLIC 
+	cd shaped
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+sockets : .SYMBOLIC 
+	cd sockets
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+splitter : .SYMBOLIC 
+	cd splitter
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+statbar : .SYMBOLIC 
+	cd statbar
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+tab : .SYMBOLIC 
+	cd tab
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+taskbar : .SYMBOLIC 
+	cd taskbar
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+text : .SYMBOLIC 
+	cd text
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+thread : .SYMBOLIC 
+	cd thread
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+toolbar : .SYMBOLIC 
+	cd toolbar
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+treectrl : .SYMBOLIC 
+	cd treectrl
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+typetest : .SYMBOLIC 
+	cd typetest
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+validate : .SYMBOLIC 
+	cd validate
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+vscroll : .SYMBOLIC 
+	cd vscroll
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+widgets : .SYMBOLIC 
+	cd widgets
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+wizard : .SYMBOLIC 
+	cd wizard
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
+wxtest : .SYMBOLIC 
+	cd wxtest
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
diff --git a/samples/samples.bkl b/samples/samples.bkl
index 341106dd11..b193970cbd 100644
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -9,10 +9,79 @@
     </template>
 
     <!-- all samples are enumerated here: -->
+    <subproject id="access" template="sub"/>
     <subproject id="artprov" template="sub"/>
-    <subproject id="console" template="sub" cond="USE_GUI=='0'"/>
+    <subproject id="calendar" template="sub"/>
+    <subproject id="caret" template="sub"/>
+    <subproject id="checklst" template="sub"/>
+    <subproject id="config" template="sub"/>
+    <subproject id="console" template="sub"/>
+    <subproject id="controls" template="sub"/>
+    <subproject id="db" template="sub"/>
     <subproject id="dialogs" template="sub"/>
+    <subproject id="dialup" template="sub"/>
+    <subproject id="display" template="sub"/>
+    <subproject id="dnd" template="sub"/>
+    <subproject id="docview" template="sub"/>
+    <subproject id="docvwmdi" template="sub"/>
+    <subproject id="dragimag" template="sub"/>
+    <subproject id="drawing" template="sub"/>
+    <subproject id="dynamic" template="sub"/>
+    <subproject id="erase" template="sub"/>
+    <subproject id="event" template="sub"/>
+    <subproject id="exec" template="sub"/>
+    <subproject id="font" template="sub"/>
+    <subproject id="grid" template="sub"/>
+    <subproject id="help" template="sub"/>
+    <subproject id="htlbox" template="sub"/>
+    <subproject id="html" template="sub"/>
     <subproject id="image" template="sub"/>
+    <subproject id="internat" template="sub"/>
+    <subproject id="ipc" template="sub"/>
+    <subproject id="joytest" template="sub"/>
+    <subproject id="keyboard" template="sub"/>
+    <subproject id="layout" template="sub"/>
+    <subproject id="listbox" template="sub"/>
+    <subproject id="listctrl" template="sub"/>
+    <subproject id="mdi" template="sub"/>
+    <subproject id="memcheck" template="sub"/>
+    <subproject id="menu" template="sub"/>
+    <subproject id="mfc" template="sub"/>
+    <subproject id="minifram" template="sub"/>
     <subproject id="minimal" template="sub"/>
+    <subproject id="mobile" template="sub"/>
+    <subproject id="multimon" template="sub"/>
+    <subproject id="nativdlg" template="sub"/>
+    <subproject id="newgrid" template="sub"/>
+    <subproject id="notebook" template="sub"/>
+    <subproject id="oleauto" template="sub"/>
+    <subproject id="opengl" template="sub"/>
+    <subproject id="ownerdrw" template="sub"/>
+    <subproject id="png" template="sub"/>
+    <subproject id="printing" template="sub"/>
+    <subproject id="propsize" template="sub"/>
+    <subproject id="regtest" template="sub"/>
+    <subproject id="render" template="sub"/>
+    <subproject id="richedit" template="sub"/>
+    <subproject id="rotate" template="sub"/>
+    <subproject id="sashtest" template="sub"/>
+    <subproject id="scroll" template="sub"/>
+    <subproject id="scrollsub" template="sub"/>
+    <subproject id="shaped" template="sub"/>
+    <subproject id="sockets" template="sub"/>
+    <subproject id="splitter" template="sub"/>
+    <subproject id="statbar" template="sub"/>
+    <subproject id="tab" template="sub"/>
+    <subproject id="taskbar" template="sub"/>
+    <subproject id="text" template="sub"/>
+    <subproject id="thread" template="sub"/>
+    <subproject id="toolbar" template="sub"/>
+    <subproject id="treectrl" template="sub"/>
+    <subproject id="typetest" template="sub"/>
+    <subproject id="validate" template="sub"/>
+    <subproject id="vscroll" template="sub"/>
+    <subproject id="widgets" template="sub"/>
+    <subproject id="wizard" template="sub"/>
+    <subproject id="wxtest" template="sub"/>
 
 </makefile>