Make the watcom makefiles a bit more openwatcom compatible.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4248 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/make/watcom.mak b/src/ar65/make/watcom.mak
index 7dabe04b18874bb16487e0446e0aff475d405952..2be48e8c895c011fb49b2457e899372b5f0c2346 100644 (file)
--- a/src/ar65/make/watcom.mak
+++ b/src/ar65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/ca65/make/watcom.mak b/src/ca65/make/watcom.mak
index 98e35fec98d6532d7f7a7c8f24c7479f3c89af60..3969c226c3bc1e325c3910e0c1b56047de0206c4 100644 (file)
--- a/src/ca65/make/watcom.mak
+++ b/src/ca65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/cc65/make/watcom.mak b/src/cc65/make/watcom.mak
index 6e2dc83b95264dbe38861072d8cd480778d1c160..b23e54f2794f6b2e602b7dae5119475c50711219 100644 (file)
--- a/src/cc65/make/watcom.mak
+++ b/src/cc65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -65,7 +65,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/cl65/make/watcom.mak b/src/cl65/make/watcom.mak
index f1d62619600d9aa48596e283784d68559397afb7..6c59d15f3e0cf8bbfcc738cb038183d2f62d915e 100644 (file)
--- a/src/cl65/make/watcom.mak
+++ b/src/cl65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/co65/make/watcom.mak b/src/co65/make/watcom.mak
index 50dfcdbe9edd73c86770f9806cd98a3f76c41b76..802f0b7b328ef75410bd17ab306784f037bfda89 100644 (file)
--- a/src/co65/make/watcom.mak
+++ b/src/co65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak
index db3c2863c92028e38a11dcb7ed43163684fdec0f..f4d5b3b90040065cc4116813380a3afecfd1c74a 100644 (file)
--- a/src/common/make/watcom.mak
+++ b/src/common/make/watcom.mak
@@ -14,9 +14,9 @@ export WINEDEBUG=fixme-all
 WINE    = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
 LIB    = common.lib
 
 # Program arguments
@@ -49,7 +49,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ $(LIB): $(OBJS)
        @echo Done!
 
 wildargv.obj:
-       $(CC) $(CFLAGS) $(WATCOM)\\src\\startup\\wildargv.c
+       $(CC) $(CFLAGS) -fo=$@ $(WATCOM)\\src\\startup\\wildargv.c
 
 clean:
        @rm -f *~ core

diff --git a/src/da65/make/watcom.mak b/src/da65/make/watcom.mak
index 8c9479209add49949e3cacdd2ea91459ab722fce..b4eba8cc14b17f2a4ba09cc1b1868d29318f4081 100644 (file)
--- a/src/da65/make/watcom.mak
+++ b/src/da65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/grc/make/watcom.mak b/src/grc/make/watcom.mak
index 6c86cbbdf6e4784b04be69d7e28abb6b3a2d84f2..9900820392c094149b5f1ad6efaade8f08bfd123 100644 (file)
--- a/src/grc/make/watcom.mak
+++ b/src/grc/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/ld65/make/watcom.mak b/src/ld65/make/watcom.mak
index c288ed5fcd32fe4de53583262049ba5da5283236..c9cd98ba12aaa85fbd409781a6e92dbdf9300f92 100644 (file)
--- a/src/ld65/make/watcom.mak
+++ b/src/ld65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------

diff --git a/src/od65/make/watcom.mak b/src/od65/make/watcom.mak
index 25d7eb53de5e1ec07392a1f5e5167516ee55830f..59055254a667c5185ae3cab00a441908e951ac45 100644 (file)
--- a/src/od65/make/watcom.mak
+++ b/src/od65/make/watcom.mak
@@ -14,10 +14,10 @@ export WINEDEBUG=fixme-all
 WINE = wine
 
 # Programs
-AR             = $(WINE) WLIB
-CC      = $(WINE) WCC386
-LD             = $(WINE) WLINK
-WSTRIP = $(WINE) WSTRIP -q
+AR             = $(WINE) wlib
+CC      = $(WINE) wcc386
+LD             = $(WINE) wlink
+WSTRIP = $(WINE) wstrip -q
 
 LNKCFG  = ld.tmp
 
@@ -54,7 +54,7 @@ endif
 # Implicit rules
 
 %.obj:  %.c
-       $(CC) $(CFLAGS) $^
+       $(CC) $(CFLAGS) -fo=$@ $^
 
 
 # ------------------------------------------------------------------------------