* src/pic16/gen.c (genCast): fixed typo

* device/lib/pic16/Makefile.subdir: only install existing files
* device/lib/pic16/libdev/Makefile.in: build serially, avoid races

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

diff --git a/ChangeLog b/ChangeLog
index e1a8d0c2f755395bcbbf329b487fd50e001fc813..e252f20a3a20dcd1bc666d6e39ad0d120686fdfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-25 Raphael Neider <rneider AT web.de>
+
+       * src/pic16/gen.c (genCast): fixed typo
+       * device/lib/pic16/Makefile.subdir: only install existing files
+       * device/lib/pic16/libdev/Makefile.in: build serially, avoid races
+
 2007-02-25 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * device/lib/mcs51/crtcall.asm: new, added for indirect calls

diff --git a/device/lib/pic16/Makefile.subdir b/device/lib/pic16/Makefile.subdir
index 9e745b5a43dc27a313e1a8a99996a2651f66e4cd..eb4a8be9148383315c539d2d46db57aa5352c433 100644 (file)
--- a/device/lib/pic16/Makefile.subdir
+++ b/device/lib/pic16/Makefile.subdir
@@ -37,18 +37,27 @@ LIB_LIB =
 #TARGETS ?= $(OBJS)
 endif
 
-.PHONY : all install clean clean-intermediate
+.PHONY : all install clean clean-intermediate $(addprefix install,$(TARGETS))
+
+ifndef SILENT
+ECHO=echo
+else
+ECHO=true
+endif
 
 all : install
 
 ifneq (,$(strip $(TARGETS)))
+
+$(addprefix install,$(TARGETS)): install% : %
+       @-if [ -e "$<" ]; then \
+       [ -d "$(top_builddir)/$(installdir)" ] || $(MKDIR) "$(top_builddir)/$(installdir)"; \
+       $(ECHO) "[INSTALL] $(patsubst $(top_builddir)/$(builddir)/%,%,$<)"; \
+       [ ! -e "$<" ] || $(CP) "$<" "$(top_builddir)/$(installdir)"; \
+       fi
+
 # usually install $(LIB_LIB) or $(OBJS), race condition in "[ -d x ] || mkdir x"
-install : recurse $(OBJS) $(LIB_LIB)
-       @$(MKDIR) "$(top_builddir)/$(installdir)"
-ifndef SILENT
-       @-echo "[INSTALL] $(patsubst $(top_builddir)/$(builddir)/%,%,$(TARGETS))";
-endif
-       $(Q)-$(CP) $(TARGETS) "$(top_builddir)/$(installdir)"
+install : recurse $(OBJS) $(LIB_LIB) $(addprefix install,$(TARGETS))
 else
 # used in subdirs like libc/ctype whose files
 # are contained in a parent's library

diff --git a/device/lib/pic16/libdev/Makefile.in b/device/lib/pic16/libdev/Makefile.in
index a7494489b367e46a69f031c5efc31ed911b931fa..344c2b8a51743c1991fd7e6d2b03bf69401f8487 100644 (file)
--- a/device/lib/pic16/libdev/Makefile.in
+++ b/device/lib/pic16/libdev/Makefile.in
@@ -21,6 +21,8 @@ top_srcdir   = @top_srcdir@
 srcdir       = @srcdir@
 VPATH        = @srcdir@
 
+.NOTPARALLEL:
+
 SUBDIRS = 
 MKLIB  = device_libs
 C_FILES = $(notdir $(wildcard $(srcdir)/*.c))

diff --git a/src/pic16/gen.c b/src/pic16/gen.c
index c03145c48b829e10b2cd956c8bf09602c261e20b..7f9dbe233b1fe782e292a873fe6e4482ede89c58 100644 (file)
--- a/src/pic16/gen.c
+++ b/src/pic16/gen.c
@@ -13175,12 +13175,12 @@ static void genCast (iCode *ic)
              tag = GPTR_TAG_CODE;
            } else if (IS_PTR(rtype)) {
              PERFORM_ONCE(weirdcast,
-             fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(unknown*)' -- assumimg __data space\n", ic->filename, ic->lineno);
+             fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(unknown*)' -- assuming __data space\n", ic->filename, ic->lineno);
              );
              tag = GPTR_TAG_DATA;
            } else {
              PERFORM_ONCE(weirdcast,
-             fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(non-pointer)' -- assumimg __data space\n", ic->filename, ic->lineno);
+             fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(non-pointer)' -- assuming __data space\n", ic->filename, ic->lineno);
              );
              tag = GPTR_TAG_DATA;
            }