Cleaning up mess while trying to build librarian. Added librarian to MSVC build.

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

diff --git a/ChangeLog b/ChangeLog
index 807cd80c1db92d149a809d23dcabee861ddb67d0..dd508a3efe1f1cd530a413e2062de05ae9547415 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2003-08-01  Jesus Calvino-Fraga <jesusc@ece.ubc.ca>
+
+    Added librarian to MSVC build:
+    * all.dsp
+    * sdcc.dsw
+    * support\librarian\librarian.dsp
+
+       'configure' not needed for librarian, removed:
+       * support\librarian\configure
+       * support\librarian\configure.in
+       * support\librarian\config_in.h
+       * support\librarian\Makefile.in
+
+       Hopefully these ones built the librarian and the rest of sdcc properly:
+       * Makefile
+       * Makefile.common.in
+
+       Messed up 'configure', so revert to previous version:
+       * configure
+       * configure.in
+
 2003-07-31  Bernhard Held <bernhard@bernhardheld.de>
 
        * src/SDCCicode.c (operandOperation): 3. fix, this time for Alpha; ULONG has 64 bits

diff --git a/Makefile b/Makefile
index f4cc8dd6bff3666e17ff063164a3576c9704f051..a970d3109c04138215b04e2598bca3e79d0139b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,8 @@ TARGETS         += sdcc-packihx
 PKGS            += $(SDCC_PACKIHX)
 endif
 
-ifneq ($(OPT_ENABLE_LIBRARIAN), no)
 TARGETS         += sdcc-librarian
 PKGS            += $(SDCC_LIBRARIAN)
-endif
 
 PKGS_TINI      = $(SDCC_LIBS) $(SDCC_ASLINK) \
                  src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)

diff --git a/Makefile.common.in b/Makefile.common.in
index ae4fff14307c23106b29fe497df247aedc055402..405c8bb026ae9fdd6e5cf9003545a9a00e361bdf 100644 (file)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -38,7 +38,6 @@ lib_dir_suffix     = @lib_dir_suffix@
 OPT_ENABLE_UCSIM = @OPT_ENABLE_UCSIM@
 OPT_ENABLE_DEVICE_LIB_BUILD = @OPT_ENABLE_DEVICE_LIB_BUILD@
 OPT_ENABLE_PACKIHX = @OPT_ENABLE_PACKIHX@
-OPT_ENABLE_LIBRARIAN = @OPT_ENABLE_LIBRARIAN@
 
 SLIB                   = $(PRJDIR)/support/Util