From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 16 Apr 2009 06:34:52 +0000 (+0000)
Subject: * device/lib/Makefile.in, device/lib/ds390/Makefile.in,
X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=commitdiff_plain;h=8c7fbbcddc62866b37a6643a94544aa0b03638eb

* device/lib/Makefile.in, device/lib/ds390/Makefile.in,
  device/lib/ds400/Makefile.in, device/lib/gbz80/Makefile.in,
  device/lib/hc08/Makefile.in, device/lib/mcs51/Makefile.in,
  device/lib/z80/Makefile.in: override PORTDIR in sub-makefiles

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

diff --git a/ChangeLog b/ChangeLog
index 1fd2ef91..39b443a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-13 Borut Razem <borut.razem AT siol.net>
+
+	* device/lib/Makefile.in, device/lib/ds390/Makefile.in,
+	  device/lib/ds400/Makefile.in, device/lib/gbz80/Makefile.in,
+	  device/lib/hc08/Makefile.in, device/lib/mcs51/Makefile.in,
+	  device/lib/z80/Makefile.in: override PORTDIR in sub-makefiles
+
 2009-04-13 Raphael Neider <rneider AT web.de>
 
 	* device/lib/pic16/bootstrap.sh: avoid symlinks
diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index 46b4d97e..7aa50000 100644
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -322,15 +322,9 @@ $(PORT):
 	mkdir -p $(PORT)
 
 port-specific-objects:
-ifneq ($(LIB_TYPE), LIB)
 	-if [ -f $(PORT)/Makefile ]; then \
 	  $(MAKE) -C $(PORT) PORT=$(PORT); \
 	fi
-else
-	-if [ -f $(PORT)/Makefile ]; then \
-	  $(MAKE) -C $(PORT) PORT=$(PORT); \
-	 fi
-endif
 
 port-specific-objects-pic16:
 	-if [ -f $(PORT)/Makefile ]; then \
diff --git a/device/lib/ds390/Makefile.in b/device/lib/ds390/Makefile.in
index 135dce72..ac063092 100644
--- a/device/lib/ds390/Makefile.in
+++ b/device/lib/ds390/Makefile.in
@@ -6,7 +6,8 @@ LIB_TYPE        = @LIB_TYPE@
 
 CC = ../../../bin/sdcc
 
-PORTDIR = ../build/ds390
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/ds390
 
 #VERBOSE = --verbose
 
diff --git a/device/lib/ds400/Makefile.in b/device/lib/ds400/Makefile.in
index f29c9142..af20c72a 100644
--- a/device/lib/ds400/Makefile.in
+++ b/device/lib/ds400/Makefile.in
@@ -6,7 +6,8 @@ LIB_TYPE     = @LIB_TYPE@
 
 CC = ../../../bin/sdcc
 
-PORTDIR = ../build/ds400
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/ds400
 
 #VERBOSE = --verbose
 
diff --git a/device/lib/gbz80/Makefile.in b/device/lib/gbz80/Makefile.in
index 78d95d40..7a007e5d 100644
--- a/device/lib/gbz80/Makefile.in
+++ b/device/lib/gbz80/Makefile.in
@@ -11,7 +11,8 @@ TOPDIR = ../../..
 SCC = $(TOPDIR)/bin/sdcc -mgbz80
 SAS = $(TOPDIR)/bin/as-gbz80
 
-PORTDIR = ../build/gbz80
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/gbz80
 
 include $(srcdir)/../incl.mk
 
diff --git a/device/lib/hc08/Makefile.in b/device/lib/hc08/Makefile.in
index e2be970c..339428a6 100644
--- a/device/lib/hc08/Makefile.in
+++ b/device/lib/hc08/Makefile.in
@@ -11,7 +11,8 @@ TOPDIR = ../../..
 SCC = $(TOPDIR)/bin/sdcc -mhc08
 SAS = $(TOPDIR)/bin/as6808
 
-PORTDIR = ../build/hc08
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/hc08
 
 include $(srcdir)/../incl.mk
 
diff --git a/device/lib/mcs51/Makefile.in b/device/lib/mcs51/Makefile.in
index 16a2deab..c6e460a6 100644
--- a/device/lib/mcs51/Makefile.in
+++ b/device/lib/mcs51/Makefile.in
@@ -8,7 +8,8 @@ LIB_TYPE     = @LIB_TYPE@
 SAS = $(top_builddir)/bin/asx8051
 SCC = $(top_builddir)/bin/sdcc
 
-PORTDIR = ../build/$(PORT)
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/$(PORT)
 
 OBJ = crtstart.rel crtxinit.rel crtxclear.rel crtclear.rel crtxstack.rel \
       crtpagesfr.rel crtbank.rel crtcall.rel
diff --git a/device/lib/z80/Makefile.in b/device/lib/z80/Makefile.in
index 8f25860c..630c67a8 100644
--- a/device/lib/z80/Makefile.in
+++ b/device/lib/z80/Makefile.in
@@ -11,7 +11,8 @@ TOPDIR = ../../..
 SCC = $(TOPDIR)/bin/sdcc -mz80
 SAS = $(TOPDIR)/bin/as-z80
 
-PORTDIR = ../build/z80
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/z80
 
 include $(srcdir)/../incl.mk