* device/lib/Makefile.in: cp on sparc-solaris (SunOS) and on ppc-osx (Darwin) does...

[fw/sdcc] / device / lib / Makefile.in

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index 1d474e0f903bb51ffb2535e73ca32cc95aa87cf3..4e192d87ea40a41e05b09377a522852b546ee3c5 100644 (file)
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -12,8 +12,17 @@ CPP          = @CPP@
 INSTALL                = @INSTALL@
 CP              = @CP@
 
+ifeq ($(shell uname -s),Linux)
+CP_U   = $(CP) -u
+else
+CP_U   = $(CP)
+endif
+
 PRJDIR         = ../..
 INCDIR         = $(PRJDIR)/device/include
+ifndef PORTINCDIR
+PORTINCDIR     = $(INCDIR)/mcs51
+endif
 
 CC             = $(PRJDIR)/bin/sdcc
 CPP            = $(PRJDIR)/bin/sdcpp
@@ -34,7 +43,7 @@ lib_dir_suffix  = @lib_dir_suffix@
 
 sdcc_libdir     = $(DESTDIR)$(datadir)/$(lib_dir_suffix)
 
-CPPFLAGS        = -I$(INCDIR)
+CPPFLAGS        = -I$(INCDIR) -I$(PORTINCDIR)
 CFLAGS         = $(MODELFLAGS) --nostdinc
 
 BUILDDIR        = build
@@ -167,42 +176,39 @@ include incl.mk
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08
-
-# model-pic16
-# (needs gputils curently not available of sourceforge's compile farm)
+all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08 model-pic16
 
 objects: build-dir $(OBJECTS) port-specific-objects lib-files clean_intermediate
 
 models:
        if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \
          for model in $(MODELS); do \
-           $(MAKE) MODELFLAGS="--model-$$model" PORT=$$model objects; \
+           $(MAKE) MODELFLAGS="--model-$$model" PORT=$$model PORTINCDIR=$(INCDIR)/mcs51 objects; \
          done \
        fi
 
 model-mcs51-stack-auto:
        if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \
          for model in $(MODELS); do \
-           $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model-stack-auto objects; \
+           $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
          done \
        fi
 
 model-mcs51-xstack-auto:
        if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \
          for model in $(MODELS); do \
-           $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model-xstack-auto objects; \
+           $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model-xstack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
          done \
        fi
 
 model-ds390:
        if [ "`grep ds390 ../../ports.build`" = ds390 ]; then \
-         $(MAKE) MODELFLAGS="-mds390" PORT=ds390 objects; \
+         $(MAKE) MODELFLAGS="-mds390" PORT=ds390 PORTINCDIR=$(INCDIR)/mcs51 objects; \
        fi
 
 model-ds400:
        if [ "`grep ds400 ../../ports.build`" = ds400 ]; then \
-         $(MAKE) MODELFLAGS="-mds400" PORT=ds400 objects; \
+         $(MAKE) MODELFLAGS="-mds400" PORT=ds400 PORTINCDIR=$(INCDIR)/mcs51 objects; \
        fi
 
 model-xa51:
@@ -237,7 +243,7 @@ objects-hc08: build-dir $(HC08OBJECTS) port-specific-objects clean_intermediate
 model-pic16:
        if [ "`grep pic16 ../../ports.build`" = pic16 ]; then \
          $(MAKE) MODELFLAGS="-mpic16" PORT=pic16 OEXT=.lib objects-pic16; \
-         fi
+       fi
 
 objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16
        cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
@@ -255,7 +261,8 @@ port-specific-objects:
        fi
 
 port-specific-objects-pic16:
-       if [ -d $(PORT) ]; then \
+       -if [ -d $(PORT) ]; then \
+         mkdir -p $(PORT)/bin; \
          $(MAKE) -C $(PORT); \
          cp -f $(PORT)/bin/*.* $(PORTDIR); \
        fi
@@ -272,9 +279,9 @@ clean_intermediate-pic16:
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-       cp -r -u $(BUILDDIR)/* $(sdcc_libdir)
-       cp -r -u ds390 ds400 gbz80 z80 hc08 *.c $(sdcc_libdir)/src
-       rm -r `find $(sdcc_libdir)/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm' -or -name 'CVS'`
+       $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
+       $(CP_U) -r ds390 ds400 gbz80 z80 hc08 *.c $(sdcc_libdir)/src
+       rm -r `find $(sdcc_libdir)/src -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lst' -o -name '*.asm' -o -name 'CVS'`
 
 # Deleting all the installed files
 # --------------------------------
@@ -309,7 +316,7 @@ installdirs:
 # ---------------------
 dep: Makefile.dep
 
-Makefile.dep: $(SOURCES) $(INCDIR)/*.h
+Makefile.dep: $(SOURCES) $(INCDIR)/*.h $(PORTINCDIR)/*.h
        rm -f Makefile.dep
        for i in $(SOURCES); do \
          $(CPP) -std=c99 -M $(CPPFLAGS) $$i >$${i}.dep; \