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

diff --git a/uffi/Makefile b/uffi/Makefile
index c2d1b3d..b24f376 100644
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -1,55 +1,71 @@
-# -*- Mode: Makefile -*-
-###########################################################################
+#!/usr/bin/make
 # FILE IDENTIFICATION
-# 
+#
 #  Name:         Makefile
-#  Purpose:      Makefile for the CLSQL UFFI helper package
+#  Purpose:      Makefile for CLSQL UFFI interface
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id$
-#
-# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+# 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
 # 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  # For Linux (ALL) and FreeBSD (ACL)
-LD=gcc
+SUBDIRS=
 
-# Use these for Sun's C compiler and Solaris (ACL)
-#CC=cc
-#SHARED_CC_OPT=-KPIC
-#SHARED_LD_OPT=-G
-#LD=ld
+include ../Makefile.common
 
-# Nothing to configure beyond this point
-
-base=clsql-uffi
+base=clsql_uffi
 source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
+shared64_lib=$(base)64.so
+dylib=$(base).dylib
 
-.PHONY: all clean distclean
-
+.PHONY: all
 all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
-	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
-	$(LD) ${SHARED_LD_OPT} $(object) -o $(shared_lib)
-	@rm $(object)
+ifneq ($(OS_AIX),0)
+	gcc -c -D_BSD -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void $(source)
+	make_shared -o $(shared_lib) $(object)
+else
+  ifneq ($(OS_SUNOS),0)
+	cc -KPIC -c $(source) -o $(object)
+	cc -G $(object) -o $(shared_lib)
+  else
+    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_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_CYGWIN),0)
+	  gcc -c $(source) -o $(object)
+	  ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
+        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)
+          else
+	    gcc -fPIC -DPIC -c $(source) -o $(object)
+	    ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+        endif
+      endif
+    endif
+  endif
+endif
+endif
+	rm -f $(object)
 
-clean:
-	@rm -f $(object) $(shared_lib) *~
 
+.PHONY: distclean
 distclean: clean
-
-mac: $(source) Makefile
-	cc -dynamic -c $(source) -o $(object)
-	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)
+	@rm -f $(dylib) $(shared_lib) $(shared64_lib) $(object) z.dylib