X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2FMakefile.in;h=2c61f94641f12c6a9066e7a5b70254580b626caf;hb=52eb93f73f643bc7175d8f6ea06ec78b1026f001;hp=f935e987a302a74d488fdf32e76791fc74ba0cc3;hpb=71dcb0a63246246d95e0752e6d468ec3a7c31074;p=fw%2Fsdcc

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index f935e987..2c61f946 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
@@ -170,7 +176,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 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
 
@@ -242,6 +248,11 @@ model-pic16:
 objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16
 	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 +266,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/* $(PORTDIR); \
+	  cp -f $(PORT)/bin/*.* $(PORTDIR); \
 	fi
 
 lib-files:
@@ -273,9 +284,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
 # --------------------------------
@@ -304,6 +315,7 @@ installdirs:
 	[ -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
+	[ -d $(sdcc_libdir)/pic ] || mkdir -p $(sdcc_libdir)/pic
 	mkdir -p $(sdcc_libdir)/src
 
 # Creating dependencies