diff --git a/samples/html/help/makefile.g95 b/samples/html/help/makefile.g95
new file mode 100644
index 0000000000..954279ff0b
--- /dev/null
+++ b/samples/html/help/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=help
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/html/helpview/makefile.g95 b/samples/html/helpview/makefile.g95
new file mode 100644
index 0000000000..70e6fbcd87
--- /dev/null
+++ b/samples/html/helpview/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=helpview
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/html/makefile.g95 b/samples/html/makefile.g95
new file mode 100644
index 0000000000..6505f0698a
--- /dev/null
+++ b/samples/html/makefile.g95
@@ -0,0 +1,33 @@
+#
+# File: makefile.g95
+# Author: Mumit Khan
+# Created: 2000
+# Updated:
+# Copyright:
+#
+# Makefile : Builds samples for Win95, MSVC++ 16-bit
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = ../..
+
+THISDIR=$(WXDIR)/samples/html
+
+include $(WXDIR)/src/makeg95.env
+
+MAKEFILE = makefile.g95
+
+# Mingw make may not have a shell to use, so can't use a loop here. Sigh.
+# Please add new sample directories alphabetically to make it easier to
+# keep track.
+all clean:
+ -$(MAKE) -C about -f $(MAKEFILE) $@
+ -$(MAKE) -C help -f $(MAKEFILE) $@
+ -$(MAKE) -C helpview -f $(MAKEFILE) $@
+ -$(MAKE) -C printing -f $(MAKEFILE) $@
+ -$(MAKE) -C test -f $(MAKEFILE) $@
+ -$(MAKE) -C virtual -f $(MAKEFILE) $@
+ -$(MAKE) -C widget -f $(MAKEFILE) $@
+ -$(MAKE) -C zip -f $(MAKEFILE) $@
+
diff --git a/samples/html/printing/makefile.g95 b/samples/html/printing/makefile.g95
new file mode 100644
index 0000000000..b6c1a270ab
--- /dev/null
+++ b/samples/html/printing/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=printing
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/html/test/makefile.g95 b/samples/html/test/makefile.g95
new file mode 100644
index 0000000000..b96b93918c
--- /dev/null
+++ b/samples/html/test/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=test
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/html/virtual/makefile.g95 b/samples/html/virtual/makefile.g95
new file mode 100644
index 0000000000..862e9368d5
--- /dev/null
+++ b/samples/html/virtual/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=virtual
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/html/widget/makefile.g95 b/samples/html/widget/makefile.g95
new file mode 100644
index 0000000000..5faa740786
--- /dev/null
+++ b/samples/html/widget/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=widget
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/html/zip/makefile.g95 b/samples/html/zip/makefile.g95
new file mode 100644
index 0000000000..45a1ad715b
--- /dev/null
+++ b/samples/html/zip/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File: makefile.g95
+# Author: Julian Smart
+# Created: 1999
+# Updated:
+# Copyright: (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=zip
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+
diff --git a/samples/makefile.g95 b/samples/makefile.g95
index 0a5c2c4cc3..00ace87705 100644
--- a/samples/makefile.g95
+++ b/samples/makefile.g95
@@ -16,79 +16,64 @@ WXDIR = ..
THISDIR=$(WXDIR)/samples
-all:
- cd $(WXDIR)/samples/bombs; make -f makefile.g95
- cd $(WXDIR)/samples/fractal; make -f makefile.g95
- cd $(WXDIR)/samples/splitter; make -f makefile.g95
- cd $(WXDIR)/samples/resource; make -f makefile.g95
- cd $(WXDIR)/samples/controls; make -f makefile.g95
- cd $(WXDIR)/samples/listctrl; make -f makefile.g95
- cd $(WXDIR)/samples/treectrl; make -f makefile.g95
- cd $(WXDIR)/samples/validate; make -f makefile.g95
- cd $(WXDIR)/samples/mdi; make -f makefile.g95
- cd $(WXDIR)/samples/minimal; make -f makefile.g95
- cd $(WXDIR)/samples/layout; make -f makefile.g95
- cd $(WXDIR)/samples/printing; make -f makefile.g95
- cd $(WXDIR)/samples/proplist; make -f makefile.g95
- cd $(WXDIR)/samples/toolbar; make -f makefile.g95
- cd $(WXDIR)/samples/dialogs; make -f makefile.g95
- cd $(WXDIR)/samples/docview; make -f makefile.g95
- cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95
- cd $(WXDIR)/samples/sashtest; make -f makefile.g95
- cd $(WXDIR)/samples/controls; make -f makefile.g95
- cd $(WXDIR)/samples/nativdlg; make -f makefile.g95
- cd $(WXDIR)/samples/grid; make -f makefile.g95
- cd $(WXDIR)/samples/internat; make -f makefile.g95
- cd $(WXDIR)/samples/checklst; make -f makefile.g95
- cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95
- cd $(WXDIR)/samples/joytest; make -f makefile.g95
- cd $(WXDIR)/samples/memcheck; make -f makefile.g95
- cd $(WXDIR)/samples/image; make -f makefile.g95
- cd $(WXDIR)/samples/wxpoem; make -f makefile.g95
- cd $(WXDIR)/samples/notebook; make -f makefile.g95
- cd $(WXDIR)/samples/thread; make -f makefile.g95
- cd $(WXDIR)/samples/minifram; make -f makefile.g95
- cd $(WXDIR)/samples/forty; make -f makefile.g95
- cd $(WXDIR)/samples/dde; make -f client.g95
- cd $(WXDIR)/samples/dde; make -f server.g95
-# cd $(WXDIR)/samples/dnd; make -f makefile.g95
-# cd $(WXDIR)/samples/regtest; make -f makefile.g95
-
-clean:
- cd $(WXDIR)/samples/bombs; make -f makefile.g95 clean
- cd $(WXDIR)/samples/fractal; make -f makefile.g95 clean
- cd $(WXDIR)/samples/splitter; make -f makefile.g95 clean
- cd $(WXDIR)/samples/mdi; make -f makefile.g95 clean
- cd $(WXDIR)/samples/minimal; make -f makefile.g95 clean
- cd $(WXDIR)/samples/layout; make -f makefile.g95 clean
- cd $(WXDIR)/samples/printing; make -f makefile.g95 clean
- cd $(WXDIR)/samples/proplist; make -f makefile.g95 clean
- cd $(WXDIR)/samples/toolbar; make -f makefile.g95 clean
- cd $(WXDIR)/samples/dialogs; make -f makefile.g95 clean
- cd $(WXDIR)/samples/resource; make -f makefile.g95 clean
- cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean
- cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean
- cd $(WXDIR)/samples/validate; make -f makefile.g95 clean
- cd $(WXDIR)/samples/docview; make -f makefile.g95 clean
- cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 clean
- cd $(WXDIR)/samples/sashtest; make -f makefile.g95 clean
- cd $(WXDIR)/samples/controls; make -f makefile.g95 clean
- cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean
- cd $(WXDIR)/samples/grid; make -f makefile.g95 clean
- cd $(WXDIR)/samples/internat; make -f makefile.g95 clean
- cd $(WXDIR)/samples/checklst; make -f makefile.g95 clean
- cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 clean
- cd $(WXDIR)/samples/regtest; make -f makefile.g95 clean
- cd $(WXDIR)/samples/joytest; make -f makefile.g95 clean
- cd $(WXDIR)/samples/memcheck; make -f makefile.g95 clean
- cd $(WXDIR)/samples/image; make -f makefile.g95 clean
- cd $(WXDIR)/samples/wxpoem; make -f makefile.g95 clean
- cd $(WXDIR)/samples/notebook; make -f makefile.g95 clean
- cd $(WXDIR)/samples/thread; make -f makefile.g95 clean
- cd $(WXDIR)/samples/minifram; make -f makefile.g95 clean
- cd $(WXDIR)/samples/forty; make -f makefile.g95 clean
- cd $(WXDIR)/samples/dnd; make -f makefile.g95 clean
- cd $(WXDIR)/samples/dde; make -f client.g95 clean
- cd $(WXDIR)/samples/dde; make -f server.g95 clean
-
+# Mingw make may not have a shell to use, so can't use a loop here. Sigh.
+# Please add new sample directories alphabetically to make it easier to
+# keep track.
+all clean:
+ -$(MAKE) -C calendar -f $(MAKEFILE) $@
+ -$(MAKE) -C caret -f $(MAKEFILE) $@
+ -$(MAKE) -C checklst -f $(MAKEFILE) $@
+ -$(MAKE) -C config -f $(MAKEFILE) $@
+ -$(MAKE) -C console -f $(MAKEFILE) $@
+ -$(MAKE) -C controls -f $(MAKEFILE) $@
+ -$(MAKE) -C db -f $(MAKEFILE) $@
+ -$(MAKE) -C ipc -f $(MAKEFILE) $@
+ -$(MAKE) -C dialogs -f $(MAKEFILE) $@
+ -$(MAKE) -C dnd -f $(MAKEFILE) $@
+ -$(MAKE) -C docview -f $(MAKEFILE) $@
+ -$(MAKE) -C docvwmdi -f $(MAKEFILE) $@
+ -$(MAKE) -C drawing -f $(MAKEFILE) $@
+ -$(MAKE) -C dynamic -f $(MAKEFILE) $@
+ -$(MAKE) -C font -f $(MAKEFILE) $@
+ -$(MAKE) -C grid -f $(MAKEFILE) $@
+ -$(MAKE) -C help -f $(MAKEFILE) $@
+ -$(MAKE) -C html -f $(MAKEFILE) $@
+ -$(MAKE) -C image -f $(MAKEFILE) $@
+ -$(MAKE) -C internat -f $(MAKEFILE) $@
+ -$(MAKE) -C joytest -f $(MAKEFILE) $@
+ -$(MAKE) -C layout -f $(MAKEFILE) $@
+ -$(MAKE) -C listctrl -f $(MAKEFILE) $@
+ -$(MAKE) -C mdi -f $(MAKEFILE) $@
+ -$(MAKE) -C memcheck -f $(MAKEFILE) $@
+ -$(MAKE) -C menu -f $(MAKEFILE) $@
+ -$(MAKE) -C mfc -f $(MAKEFILE) $@
+ -$(MAKE) -C minifram -f $(MAKEFILE) $@
+ -$(MAKE) -C minimal -f $(MAKEFILE) $@
+ -$(MAKE) -C nativdlg -f $(MAKEFILE) $@
+ -$(MAKE) -C dialup -f $(MAKEFILE) $@
+ -$(MAKE) -C newgrid -f $(MAKEFILE) $@
+ -$(MAKE) -C notebook -f $(MAKEFILE) $@
+ -$(MAKE) -C oleauto -f $(MAKEFILE) $@
+ -$(MAKE) -C ownerdrw -f $(MAKEFILE) $@
+ -$(MAKE) -C png -f $(MAKEFILE) $@
+ -$(MAKE) -C printing -f $(MAKEFILE) $@
+ -$(MAKE) -C proplist -f $(MAKEFILE) $@
+ -$(MAKE) -C propsize -f $(MAKEFILE) $@
+ -$(MAKE) -C regtest -f $(MAKEFILE) $@
+ -$(MAKE) -C resource -f $(MAKEFILE) $@
+ -$(MAKE) -C richedit -f $(MAKEFILE) $@
+ -$(MAKE) -C sashtest -f $(MAKEFILE) $@
+ -$(MAKE) -C scroll -f $(MAKEFILE) $@
+ -$(MAKE) -C scrollsub -f $(MAKEFILE) $@
+ -$(MAKE) -C splitter -f $(MAKEFILE) $@
+ -$(MAKE) -C tab -f $(MAKEFILE) $@
+ -$(MAKE) -C taskbar -f $(MAKEFILE) $@
+ -$(MAKE) -C text -f $(MAKEFILE) $@
+ -$(MAKE) -C thread -f $(MAKEFILE) $@
+ -$(MAKE) -C toolbar -f $(MAKEFILE) $@
+ -$(MAKE) -C treectrl -f $(MAKEFILE) $@
+ -$(MAKE) -C typetest -f $(MAKEFILE) $@
+ -$(MAKE) -C validate -f $(MAKEFILE) $@
+ -$(MAKE) -C wizard -f $(MAKEFILE) $@
+ -$(MAKE) -C sockets -f $(MAKEFILE) $@