X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2FMakefile;h=6e63e03cfdd6e283e04f78836ec2da0e9d5fa7e2;hb=95f40554edd65fffc81b5595a8abdf669e5dccad;hp=c21eef51cf337d036248f1e7e4ef24ba506b833e;hpb=c111edce91ce4aceb898fa4f7e98b9d532c281a5;p=clsql.git

diff --git a/interfaces/mysql/Makefile b/interfaces/mysql/Makefile
index c21eef5..6e63e03 100644
--- a/interfaces/mysql/Makefile
+++ b/interfaces/mysql/Makefile
@@ -7,7 +7,7 @@
 #  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
 #
@@ -16,52 +16,45 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ###########################################################################
 
-AR=ar
 
 # These variables are correct for GCC
-# you'll need to modify these for other compilers
 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
 
+
 # Set to the directory where you have installed mysql's library
-#MYSQL_DIR=/usr
 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
 
-# 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:
-	rm -f $(SHARED) $(STATIC)
+	rm -f $(object) $(shared_lib)
 
 realclean: clean
 	rm -f *~