From 068dd44056032ea3f0b182fddb736106c1daf01a Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Tue, 25 Mar 2003 21:17:41 +0000
Subject: [PATCH] modify makefile for watcom

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/artprov/makefile.wat       | 1 -
 samples/calendar/makefile.wat      | 1 -
 samples/caret/makefile.wat         | 1 -
 samples/checklst/makefile.wat      | 1 -
 samples/config/makefile.wat        | 1 -
 samples/console/makefile.wat       | 1 -
 samples/controls/makefile.wat      | 1 -
 samples/db/makefile.wat            | 1 -
 samples/dialogs/makefile.wat       | 1 -
 samples/dnd/makefile.wat           | 1 -
 samples/docview/makefile.wat       | 1 -
 samples/docvwmdi/makefile.wat      | 1 -
 samples/dragimag/makefile.wat      | 1 -
 samples/drawing/makefile.wat       | 1 -
 samples/erase/makefile.wat         | 1 -
 samples/event/makefile.wat         | 1 -
 samples/exec/makefile.wat          | 1 -
 samples/font/makefile.wat          | 1 -
 samples/grid/makefile.wat          | 1 -
 samples/help/makefile.wat          | 1 -
 samples/html/about/makefile.wat    | 1 -
 samples/html/help/makefile.wat     | 1 -
 samples/html/helpview/makefile.wat | 1 -
 samples/html/printing/makefile.wat | 1 -
 samples/html/test/makefile.wat     | 1 -
 samples/html/virtual/makefile.wat  | 1 -
 samples/html/widget/makefile.wat   | 1 -
 samples/html/zip/makefile.wat      | 1 -
 samples/image/makefile.wat         | 1 -
 samples/internat/makefile.wat      | 1 -
 samples/ipc/client.wat             | 2 +-
 samples/ipc/server.wat             | 2 +-
 samples/joytest/makefile.wat       | 1 -
 samples/keyboard/makefile.wat      | 1 -
 samples/layout/makefile.wat        | 1 -
 samples/listctrl/makefile.wat      | 1 -
 samples/mdi/makefile.wat           | 1 -
 samples/memcheck/makefile.wat      | 1 -
 samples/menu/makefile.wat          | 1 -
 samples/mfc/makefile.wat           | 1 -
 samples/minifram/makefile.wat      | 1 -
 samples/minimal/makefile.wat       | 1 -
 samples/nativdlg/makefile.wat      | 1 -
 samples/newgrid/makefile.wat       | 1 -
 samples/notebook/makefile.wat      | 1 -
 samples/oleauto/makefile.wat       | 1 -
 samples/ownerdrw/makefile.wat      | 1 -
 samples/png/makefile.wat           | 1 -
 samples/printing/makefile.wat      | 1 -
 samples/proplist/makefile.wat      | 1 -
 samples/propsize/makefile.wat      | 1 -
 samples/regtest/makefile.wat       | 1 -
 samples/resource/makefile.wat      | 1 -
 samples/rotate/makefile.wat        | 1 -
 samples/sashtest/makefile.wat      | 1 -
 samples/scroll/makefile.wat        | 1 -
 samples/scrollsub/makefile.wat     | 1 -
 samples/sockets/client.wat         | 2 +-
 samples/sockets/server.wat         | 2 +-
 samples/splitter/makefile.wat      | 1 -
 samples/statbar/makefile.wat       | 1 -
 samples/tab/makefile.wat           | 1 -
 samples/taskbar/makefile.wat       | 1 -
 samples/text/makefile.wat          | 1 -
 samples/thread/makefile.wat        | 1 -
 samples/toolbar/makefile.wat       | 1 -
 samples/treectrl/makefile.wat      | 1 -
 samples/treelay/makefile.wat       | 1 -
 samples/typetest/makefile.wat      | 1 -
 samples/validate/makefile.wat      | 1 -
 samples/widgets/makefile.wat       | 1 -
 samples/wizard/makefile.wat        | 1 -
 src/makeprog.wat                   | 4 +++-
 src/msw/makefile.wat               | 3 ++-
 74 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index 65731b6c6b..f1d21846fb 100644
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\artprov 
 # 
 PROGRAM = artprov 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat
index bff04c9307..6ed88aeeeb 100644
--- a/samples/calendar/makefile.wat
+++ b/samples/calendar/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\calendar 
 # 
 PROGRAM = calendar 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index 5ee9a7ee39..29554aeea0 100644
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\caret 
 # 
 PROGRAM = caret 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/checklst/makefile.wat b/samples/checklst/makefile.wat
index b942feebc3..0b7e01e5f3 100644
--- a/samples/checklst/makefile.wat
+++ b/samples/checklst/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\checklst 
 # 
 PROGRAM = checklst 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index 6fecbddbd5..aa5a99960b 100644
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\config 
 # 
 PROGRAM = config 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat
index ca1c88d7b8..67638e4867 100644
--- a/samples/console/makefile.wat
+++ b/samples/console/makefile.wat
@@ -6,7 +6,6 @@
 # 
 # 
 wxUSE_GUI=0
-THISDIR = $(%WXWIN)\samples\console
 # 
 PROGRAM = console
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat
index 38a493d610..59b1f66026 100644
--- a/samples/controls/makefile.wat
+++ b/samples/controls/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\controls 
 # 
 PROGRAM = controls 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat
index 58028def5e..361a80c00d 100644
--- a/samples/db/makefile.wat
+++ b/samples/db/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\db 
 # 
 PROGRAM = db 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index 4499dec2e1..0f2cc0625d 100644
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\dialogs 
 # 
 PROGRAM = dialogs 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat
index 26cda69727..ded4659684 100644
--- a/samples/dnd/makefile.wat
+++ b/samples/dnd/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\dnd 
 # 
 PROGRAM = dnd 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat
index e870e08071..03444dab1d 100644
--- a/samples/docview/makefile.wat
+++ b/samples/docview/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\docview 
 # 
 PROGRAM = docview 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat
index bc95b48e12..e06970673e 100644
--- a/samples/docvwmdi/makefile.wat
+++ b/samples/docvwmdi/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\docvwmdi 
 # 
 PROGRAM = docvwmdi 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat
index c295057418..d662867678 100644
--- a/samples/dragimag/makefile.wat
+++ b/samples/dragimag/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\dragimag 
 # 
 PROGRAM = dragimag 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat
index 92816b6349..e1ccc4b117 100644
--- a/samples/drawing/makefile.wat
+++ b/samples/drawing/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\drawing 
 # 
 PROGRAM = drawing 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat
index c16d5ac202..ff0cf3baab 100644
--- a/samples/erase/makefile.wat
+++ b/samples/erase/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\erase 
 # 
 PROGRAM = erase 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index 9e3caff19a..c5c56131fb 100644
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\event 
 # 
 PROGRAM = event 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat
index e6087b8f30..7a7f01dbb7 100644
--- a/samples/exec/makefile.wat
+++ b/samples/exec/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\exec 
 # 
 PROGRAM = exec 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat
index 770e3fd207..085e6e463c 100644
--- a/samples/font/makefile.wat
+++ b/samples/font/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\font 
 # 
 PROGRAM = font 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index ec3551948d..a9edce43dc 100644
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\grid 
 # 
 PROGRAM = grid 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index 58d8514fec..819ece5424 100644
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\help 
 # 
 PROGRAM = help 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index 830cb21085..1234ed9fe8 100644
--- a/samples/html/about/makefile.wat
+++ b/samples/html/about/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\about 
 # 
 PROGRAM = about 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
index 5a113ae5f1..819ece5424 100644
--- a/samples/html/help/makefile.wat
+++ b/samples/html/help/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\help 
 # 
 PROGRAM = help 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index aa3e83de75..48e3433b19 100644
--- a/samples/html/helpview/makefile.wat
+++ b/samples/html/helpview/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\helpview 
 # 
 PROGRAM = helpview 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
index ad23f4f198..f1d9dfa721 100644
--- a/samples/html/printing/makefile.wat
+++ b/samples/html/printing/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\printing 
 # 
 PROGRAM = printing 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
index aa7ab768cb..cb1a911ba7 100644
--- a/samples/html/test/makefile.wat
+++ b/samples/html/test/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\test 
 # 
 PROGRAM = test 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
index 323b0e8536..085e5a1daf 100644
--- a/samples/html/virtual/makefile.wat
+++ b/samples/html/virtual/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\virtual 
 # 
 PROGRAM = virtual 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
index 2106b3b4fa..c5cb16d225 100644
--- a/samples/html/widget/makefile.wat
+++ b/samples/html/widget/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\html\widget 
 # 
 PROGRAM = widget 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
index 25e02c2766..d71db45fa6 100644
--- a/samples/html/zip/makefile.wat
+++ b/samples/html/zip/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\zip 
 # 
 PROGRAM = zip 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat
index 538e911659..b9c94c5374 100644
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\image 
 # 
 PROGRAM = image 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat
index 6520d0f6e2..7929589dcb 100644
--- a/samples/internat/makefile.wat
+++ b/samples/internat/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\internat 
 # 
 PROGRAM = internat 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/ipc/client.wat b/samples/ipc/client.wat
index 789db64157..010906f7e5 100644
--- a/samples/ipc/client.wat
+++ b/samples/ipc/client.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = client
-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/samples/ipc/server.wat b/samples/ipc/server.wat
index 2acfdf1115..08496033ec 100644
--- a/samples/ipc/server.wat
+++ b/samples/ipc/server.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = server
-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat
index c54bff73ed..2b88823bcf 100644
--- a/samples/joytest/makefile.wat
+++ b/samples/joytest/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\joytest 
 # 
 PROGRAM = joytest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index 5dc1c5ed57..e8f6d37e7b 100644
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\keyboard 
 # 
 PROGRAM = keyboard 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index f4392090f5..93b2ed28b8 100644
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\layout 
 # 
 PROGRAM = layout 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat
index 6387d6914a..acd60f1311 100644
--- a/samples/listctrl/makefile.wat
+++ b/samples/listctrl/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\listctrl 
 # 
 PROGRAM = listtest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat
index 548d81fe60..a997aacc27 100644
--- a/samples/mdi/makefile.wat
+++ b/samples/mdi/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\mdi 
 # 
 PROGRAM = mdi 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index 064fb756ad..b8df352dfb 100644
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\memcheck 
 # 
 PROGRAM = memcheck 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index f87c410583..827af955ca 100644
--- a/samples/menu/makefile.wat
+++ b/samples/menu/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\menu 
 # 
 PROGRAM = menu 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat
index 30821faf97..4b53426173 100644
--- a/samples/mfc/makefile.wat
+++ b/samples/mfc/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\mfc 
 # 
 PROGRAM = mfc 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/minifram/makefile.wat b/samples/minifram/makefile.wat
index 2c78090396..06a707a87e 100644
--- a/samples/minifram/makefile.wat
+++ b/samples/minifram/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\minifram 
 # 
 PROGRAM = minifram 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
index c1b36975b3..a7cc648a2b 100644
--- a/samples/minimal/makefile.wat
+++ b/samples/minimal/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\minimal 
 # 
 PROGRAM = minimal 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat
index 14f4fdc2e7..3d796268f7 100644
--- a/samples/nativdlg/makefile.wat
+++ b/samples/nativdlg/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\nativdlg 
 # 
 PROGRAM = nativdlg 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/newgrid/makefile.wat b/samples/newgrid/makefile.wat
index cc94f572a4..f2b9db94c4 100644
--- a/samples/newgrid/makefile.wat
+++ b/samples/newgrid/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\newgrid 
 # 
 PROGRAM = newgrid 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat
index 170ab660e4..db4ec80c45 100644
--- a/samples/notebook/makefile.wat
+++ b/samples/notebook/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\notebook 
 # 
 PROGRAM = notebook 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat
index 542b91bfe4..80c6d3a811 100644
--- a/samples/oleauto/makefile.wat
+++ b/samples/oleauto/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\oleauto 
 # 
 PROGRAM = oleauto 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat
index 09b79923a7..fa123061ef 100644
--- a/samples/ownerdrw/makefile.wat
+++ b/samples/ownerdrw/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\ownerdrw 
 # 
 PROGRAM = ownerdrw 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/png/makefile.wat b/samples/png/makefile.wat
index b7e05a69f0..f3e275e8ae 100644
--- a/samples/png/makefile.wat
+++ b/samples/png/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\png 
 # 
 PROGRAM = png 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index a2f9815c10..f1d9dfa721 100644
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\printing 
 # 
 PROGRAM = printing 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/proplist/makefile.wat b/samples/proplist/makefile.wat
index 65f38d1c04..c79163121a 100644
--- a/samples/proplist/makefile.wat
+++ b/samples/proplist/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\proplist 
 # 
 PROGRAM = proplist 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/propsize/makefile.wat b/samples/propsize/makefile.wat
index e2786e7aa5..d54d2d6add 100644
--- a/samples/propsize/makefile.wat
+++ b/samples/propsize/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\propsize 
 # 
 PROGRAM = propsize 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat
index d740d57afc..b4d5521d7d 100644
--- a/samples/regtest/makefile.wat
+++ b/samples/regtest/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\regtest 
 # 
 PROGRAM = regtest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/resource/makefile.wat b/samples/resource/makefile.wat
index 399968055d..1d277645e2 100644
--- a/samples/resource/makefile.wat
+++ b/samples/resource/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\resource 
 # 
 PROGRAM = resource 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/rotate/makefile.wat b/samples/rotate/makefile.wat
index 057d6b1bd8..079252b2e5 100644
--- a/samples/rotate/makefile.wat
+++ b/samples/rotate/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\rotate 
 # 
 PROGRAM = rotate 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat
index d6b4708f80..3ee0cf2705 100644
--- a/samples/sashtest/makefile.wat
+++ b/samples/sashtest/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\sashtest 
 # 
 PROGRAM = sashtest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat
index a8de3f4d21..98fcdd82cb 100644
--- a/samples/scroll/makefile.wat
+++ b/samples/scroll/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\scroll 
 # 
 PROGRAM = scroll 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/scrollsub/makefile.wat b/samples/scrollsub/makefile.wat
index d266220d26..c320844ae5 100644
--- a/samples/scrollsub/makefile.wat
+++ b/samples/scrollsub/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\scrollsub 
 # 
 PROGRAM = scrollsub 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/sockets/client.wat b/samples/sockets/client.wat
index 789db64157..010906f7e5 100644
--- a/samples/sockets/client.wat
+++ b/samples/sockets/client.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = client
-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/samples/sockets/server.wat b/samples/sockets/server.wat
index 2acfdf1115..08496033ec 100644
--- a/samples/sockets/server.wat
+++ b/samples/sockets/server.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = server
-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat
index 2376ca1e71..e90e0c5bf9 100644
--- a/samples/splitter/makefile.wat
+++ b/samples/splitter/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\splitter 
 # 
 PROGRAM = splitter 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat
index 59d38b7ed0..6e74737fe4 100644
--- a/samples/statbar/makefile.wat
+++ b/samples/statbar/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\statbar 
 # 
 PROGRAM = statbar 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/tab/makefile.wat b/samples/tab/makefile.wat
index c7d93a7005..dc155c32f3 100644
--- a/samples/tab/makefile.wat
+++ b/samples/tab/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\tab 
 # 
 PROGRAM = tab 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat
index 286fe1d3b3..ed30288083 100644
--- a/samples/taskbar/makefile.wat
+++ b/samples/taskbar/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\taskbar 
 # 
 PROGRAM = taskbar 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat
index d576ebdd1d..96cd8516a7 100644
--- a/samples/text/makefile.wat
+++ b/samples/text/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\text 
 # 
 PROGRAM = text 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
index eff3ec7f39..7145fd7188 100644
--- a/samples/thread/makefile.wat
+++ b/samples/thread/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\thread 
 # 
 PROGRAM = thread 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat
index f996721fb7..89fefeb0fc 100644
--- a/samples/toolbar/makefile.wat
+++ b/samples/toolbar/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\toolbar 
 # 
 PROGRAM = toolbar 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat
index 7fffdbf9a3..4b9af1cdf8 100644
--- a/samples/treectrl/makefile.wat
+++ b/samples/treectrl/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\treectrl 
 # 
 PROGRAM = treetest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/treelay/makefile.wat b/samples/treelay/makefile.wat
index a00f19125a..f94edcc996 100644
--- a/samples/treelay/makefile.wat
+++ b/samples/treelay/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\treelay 
 # 
 PROGRAM = treelay 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat
index 8153422b86..d5d01b893d 100644
--- a/samples/typetest/makefile.wat
+++ b/samples/typetest/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\typetest 
 # 
 PROGRAM = typetest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat
index 49fb27b003..ba7088ba90 100644
--- a/samples/validate/makefile.wat
+++ b/samples/validate/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\validate 
 # 
 PROGRAM = validate 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index 2dd724c38c..68f899756b 100644
--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\widgets 
 # 
 PROGRAM = widgets 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat
index 617bd3380b..c560384ad1 100644
--- a/samples/wizard/makefile.wat
+++ b/samples/wizard/makefile.wat
@@ -5,7 +5,6 @@
 #  
 # 
 # 
-THISDIR = $(%WXWIN)\samples\wizard 
 # 
 PROGRAM = wizard 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
diff --git a/src/makeprog.wat b/src/makeprog.wat
index e9968c8ec3..d2f8809d86 100644
--- a/src/makeprog.wat
+++ b/src/makeprog.wat
@@ -1,6 +1,8 @@
 #
 # Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #
+# $+ .. $- means we get the result directly
+THISDIR = $+ $(%cdrive):$(%cwd) $-
 
 WXDIR = $(%WXWIN)
 !ifndef EXEDIR
@@ -39,7 +41,7 @@ $(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
      $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc
 !endif
 
-$(LNK) : makefile.wat
+$(LNK) : .SYMBOLIC
     %create $(LNK)
     @%append $(LNK) $(LDFLAGS)
     @%append $(LNK) $(DEBUGINFO)
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 07e3a525c6..9cb5e13edc 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -359,7 +359,8 @@ $(ARCHINCDIR)\wx:
 $(OUTPUTDIR):
 	@if not exist $^@ mkdir $^@
 
-$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+$(SETUP_H):  $(ARCHINCDIR)\wx
+    if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
 	copy $(WXDIR)\include\wx\msw\setup.h $@
 
 LBCFILE=wx$(TOOLKIT).lbc