X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2FMakefile;h=b1f9cded247cf81dc4da408907c240542cc5467b;hb=42a951e9f7152e7c145958f4dfed41d4e865c9fd;hp=d805efc00fcee1dc5ec0457bf30ef3e1688eefed;hpb=2359c743fa126e65514454a7996e025f139a8241;p=clsql.git

diff --git a/interfaces/mysql/Makefile b/interfaces/mysql/Makefile
index d805efc..b1f9cde 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.2 2002/04/01 05:27:55 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.8 2002/04/07 08:59:29 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -16,51 +16,44 @@
 # (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
+LD=gcc
 
-# 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
+#LD=ld
 
-# Set to the directory where you have installed mysql's library
-#MYSQL_DIR=/usr
-MYSQL_DIR=/opt/mysql
-
-MYSQL_LIB=$(MYSQL_DIR)/lib/mysql
-MYSQL_LIB_FILE=$(MYSQL_LIB)/libmysqlclient.so
-MYSQL_INCLUDE=$(MYSQL_DIR)/include/mysql
+# May need to change to the directory where you have installed mysql's library
+vpath %.so /usr/lib /usr/local/lib /opt/mysql/lib/mysql
+vpath %.h /usr/include /usr/include/mysql /usr/local/include /usr/local/include/mysql /opt/mysql/include/mysql
+INCLUDE_DIRS=-I/usr/include/mysql -I/usr/local/include/mysql -I/opt/mysql/include/mysql -I/usr/include -I/usr/local/include
 
 # Nothing to configure beyond this point
 
-BASE=clsql-mysql
-SRC=$(BASE).c
-OBJECT=$(BASE).o
-SHARED=$(BASE).so
-STATIC=$(BASE).a
+base=clsql-mysql
+source=$(base).c
+object=$(base).o
+shared_lib=$(base).so
+
+.PHONY: all clean distclean
+
+all: compile
 
-all: $(SHARED) $(STATIC)
+compile: $(shared_lib)
 
-$(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)
+$(object): $(source) mysql.h
+	$(CC) ${SHARED_CC_OPT} $(INCLUDE_DIRS) -c $< -o $@
 
-$(STATIC): $(SRC) $(MYSQL_LIB_FILE)
-	$(CC) -I $(MYSQL_INCLUDE) -c $(SRC) -o $(OBJECT)
-	$(AR) r $(STATIC) $(OBJECT)
-	@rm $(OBJECT)
+$(shared_lib): $(object) -lmysqlclient
+	$(LD) ${SHARED_LD_OPT} $^ -o $@
 
 clean:
-	rm -f $(SHARED) $(STATIC)
+	@rm -f $(object) $(shared_lib) *~
 
-realclean: clean
-	rm -f *~
+distclean: clean