[hoc-cvs] hoc/HOC .cvsignore,1.2,1.3 HOC-macos.conf-inplace,1.5,1.6 HOC-macos.conf.in,1.1,1.2 Makefile.in,1.10,1.11

[Andre P. <at...@us...>]

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

Modified Files:
	.cvsignore HOC-macos.conf-inplace HOC-macos.conf.in 
	Makefile.in 
Log Message:
Build static and dynamic versions of HOC/Foundation/AppKit packages (dynamic
versions are largely untested at the moment, and may be broken)

Added 'make check' target

Added Makefile for Tests/ directory

ifgen now compiles with -dynamic, hooray

Build static and dynamic versions of Tests/TestFoundation (untested, but at
least the static version should work OK)

Warning: make install will definitely be broken for the dynamic versions of the
libraries, since I haven't updated the Makefiles to run install_name_tool to
change the id of the .dylib file yet



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.in	31 Mar 2005 16:37:58 -0000	1.10
+++ Makefile.in	1 Apr 2005 03:00:05 -0000	1.11
@@ -11,7 +11,7 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHOC.a HOC.o ../inplace.conf
+all: libHOC_dyn.dylib HOC.o ../inplace.conf
 
 ../inplace.conf: HOC-$(PLATFORM).conf-inplace
 	[ -f "$@" ] || echo '[]' > $@
@@ -21,9 +21,14 @@
 libHOC.a: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs $(MAKE_STATIC_LIB) libHOC.a
 
-#libHOC.dylib: ghcmake
-#	export MACOSX_DEPLOYMENT_TARGET=10.3 && find build/objects/ -name \*.o \#
-#       | xargs libtool -dynamic -o libHOC.dylib -undefined dynamic_lookup
+libHOC_dyn.dylib: ghcmake
+	export MACOSX_DEPLOYMENT_TARGET=10.3 && find build/objects/ -name \*.o \
+	 | xargs libtool \
+	   -dynamic \
+	   -read_only_relocs suppress \
+	   -undefined dynamic_lookup \
+	   -o $@
+	install_name_tool -id "`pwd`/$@" $@
 
 HOC.o: libHOC.a
 	ld -r -x -o HOC.o $(ALL_LOAD) libHOC.a
@@ -40,6 +45,7 @@
 	mkdir -p build/objects
 	mkdir -p build/imports
 	$(GHC) --make HOC/Arguments.hs	\
+		-fPIC -dynamic \
 		-odir build/objects -hidir build/imports	\
 		-fglasgow-exts -fth \
 		../HOC_cbits/HOC_cbits.o	\
@@ -50,6 +56,7 @@
 		$(FOUNDATION_LIBS)      \
                 $(DEFINES)
 	$(GHC) --make HOC.hs	\
+		-fPIC -dynamic \
 		-odir build/objects -hidir build/imports	\
 		-fglasgow-exts -fth \
 		../HOC_cbits/HOC_cbits.o	\

Index: HOC-macos.conf.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HOC-macos.conf.in	31 Mar 2005 16:37:58 -0000	1.1
+++ HOC-macos.conf.in	1 Apr 2005 03:00:05 -0000	1.2
@@ -27,5 +27,6 @@
 
 hs-libraries:       "HOC", "HOC_cbits"
 extra-libraries:    "objc"
+ld-options:         "-read_only_relocs", "suppress"
 frameworks:         "Foundation"
 depends:            base, template-haskell

Index: HOC-macos.conf-inplace
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf-inplace,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HOC-macos.conf-inplace	31 Mar 2005 15:30:18 -0000	1.5
+++ HOC-macos.conf-inplace	1 Apr 2005 03:00:05 -0000	1.6
@@ -29,6 +29,7 @@
 hs-libraries:       "HOC", "HOC_cbits"
 extra-libraries:    "objc"
 frameworks:         "Foundation"
+ld-options:         "-read_only_relocs", "suppress"
 
 depends:            base, template-haskell
 

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	31 Mar 2005 16:37:58 -0000	1.2
+++ .cvsignore	1 Apr 2005 03:00:05 -0000	1.3
@@ -2,4 +2,5 @@
 ghcmake.build-stamp
 Makefile
 HOC-macos.conf
+libHOC_dyn.dylib