* as/Makefile: fix target clean

* as/clean.mk: fix target clean
* as/z80/clean.mk: fix target clean

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2559 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 29ff3feba99b80de76493bcb9015aa356598e3cc..e28c1c743e523489188e449c804d58cb5dd1029d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-23  Bernhard Held <bernhard@bernhardheld.de>
+
+       * as/Makefile: fix target clean
+       * as/clean.mk: fix target clean
+       * as/z80/clean.mk: fix target clean
+
 2003-04-22  Bernhard Held <bernhard@bernhardheld.de>
 
        * Makefile.common.in: added @EXEEXT@

diff --git a/as/Makefile b/as/Makefile
index ab333afb6ed16e2fe29cc929e29ef1828fa521aa..d9b8c97cf4c79c62b5a06f9752a235e71f073455 100644 (file)
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,11 +1,12 @@
 PRJDIR = ..
+BUILDDIR=../../bin/
 include $(PRJDIR)/Makefile.common
 
 PORTS = z80 gbz80
 DOCS = README abstra.doc appendk.txt asmlnk.doc asxhtm.html format.txt
 
 all:
-       $(MAKE) -C z80 _as-z80 _as-gbz80 E=$(E) BUILDDIR=../../bin/
+       $(MAKE) -C z80 _as-z80 _as-gbz80 E=$(E) BUILDDIR=$(BUILDDIR)
 
 install: all install-doc
        $(INSTALL) $(PRJDIR)/bin/as-z80 `echo $(bindir)/as-z80|sed '$(transform)'`

diff --git a/as/clean.mk b/as/clean.mk
index 93bc4b0a5ffe97d70eaa3e1c2de6a9a37d72309d..55d0fc80df3157c6ab85e7614dcd0572bb60f1ee 100644 (file)
--- a/as/clean.mk
+++ b/as/clean.mk
@@ -1,6 +1,6 @@
 clean:
-       $(MAKE) -C z80 -f clean.mk clean
+       $(MAKE) -C z80 -f clean.mk clean BUILDDIR=$(BUILDDIR)
 
 distclean:
-       $(MAKE) -C z80 -f clean.mk distclean
+       $(MAKE) -C z80 -f clean.mk distclean BUILDDIR=$(BUILDDIR)
 

diff --git a/as/z80/clean.mk b/as/z80/clean.mk
index 5c2a90071f3c8ad2dbbc840becf162077385c36c..03e9e8daf4e8cfefe7835e61f69719b708131b90 100644 (file)
--- a/as/z80/clean.mk
+++ b/as/z80/clean.mk
@@ -4,7 +4,8 @@ clean:
        rm -rf obj
        rm -f *core *[%~] *.[oa]
        rm -f .[a-z]*~
-       rm -f $(PRJDIR)/as-z80 as-z80 
+       rm -f $(BUILDDIR)/as-z80   as-z80
+       rm -f $(BUILDDIR)/as-gbz80 as-gbz80
 
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------