r1729: *** empty log message ***

diff --git a/interfaces/clsql-uffi/Makefile b/interfaces/clsql-uffi/Makefile
index 8f322b7d278690897b6d2db1637d2ce766257ba9..9c474211b3a1ca91b6dff19930148a7b95fd13f8 100644 (file)
--- a/interfaces/clsql-uffi/Makefile
+++ b/interfaces/clsql-uffi/Makefile
@@ -7,7 +7,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #

-#  CVS Id:   $Id: Makefile,v 1.3 2002/04/01 17:33:48 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.4 2002/04/03 04:06:05 kevin Exp $

 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #


@@ -16,46 +16,37 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ###########################################################################
 
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ###########################################################################
 

-AR=ar

 
 # These variables are correct for GCC
 
 # These variables are correct for GCC

-# you'll need to modify these for other compilers

 CC=gcc
 CC=gcc

-SHARED_CC_OPT=-fpic
+SHARED_CC_OPT=-fPIC -DPIC

 
 

-SHARED_LD_OPT=-shared # For Linux
-#SHARED_LD_OPT=-r # For FreeBSD and Solaris
+#SHARED_LD_OPT=-r # For FreeBSD and Solaris (CMUCL)
+SHARED_LD_OPT=-Bshareable -Bdynamic  # For Linux (ALL) and FreeBSD (ACL)

 
 

-# If you are using Solaris, these are the correct values
-# for creating a shared library
+# Use these for Sun's C compiler and Solaris (ACL)

 #CC=cc
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
 
 #CC=cc
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
 

-# Nothing to configure beyond this point

 
 

-BASE=clsql-uffi
-SRC=$(BASE).c
-OBJECT=$(BASE).o
-SHARED=$(BASE).so
-STATIC=$(BASE).a
+# Nothing to configure beyond this point

 
 

-all: $(SHARED) $(STATIC)
+base=clsql-uffi
+source=$(base).c
+object=$(base).o
+shared_lib=$(base).so

 
 

-$(SHARED): $(SRC)
-       $(CC) $(SHARED_CC_OPT) -c $(SRC) -o $(OBJECT)
-       ld $(SHARED_LD_OPT) $(OBJECT) -o $(SHARED)
-       @rm $(OBJECT)
+all: $(shared_lib)

 
 

-$(STATIC): $(SRC) 
-       $(CC) -c $(SRC) -o $(OBJECT)
-       $(AR) r $(STATIC) $(OBJECT)
-       @rm $(OBJECT)
+$(shared_lib): $(source) Makefile
+       $(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
+       ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+       rm $(object)

 
 clean:
 
 clean:

-       rm -f $(SHARED) $(STATIC)
+       rm -f $(object) $(shared_lib)

 
 realclean: clean
        rm -f *~
 
 
 realclean: clean
        rm -f *~
 

-

diff --git a/interfaces/mysql/Makefile b/interfaces/mysql/Makefile
index c21eef51cf337d036248f1e7e4ef24ba506b833e..6e63e03cfdd6e283e04f78836ec2da0e9d5fa7e2 100644 (file)
--- a/interfaces/mysql/Makefile
+++ b/interfaces/mysql/Makefile
@@ -7,7 +7,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #

-#  CVS Id:   $Id: Makefile,v 1.3 2002/04/01 17:33:49 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.4 2002/04/03 04:06:05 kevin Exp $

 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #


@@ -16,52 +16,45 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ###########################################################################
 
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ###########################################################################
 

-AR=ar

 
 # These variables are correct for GCC
 
 # These variables are correct for GCC

-# you'll need to modify these for other compilers

 CC=gcc
 CC=gcc

-SHARED_CC_OPT=-fpic
+SHARED_CC_OPT=-fPIC -DPIC

 
 

-SHARED_LD_OPT=-shared # For Linux
-#SHARED_LD_OPT=-r # For FreeBSD and Solaris
+#SHARED_LD_OPT=-r # For FreeBSD and Solaris (CMUCL)
+SHARED_LD_OPT=-Bshareable -Bdynamic  # For Linux (ALL) and FreeBSD (ACL)

 
 

-# If you are using Solaris, these are the correct values
-# for creating a shared library
+# Use these for Sun's C compiler and Solaris (ACL)

 #CC=cc
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
 
 #CC=cc
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
 

+

 # Set to the directory where you have installed mysql's library
 # Set to the directory where you have installed mysql's library

-#MYSQL_DIR=/usr

 MYSQL_DIR=/opt/mysql
 MYSQL_DIR=/opt/mysql

+#MYSQL_DIR=/usr

 
 MYSQL_LIB=$(MYSQL_DIR)/lib/mysql
 MYSQL_LIB_FILE=$(MYSQL_LIB)/libmysqlclient.so
 MYSQL_INCLUDE=$(MYSQL_DIR)/include/mysql
 
 
 MYSQL_LIB=$(MYSQL_DIR)/lib/mysql
 MYSQL_LIB_FILE=$(MYSQL_LIB)/libmysqlclient.so
 MYSQL_INCLUDE=$(MYSQL_DIR)/include/mysql
 

-# Nothing to configure beyond this point

 
 

-BASE=clsql-mysql
-SRC=$(BASE).c
-OBJECT=$(BASE).o
-SHARED=$(BASE).so
-STATIC=$(BASE).a
+# Nothing to configure beyond this point

 
 

-all: $(SHARED) $(STATIC)
+base=clsql-mysql
+source=$(base).c
+object=$(base).o
+shared_lib=$(base).so

 
 

-$(SHARED): $(SRC) $(MYSQL_LIB_FILE)
-       $(CC) $(SHARED_CC_OPT) -I $(MYSQL_INCLUDE) -c $(SRC) -o $(OBJECT)
-       ld $(SHARED_LD_OPT) $(OBJECT) $(MYSQL_LIB_FILE) -o $(SHARED)
-       @rm $(OBJECT)
+all: $(shared_lib)

 
 

-$(STATIC): $(SRC) $(MYSQL_LIB_FILE)
-       $(CC) -I $(MYSQL_INCLUDE) -c $(SRC) -o $(OBJECT)
-       $(AR) r $(STATIC) $(OBJECT)
-       @rm $(OBJECT)
+$(shared_lib): $(source) Makefile $(MYSQL_LIB_FILE)
+       $(CC) ${SHARED_CC_OPT} -I $(MYSQL_INCLUDE) -c $(source) -o $(object)
+       ld ${SHARED_LD_OPT} $(object) $(MYSQL_LIB_FILE) -o $(shared_lib)
+       rm $(object)

 
 clean:
 
 clean:

-       rm -f $(SHARED) $(STATIC)
+       rm -f $(object) $(shared_lib)

 
 realclean: clean
        rm -f *~
 
 realclean: clean
        rm -f *~