* 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 1fd2ef9134b6354736573b0ff1c5b05d2c84ff7d..39b443a5f0957e877e73771cd6005304acc3307c 100644 (file)
--- 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 46b4d97eb6d9529a69e112bccb080717df94e824..7aa500004b46b52fa6c56c73641970e3b3cdac4a 100644 (file)
--- 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 135dce7286c879b3e6badaaa06a61a4d97a8a930..ac0630929b3d8c639ec8744265aa5a24b437e914 100644 (file)
--- 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 f29c9142c776efb3a3cd1a97f683504ca1200527..af20c72a37806f466e3639500dbec402ed92c95b 100644 (file)
--- 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 78d95d408f596db5a9e1ff149c9c61834d7f5c0d..7a007e5d788b8be5350c0164e31f097828338082 100644 (file)
--- 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 e2be970ccba9e1271a59d9688d7ec500d35df227..339428a64d1110427ed561ae1477952d62a7d1b4 100644 (file)
--- 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 16a2deab337b3a4aac6743f739c105be731772bc..c6e460a6e62c1e52a36002b238afb705d396c4b6 100644 (file)
--- 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 8f25860c4338ab7ab90237e183efbdcf0ee07799..630c67a84877fe4b8401569a7c6981db0daed357 100644 (file)
--- 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