Adding librarian to build

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

diff --git a/ChangeLog b/ChangeLog
index 1e3b1582848fd2fc5abaf4302e7d6166f4f7cdfe..807cd80c1db92d149a809d23dcabee861ddb67d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
        * src/SDCCicode.c (operandOperation): 3. fix, this time for Alpha; ULONG has 64 bits
        there, while the mantissa of a double is "only" 53 bits wide.
 
-2003-07-30  Jesus Calvino-Fraga <jesusc@ece.ubc.ca>
+2003-07-31  Jesus Calvino-Fraga <jesusc@ece.ubc.ca>
 
        Adding sdcclib to the build.  MSVC project coming soon.
        Files added/changed:
@@ -16,6 +16,10 @@
        * support\librarian\Makefile.in
        * support\librarian\sdcclib.c
        * Makefile.bcc
+       * Makefile
+       * Makefile.common.in
+       * configure
+       * configure.in
 
 2003-07-29  Jesus Calvino-Fraga <jesusc@ece.ubc.ca>
 

diff --git a/Makefile b/Makefile
index 4826af1040efde1ecc7c15bb7759bd781bada64b..f4cc8dd6bff3666e17ff063164a3576c9704f051 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ SDCC_EXTRA      = support/regression
 
 SDCC_ASLINK    = as/mcs51 as link
 SDCC_PACKIHX   = packihx
+SDCC_LIBRARIAN = support/librarian
 
 TARGETS         = sdcc-libs sdcc-cc sdcc-aslink sdcc-doc
 
@@ -37,8 +38,13 @@ 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)
+                 src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
 PORTS          = $(shell cat ports.build)
 ALLPORTS       = $(shell cat ports.all)
 
@@ -63,6 +69,9 @@ sdcc-misc:
 sdcc-packihx:
        $(MAKE) -C $(SDCC_PACKIHX)
 
+sdcc-librarian:
+       $(MAKE) -C $(SDCC_LIBRARIAN)
+
 sdcc-device: sdcc-cc sdcc-aslink
        $(MAKE) -C device/include
        $(MAKE) -C device/lib
@@ -76,7 +85,7 @@ sdcc-doc:
 
 sdcc: $(TARGETS)
 
-sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
+sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx sdcc-librarian
        $(MAKE) -f main.mk all
 
 # Some interesting sub rules

diff --git a/Makefile.common.in b/Makefile.common.in
index 405c8bb026ae9fdd6e5cf9003545a9a00e361bdf..ae4fff14307c23106b29fe497df247aedc055402 100644 (file)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -38,6 +38,7 @@ 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