X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2FMakefile;h=3a497c1662dedcc6d470706be9d47c273ca44cd6;hp=a5c6c6d50f541f07caa1cc7f70a15c11bb04cdbc;hb=180b52cb686a87487e12e87b13bafe131e6c3bef;hpb=4e13a7c3d278d8a8a9cd39d72f82355c5a76e6eb

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index a5c6c6d..3a497c1 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -21,20 +21,24 @@ source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
 shared64_lib=$(base)64.so
-
+dylib=$(base).dylib
 
 .PHONY: all
 all: $(shared_lib)
 
-CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include
-LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
+CFLAGS:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql55/mysql -I /usr/local/mysql/include
+LDFLAGS:=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
-CFLAGS32=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
-LDFLAGS32=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc
+CFLAGS32:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
+LDFLAGS32:=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc
 
 ifneq ($(OS_CYGWIN),0)
-  CFLAGS=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
-  LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lpthread -lz -lm -lgcc -lc
+  CFLAGS:=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
+  LDFLAGS:=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lpthread -lz -lm -lgcc -lc
+endif
+ifneq ($(OS_DPKG_BUILDFLAGS),0)
+  CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
+  LDFLAGS:=$(LDFLAGS) $(shell dpkg-buildflags --get LDFLAGS | sed "/-Wl,\(.*\)/ s//\1/")
 endif
 
 $(shared_lib): $(source) Makefile
@@ -46,32 +50,36 @@ else
 	cc $(CFLAGS) -KPIC -c $(source) -o $(object)
 	cc -G $(object) $(LDFLAGS) -o $(shared_lib)
   else
-    ifneq ($(OS_DARWIN),0)
-	cc $(CFLAGS) -dynamic -c $(source) -o $(object)
-	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)
-	ld -bundle /usr/lib/bundle1.o $(LDFLAGS) -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
+    ifneq ($(OS_DARWIN64),0)
+	cc $(CFLAGS) -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(source) -o $(dylib)
+	cc -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
     else
-      ifneq ($(OS_CYGWIN),0)
-	gcc $(CFLAGS) -DWIN32 -c $(source) -o $(object)
-	ld -shared -soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)
+      ifneq ($(OS_DARWIN),0)
+	cc $(CFLAGS) -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(source) -o $(dylib)
+	cc -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
       else
-        ifneq ($(OS_LINUX64),0)
-	  gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-	  ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
-	  rm $(object)
-	  @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
-	  -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
-	  -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+        ifneq ($(OS_CYGWIN),0)
+	  gcc $(CFLAGS) -DWIN32 -c $(source) -o $(object)
+	  ld -shared -soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)
         else
-	  gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-	  ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+          ifneq ($(OS_LINUX64),0)
+	    gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+	    ld $(LDFLAGS) -shared -soname=$(base) $(object) -o $(shared64_lib)
+	    rm $(object)
+	    @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
+	    -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
+	    -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+          else
+	    gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+	    ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+          endif
         endif
       endif
     endif
   endif
 endif
-	rm $(object)
+	rm -f $(object)
 
 .PHONY: distclean
 distclean: clean
-	rm -f $(base).dylib $(base).dylib $(base).so $(base).o
+	@rm -f $(dylib) $(shared_lib) $(shared64_lib) $(object) z.dylib