Changed makefiles to create libraries for the interpreter and compile…

…r (gambcgsi and gambcgsc)
feeley · Dec 14, 2007 · aa3899a · aa3899a
1 parent 3ea365c
commit aa3899a
Show file tree

Hide file tree

Showing 34 changed files with 1,146 additions and 1,406 deletions.
diff --git a/.hgignore b/.hgignore
@@ -80,6 +80,10 @@ gsc/_env\.c
 gsc/_env\.o
 gsc/_front\.c
 gsc/_front\.o
+gsc/_gambcgsc\.c
+gsc/_gambcgsc\.o
+gsc/_gsclib\.c
+gsc/_gsclib\.o
 gsc/_gsc\.c
 gsc/_gsc\.o
 gsc/_gsc_\.c
@@ -106,12 +110,18 @@ gsc/_t-c-3\.c
 gsc/_t-c-3\.o
 gsc/_utils\.c
 gsc/_utils\.o
+gsc/libgambcgsc\.a
 gsc/gsc
 gsc/makefile
+gsi/_gambcgsi\.c
+gsi/_gambcgsi\.o
+gsi/_gsilib\.c
+gsi/_gsilib\.o
 gsi/_gsi\.c
 gsi/_gsi\.o
 gsi/_gsi_\.c
 gsi/_gsi_\.o
+gsi/libgambcgsi\.a
 gsi/gsi
 gsi/makefile
 include/config\.h

diff --git a/bin/makefile.in b/bin/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/configure.ac b/configure.ac
@@ -1171,30 +1171,40 @@ if test "$ENABLE_SHARED" = yes; then
   case "$target_os" in
 
      mingw*) GAMBCLIB="libgambc.dll"
+             GAMBCGSCLIB="libgambcgsc.dll"
+             GAMBCGSILIB="libgambcgsi.dll"
              SETDLPATH="PATH=\"\$(rootfromhere)/lib:\${PATH}\""
              ;;
 
     darwin*) GAMBCLIB="libgambc.dylib"
+             GAMBCGSCLIB="libgambcgsc.dylib"
+             GAMBCGSILIB="libgambcgsi.dylib"
              SETDLPATH="DYLD_LIBRARY_PATH=\$(rootfromhere)/lib:\${DYLD_LIBRARY_PATH}"
              ;;
 
       hpux*) GAMBCLIB="libgambc.so"
+             GAMBCGSCLIB="libgambcgsc.so"
+             GAMBCGSILIB="libgambcgsi.so"
              SETDLPATH="SHLIB_PATH=\$(rootfromhere)/lib:\${SHLIB_PATH}"
              ;;
 
        aix*) GAMBCLIB="libgambc.so"
+             GAMBCGSCLIB="libgambcgsc.so"
+             GAMBCGSILIB="libgambcgsi.so"
              SETDLPATH="LIBPATH=\$(rootfromhere)/lib:\${LIBPATH}"
              ;;
 
           *) GAMBCLIB="libgambc.so"
+             GAMBCGSCLIB="libgambcgsc.so"
+             GAMBCGSILIB="libgambcgsi.so"
              SETDLPATH="LD_LIBRARY_PATH=\$(rootfromhere)/lib:\${LD_LIBRARY_PATH}"
              ;;
   esac
 
-  MAKE_GAMBCLIB='$(C_COMPILER) $(FLAGS_LIB) -o $(GAMBCLIB) $(OBJECTS) $(LIBS)'
+  MAKE_LIBRARY='$(C_COMPILER) $(FLAGS_LIB) -o $(LIBRARY) $(LIBRARY_OBJECTS) $(LIBS)'
   FIXLIB='#'
-  LINK='$(C_COMPILER) $(FLAGS_EXE) $(OBJECTS) -L$(rootfromhere)/lib -lgambc $(LIBS) -o $(EXECUTABLE)'
-  LINK_FOR_INSTALL='$(C_COMPILER) $(FLAGS_EXE) $(OBJECTS) -L$(libdir) -lgambc $(LIBS) -o $(EXECUTABLE)'
+  LINK='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS) $(LIBS) -o $(EXECUTABLE)'
+  LINK_FOR_INSTALL='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_FOR_INSTALL_LIBS) $(LIBS) -o $(EXECUTABLE)'
 
 else
 
@@ -1205,9 +1215,11 @@ else
     ########## Microsoft Visual C++ compiler
 
     GAMBCLIB="libgambc.lib"
-    MAKE_GAMBCLIB='lib -out:$(GAMBCLIB) $(OBJECTS)'
+    GAMBCGSCLIB="libgambcgsc.lib"
+    GAMBCGSILIB="libgambcgsi.lib"
+    MAKE_LIBRARY='lib -out:$(LIBRARY) $(LIBRARY_OBJECTS)'
     FIXLIB=':'
-    LINK='$(C_COMPILER) $(FLAGS_EXE) $(OBJECTS) $(rootfromhere)/lib/$(GAMBCLIB) $(LIBS) -Fe$(EXECUTABLE)'
+    LINK='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS) $(LIBS) -Fe$(EXECUTABLE)'
     LINK_FOR_INSTALL=':'
 
 #  else if test "$C_COMP_WATCOMC" = yes; then
@@ -1218,9 +1230,11 @@ else
     ########## Other C compiler
 
     GAMBCLIB="libgambc.a"
-    MAKE_GAMBCLIB='ar rc $(GAMBCLIB) $(OBJECTS) && $(RANLIB) $(GAMBCLIB)'
+    GAMBCGSCLIB="libgambcgsc.a"
+    GAMBCGSILIB="libgambcgsi.a"
+    MAKE_LIBRARY='ar rc $(LIBRARY) $(LIBRARY_OBJECTS) && $(RANLIB) $(LIBRARY)'
     FIXLIB='$(RANLIB)'
-    LINK='$(C_COMPILER) $(FLAGS_EXE) $(OBJECTS) $(rootfromhere)/lib/$(GAMBCLIB) $(LIBS) -o $(EXECUTABLE)'
+    LINK='$(C_COMPILER) $(FLAGS_EXE) $(EXECUTABLE_OBJECTS) $(LINK_LIBS) $(LIBS) -o $(EXECUTABLE)'
     LINK_FOR_INSTALL=':'
 
   fi
@@ -1323,7 +1337,9 @@ AC_SUBST(bat)
 AC_SUBST(SETDLPATH)
 AC_SUBST(GSC_CC_O)
 AC_SUBST(GAMBCLIB)
-AC_SUBST(MAKE_GAMBCLIB)
+AC_SUBST(GAMBCGSCLIB)
+AC_SUBST(GAMBCGSILIB)
+AC_SUBST(MAKE_LIBRARY)
 AC_SUBST(LINK)
 AC_SUBST(LINK_FOR_INSTALL)
 AC_SUBST(INSTALL)

diff --git a/doc/makefile.in b/doc/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/Xlib-simple/makefile.in b/examples/Xlib-simple/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/distr-comp/makefile.in b/examples/distr-comp/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/makefile.in b/examples/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/misc/makefile.in b/examples/misc/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/pi/makefile.in b/examples/pi/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/pthread/makefile.in b/examples/pthread/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/ring/makefile.in b/examples/ring/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/tcltk/makefile.in b/examples/tcltk/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/web-repl/makefile.in b/examples/web-repl/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@

diff --git a/examples/web-server/makefile.in b/examples/web-server/makefile.in
@@ -30,6 +30,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 
 GAMBCLIB = @GAMBCLIB@
+GAMBCCOMPLIB = @GAMBCCOMPLIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LIB = @INSTALL_LIB@