X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2FMakefile;h=2b58f2d5338b0688fb1d559401cdf80892174cec;hb=5f548b417f69de4a45a29fcddf3a6e9b02519752;hp=728c5ee873d68a49c5e50032f1dfea834334b4c1;hpb=bada52b7a8fd2cc484dee33cccd64ca09a52ec3d;p=clsql.git

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 728c5ee..2b58f2d 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -1,9 +1,7 @@
-# -*- Mode: Makefile -*-
-###########################################################################
 # FILE IDENTIFICATION
-# 
+#
 #  Name:         Makefile
-#  Purpose:      Makefile for the CLSQL MySQL database interface
+#  Purpose:      Makefile for CLSQL MySQL interface
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
@@ -14,51 +12,24 @@
 # CLSQL users are granted the rights to distribute and use this software
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-###########################################################################
-
-# These variables are correct for GCC
-CC=gcc
-SHARED_CC_OPT=-fPIC -DPIC
-SHARED_LD_OPT=-shared
-LD=gcc
 
-# Use these for Sun's C compiler and Solaris (ACL)
-#CC=cc
-#SHARED_CC_OPT=-KPIC
-#SHARED_LD_OPT=-G
-#LD=ld
+SUBDIRS=
 
-# 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
+include ../Makefile.common
 
-# Nothing to configure beyond this point
-
-base=clsql-mysql
+base=clsql_mysql
 source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
 
-.PHONY: all clean distclean
-
-all: compile
 
-compile: $(shared_lib)
+.PHONY: all
+all: $(shared_lib)
 
-$(object): $(source) mysql.h
-	$(CC) ${SHARED_CC_OPT} $(INCLUDE_DIRS) -c $< -o $@
-
-$(shared_lib): $(object) 
-	$(LD) ${SHARED_LD_OPT} $^ -o $@
-
-mac: $(object)
-	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(object) -o $(base).dylib
-	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /sw/lib/libmysqlclient.dylib -o libmysqlclient.dylib
-	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o libz.dylib
-
-clean:
-	@rm -f $(object) $(shared_lib) *~
+$(shared_lib): $(source) Makefile
+	CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient -lz -lc" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
+	rm $(object)
 
+.PHONY: distclean
 distclean: clean
-
+	rm -f $(base).dylib $(base).dylib $(base).so $(base).o