X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2FMakefile;h=77203fdfc723150ac9baf5a3b98a149cc14f0e27;hp=c1af3f8f6760770b16bdf95da5ac05b45a1618d7;hb=2ba41ebdcd4963728c8d5460e389a5381b8e2293;hpb=f10c3dcbe75b5532d6646e24ecd25f5651a0c3a9

diff --git a/uffi/Makefile b/uffi/Makefile
index c1af3f8..77203fd 100644
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -6,8 +6,6 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id$
-#
 # This file, part of CLSQL, is Copyright (c) 2002-2006 by Kevin M. Rosenberg
 #
 # CLSQL users are granted the rights to distribute and use this software
@@ -22,6 +20,14 @@ base=clsql_uffi
 source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
+shared64_lib=$(base)64.so
+dylib=$(base).dylib
+
+ifneq ($(OS_DPKG_BUILDFLAGS),0)
+  CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
+  LDFLAGS:=$(LDFLAGS) $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
+endif
+
 
 .PHONY: all
 all: $(shared_lib)
@@ -35,28 +41,37 @@ else
 	cc -KPIC -c $(source) -o $(object)
 	cc -G $(object) -o $(shared_lib)
   else
-    ifneq ($(OS_DARWIN),0)
-	cc -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 -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
+    ifneq ($(OS_DARWIN64),0)
+	cc -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 -c $(source) -o $(object)
-	ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
+      ifneq ($(OS_DARWIN),0)
+	  cc -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
-	gcc -fPIC -DPIC -c $(source) -o $(object)
-	ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+        ifneq ($(OS_CYGWIN),0)
+	  gcc -c $(source) -o $(object)
+	  ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
+        else
+          ifneq ($(OS_LINUX64),0)
+	    gcc $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
+	    ld $(LDFLAGS) -shared -soname=$(base) -lc $(object) -o $(shared64_lib)
+	    rm -f $(object)
+	    @echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
+	    -gcc -m32 $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
+	    -ld -melf_i386 $(LDFLAGS) -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+          else
+	    gcc -fPIC -DPIC -c $(source) -o $(object)
+	    ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+        endif
       endif
     endif
   endif
 endif
-	rm $(object)
+endif
+	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