From: uz Date: Sun, 27 Sep 2009 18:40:00 +0000 (+0000) Subject: Make the watcom makefiles a bit more openwatcom compatible. X-Git-Tag: V2.13.0rc1~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2cc68784cc925af7978eeb7f4f4abec40dac8b76;p=cc65 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 7dabe04b1..2be48e8c8 100644 --- 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 98e35fec9..3969c226c 100644 --- 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 6e2dc83b9..b23e54f27 100644 --- 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 f1d626196..6c59d15f3 100644 --- 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 50dfcdbe9..802f0b7b3 100644 --- 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 db3c2863c..f4d5b3b90 100644 --- 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 8c9479209..b4eba8cc1 100644 --- 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 6c86cbbdf..990082039 100644 --- 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 c288ed5fc..c9cd98ba1 100644 --- 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 25d7eb53d..59055254a 100644 --- 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=$@ $^ # ------------------------------------------------------------------------------