[hoc-cvs] hoc/HOC_cbits Makefile.in,1.9,1.10

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC_cbits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10676/HOC_cbits

Modified Files:
	Makefile.in 
Log Message:
Use updated libffi.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC_cbits/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in	27 Sep 2005 12:22:42 -0000	1.9
+++ Makefile.in	17 Mar 2006 04:52:34 -0000	1.10
@@ -11,6 +11,13 @@
 	NewClass.m \
 	RetainedHaskellPart.m \
 	Marshalling.m \
+	../libffi-src/src/types.c \
+	../libffi-src/src/prep_cif.c \
+	../libffi-src/src/x86/ffi_darwin.c \
+	../libffi-src/src/x86/darwin.S \
+	../libffi-src/src/powerpc/ffi_darwin.c \
+	../libffi-src/src/powerpc/darwin.S \
+	../libffi-src/src/powerpc/darwin_closure.S \
 	Exceptions.m \
 	$(NULL)
 
@@ -20,10 +27,13 @@
 	Makefile.in \
 	$(wildcard *.h) \
 	$(NULL)
-	
-OBJS = $(SRCS:%.m=%.o)
 
-CFLAGS += -g -I../libffi-src/build/include
+OBJS_tmp1 = $(SRCS:%.c=%.o)	
+OBJS_tmp2 = $(OBJS_tmp1:%.S=%.o)	
+OBJS = $(OBJS_tmp2:%.m=%.o)
+
+CFLAGS += -g -I../libffi-src/include -fno-common -DMACOSX
+ASFLAGS += -I../libffi-src/include -DMACOSX
 
 all: libHOC_cbits.a HOC_cbits.o
 
@@ -37,14 +47,12 @@
 	fi
 
 libHOC_cbits.a: $(OBJS)
-	cp ../libffi-src/build/.libs/libffi.a libHOC_cbits.a
-	ar qs libHOC_cbits.a $(OBJS)
+	$(MAKE_STATIC_LIB) libHOC_cbits.a $(OBJS)
 
 libHOC_cbits_dyn.dylib: libHOC_cbits.a
 	export MACOSX_DEPLOYMENT_TARGET=10.3 && \
 	 libtool \
 	 -dynamic \
-	 -read_only_relocs suppress \
 	 -undefined dynamic_lookup \
 	 -o $@ \
 	 $<