X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2FMakefile;h=b24f37603a49f73be9c53a631f37938417192a74;hp=ac52e34d8e1d8dcdd21a072e181469eea193aa81;hb=01c654c9e616801affcb94ea0e75c8d486e203b9;hpb=244328d6a2b108b8d4448df06034ca088e313440

diff --git a/uffi/Makefile b/uffi/Makefile
index ac52e34..b24f376 100644
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -21,6 +21,7 @@ source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
 shared64_lib=$(base)64.so
+dylib=$(base).dylib
 
 .PHONY: all
 all: $(shared_lib)
@@ -34,33 +35,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
-        ifneq ($(OS_LINUX64),0)
-	  gcc -fPIC -DPIC -c $(source) -o $(object)
-	  ld -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 -fPIC -DPIC -c $(source) -o $(object)
-	  ld -melf_i386 -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
-	  gcc -fPIC -DPIC -c $(source) -o $(object)
-	  ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+          ifneq ($(OS_LINUX64),0)
+	    gcc -fPIC -DPIC -c $(source) -o $(object)
+	    ld -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 -fPIC -DPIC -c $(source) -o $(object)
+	    -ld -melf_i386 -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