Merge back from 2.21-pre1

[fw/sdcc] / as / Makefile

diff --git a/as/Makefile b/as/Makefile
index 412bad9a248861daa7fbcaba88fe588fd5527e1c..432ca1334546f1aca05204024e5d6e0fefa7967c 100644 (file)
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,18 +1,17 @@
 PRJDIR = ..
 include $(PRJDIR)/Makefile.common
 
-PORTS = _z80 _gbz80
+PORTS = z80 gbz80
 
-all: 
-       for i in $(PORTS); do make $$i; done
+all:
+       for i in $(PORTS); do make _as THIS=$$i; done
 
-_z80: clean
-       make -C z80
-       cp z80/as$(E) $(TOPDIR)/bin/as-z80$(E)
-
-_gbz80: clean
-       make -C z80 "OPTS=-DGAMEBOY"
-       cp z80/as$(E) $(TOPDIR)/bin/as-gbz80$(E)
+_as:
+ifeq ($(THIS), gbz80)
+       make -C z80 BUILDDIR=../../bin EXT=-$(THIS)$(E) OPTS=-DGAMEBOY wary
+else
+       make -C z80 BUILDDIR=../../bin EXT=-$(THIS)$(E) wary
+endif
 
 clean:
        make -C z80 clean