* device/lib/pic16/configure, device/lib/pic16/configure.ac:

  always use the sdcc from the current build tree (ignore $CC from
  the environment, fixes compile farm builds)
* device/lib/Makefile.in: rename .a into .lib for compatibility,
  remove more build products from install directory
* sdcc/src/pic16/main.c (_pic16_linkEdit,_pic16_finaliseOptions)
* sdcc/support/scripts/sdcc.nsi: revert to .lib extension for libs

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

diff --git a/ChangeLog b/ChangeLog
index d864dcc4a084c25cf7be631c08fbe31bf8a1f7fb..8c5b03581cdc4bb38a1c29e314d93f7807d5e398 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-24 Raphael Neider <rneider AT web.de>
+
+       * device/lib/pic16/configure, device/lib/pic16/configure.ac:
+         always use the sdcc from the current build tree (ignore $CC from
+         the environment, fixes compile farm builds)
+       * device/lib/Makefile.in: rename .a into .lib for compatibility,
+         remove more build products from install directory
+       * sdcc/src/pic16/main.c (_pic16_linkEdit,_pic16_finaliseOptions)
+       * sdcc/support/scripts/sdcc.nsi: revert to .lib extension for libs
+
 2008-08-24 Borut Razem <borut.razem AT siol.net>
 
        * src/SDCC.y: applied patch

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index 235bd35b5e1e527416378ffa7e0d424ce126e83c..fa743b6dfee29b061199658164bebb9cd4429aa2 100644 (file)
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -328,7 +328,7 @@ port-specific-objects:
 port-specific-objects-pic16:
        -if [ -f $(PORT)/Makefile ]; then \
          $(MAKE) -C $(PORT); \
-         cp -f $(PORT)/*/lib*.a $(PORTDIR); \
+         for i in $(PORT)/*/lib*.a; do cp -f $$i $(PORTDIR)/$$(basename $$i .a).lib; done; \
          cp -f $(PORT)/*/crt0*.o $(PORTDIR); \
        fi
 
@@ -363,15 +363,17 @@ install: all installdirs
        for src in $(MODELS) ds390 ds400 gbz80 z80 hc08 pic pic16; do \
          find $(sdcc_libdir)/src/$$src -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' -o \
-           -name 'Makefile*' \) \
-           -exec rm -rf {}+ \; ; \
+           -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
+           -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
+           -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
+           -name 'bootstrap.sh' \) \
+           -exec rm -rf {} + ; \
        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' -o \
          -name 'Makefile*' \) \
-         -exec rm -rf {}+ \;
+         -exec rm -rf {} +
 
 # Deleting all the installed files
 # --------------------------------

diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure
index cc871d8fc275180fa3db4cba85406d9e06af789e..7896b90535e828792f047c3c6f4fbe83308a1d7f 100755 (executable)
--- a/device/lib/pic16/configure
+++ b/device/lib/pic16/configure
@@ -2181,11 +2181,11 @@ libdir=$libdir/pic16
 
 # The default architecture can be selected at configure time by setting the
 # environment variable ARCH to the desired device (18fxxx).
-ARCH=${ARCH-18f452}
+ARCH=${ARCH:-18f452}
 
 
 # We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time...
-CC=${CC-$abs_top_builddir/../../../bin/sdcc}
+CC=\"$abs_top_builddir/../../../bin/sdcc\"
 
 CFLAGS="-mpic16 -p$ARCH"
 

diff --git a/device/lib/pic16/configure.ac b/device/lib/pic16/configure.ac
index 30de488e7336afc5dd310a8f8b218e56360305da..3e27ac1e5d7da055ecbcfd0b5eae7f2d11f73ab8 100644 (file)
--- a/device/lib/pic16/configure.ac
+++ b/device/lib/pic16/configure.ac
@@ -36,10 +36,10 @@ libdir=$libdir/pic16
 
 # The default architecture can be selected at configure time by setting the
 # environment variable ARCH to the desired device (18fxxx).
-AC_SUBST(ARCH, [${ARCH-18f452}])
+AC_SUBST(ARCH, [${ARCH:-18f452}])
 
 # We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time...
-AC_SUBST(CC, [${CC-$abs_top_builddir/../../../bin/sdcc}])
+AC_SUBST(CC, [\"$abs_top_builddir/../../../bin/sdcc\"])
 AC_SUBST(CFLAGS, ["-mpic16 -p$ARCH"])
 AC_PATH_PROG(CCAS, gpasm, :)
 AC_SUBST(CCAS, [\"$CCAS\"])

diff --git a/src/pic16/main.c b/src/pic16/main.c
index 246007b22db0257a3d156946aa2cd9d935f5f53e..f396f9a2383059779557c86b3e87721f49e52149 100644 (file)
--- a/src/pic16/main.c
+++ b/src/pic16/main.c
@@ -695,18 +695,18 @@ static void _pic16_linkEdit(void)
 
     if(!libflags.ignore) {
       if(libflags.want_libc)
-        addSet(&libFilesSet, Safe_strdup("libc18f.a"));
+        addSet(&libFilesSet, Safe_strdup("libc18f.lib"));
 
           if(libflags.want_libm)
-            addSet(&libFilesSet, Safe_strdup("libm18f.a"));
+            addSet(&libFilesSet, Safe_strdup("libm18f.lib"));
 
           if(libflags.want_libio) {
-            sprintf(temp, "libio%s.a", pic16->name[1]);   /* build libio18f452.a name */
+            sprintf(temp, "libio%s.lib", pic16->name[1]);   /* build libio18f452.lib name */
             addSet(&libFilesSet, Safe_strdup(temp));
           }
 
           if(libflags.want_libdebug)
-            addSet(&libFilesSet, Safe_strdup("libdebug.a"));
+            addSet(&libFilesSet, Safe_strdup("libdebug.lib"));
         }
 
     shash_add(&linkValues, "libs", joinStrSet(libFilesSet));
@@ -753,11 +753,11 @@ _pic16_finaliseOptions (void)
       char devlib[512];
 
       /* now add the library for the device */
-      sprintf(devlib, "libdev%s.a", pic16->name[1]);   /* e.g., libdev18f452.a */
+      sprintf(devlib, "libdev%s.lib", pic16->name[1]);   /* e.g., libdev18f452.lib */
       addSet(&libFilesSet, Safe_strdup(devlib));
 
       /* add the internal SDCC library */
-      addSet(&libFilesSet, Safe_strdup( "libsdcc.a" ));
+      addSet(&libFilesSet, Safe_strdup( "libsdcc.lib" ));
     }
 
   if (alt_asm && alt_asm[0] != '\0')

diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index 7f05acb62a15a6a7714fb0d2f0b03605bed52325..de51aa13f6642e7124d6541dda06aff74ff1a5e2 100644 (file)
--- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi
@@ -500,7 +500,7 @@ ${Section} "SDCC PIC16 library" SEC15
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\pic16"
   File "${DEV_ROOT}\lib\pic16\*.o"
-  File "${DEV_ROOT}\lib\pic16\*.a"
+  File "${DEV_ROOT}\lib\pic16\*.lib"
 ${SectionEnd}
 
 ${Section} "SDCC PIC library" SEC16
@@ -849,7 +849,7 @@ ${Section} Uninstall SECUNINSTALL
   Delete "$INSTDIR\lib\pic\*.lib"
 
   Delete "$INSTDIR\lib\pic16\*.o"
-  Delete "$INSTDIR\lib\pic16\*.a"
+  Delete "$INSTDIR\lib\pic16\*.lib"
 
   Delete "$INSTDIR\lib\hc08\*.rel"
   Delete "$INSTDIR\lib\hc08\*.lib"