X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2FMakefile.in;h=424d841fc9281ead67d4e0fb5d3884eca89ec6c7;hb=bfd7431078b6d902b991d098798911bd612bf670;hp=3539dc77ef59d2b33e859390c5f00160e2124ab0;hpb=53a098b1e0c14c7180ee47bf1dba32c7f5828226;p=fw%2Fsdcc

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index 3539dc77..424d841f 100644
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -12,6 +12,12 @@ 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
@@ -38,12 +44,14 @@ lib_dir_suffix  = @lib_dir_suffix@
 sdcc_libdir     = $(DESTDIR)$(datadir)/$(lib_dir_suffix)
 
 CPPFLAGS        = -I$(INCDIR) -I$(PORTINCDIR)
-CFLAGS		= $(MODELFLAGS) --nostdinc
+CFLAGS		= $(MODELFLAGS) --nostdinc --std-sdcc99
 
 BUILDDIR        = build
 # Default
 PORT            = z80
+ifndef PORTDIR
 PORTDIR         = $(BUILDDIR)/$(PORT)
+endif
 
 SOURCES		= _atof.c _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
 		  _decdptr.c _divsint.c _divslong.c _divuint.c \
@@ -170,7 +178,7 @@ include incl.mk
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08 model-pic16
+all: checkconf models small-mcs51-stack-auto model-ds390 model-ds400 model-z80 model-gbz80 model-hc08 model-pic16 model-pic14
 
 objects: build-dir $(OBJECTS) port-specific-objects lib-files clean_intermediate
 
@@ -181,17 +189,22 @@ models:
 	  done \
 	fi
 
+small-mcs51-stack-auto:
+	if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \
+	  $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small PORTDIR=$(BUILDDIR)/small-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
+	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 PORTINCDIR=$(INCDIR)/mcs51 objects; \
+	    $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model PORTDIR=$(BUILDDIR)/$$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 PORTINCDIR=$(INCDIR)/mcs51 objects; \
+	    $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-xstack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
 	  done \
 	fi
 
@@ -240,8 +253,13 @@ model-pic16:
 	fi
 
 objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16
-	cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
+	-cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
 
+# yes, we do reuse the *-pic16 rules for pic14
+model-pic14:
+	if [ "`grep pic ../../ports.build | grep -v pic16`" = pic ]; then \
+	  $(MAKE) MODELFLAGS="-mpic14" PORT=pic OEXT=.lib objects-pic16; \
+	fi
 
 build-dir: $(PORTDIR)
 
@@ -255,10 +273,10 @@ 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/*.o $(PORT)/bin/*.lib $(PORTDIR); \
+	  cp -f $(PORT)/bin/*.* $(PORTDIR); \
 	fi
 
 lib-files:
@@ -273,9 +291,18 @@ 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 $(MODELS) mcs51 ds390 ds400 gbz80 z80 hc08 pic pic16 *.c $(sdcc_libdir)/src
+	for srcdir in $(MODELS) ds390 ds400 gbz80 z80 hc08 pic pic16; do \
+	  find $(sdcc_libdir)/src/$$srcdir -depth \
+	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'build' -o -name 'bin' \) \
+	    -exec rm -r {} \; ; \
+	done
+	find $(sdcc_libdir)/src/mcs51 -depth \
+	  \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+	  -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' \) \
+	  -exec rm -r {} \;
 
 # Deleting all the installed files
 # --------------------------------
@@ -297,13 +324,12 @@ installcheck:
 installdirs:
 	[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
 	for model in $(MODELS); do \
-	 [ -d $(sdcc_libdir)/$$model ] || \
-	 mkdir -p $(sdcc_libdir)/$$model; \
+	  [ -d $(sdcc_libdir)/$$model ] || \
+	  mkdir -p $(sdcc_libdir)/$$model; \
+	done
+	for libdir in small-stack-auto ds390 ds400 hc08 pic16 pic; do \
+	  [ -d $(sdcc_libdir)/$$libdir ] || mkdir -p $(sdcc_libdir)/$$libdir; \
 	done
-	[ -d $(sdcc_libdir)/ds390 ] || mkdir -p $(sdcc_libdir)/ds390
-	[ -d $(sdcc_libdir)/ds400 ] || mkdir -p $(sdcc_libdir)/ds400
-	[ -d $(sdcc_libdir)/hc08 ] || mkdir -p $(sdcc_libdir)/hc08
-	[ -d $(sdcc_libdir)/pic16 ] || mkdir -p $(sdcc_libdir)/pic16
 	mkdir -p $(sdcc_libdir)/src
 
 # Creating dependencies