From: Andre P. <at...@us...> - 2005-04-01 03:00:14
|
Update of /cvsroot/hoc/hoc/AppKit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16779/AppKit Modified Files: 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/AppKit/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.in 31 Mar 2005 16:37:57 -0000 1.7 +++ Makefile.in 1 Apr 2005 03:00:05 -0000 1.8 @@ -7,7 +7,7 @@ Makefile.in \ $(NULL) -all: libHSAppKit.a HSAppKit.o register-inplace +all: libHSAppKit.a libHSAppKit_dyn.dylib HSAppKit.o register-inplace register-inplace: AppKit.conf-inplace [ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf @@ -38,6 +38,7 @@ mkdir -p build/objects mkdir -p build/imports $(GHC) --make AppKit.hs \ + -fPIC -dynamic \ -ignore-package AppKit \ -odir build/objects \ -hidir build/imports \ @@ -51,6 +52,7 @@ -package-conf ../inplace.conf \ -fglasgow-exts $(GHC) -c Cocoa.hs \ + -fPIC -dynamic \ -ignore-package AppKit \ -ibuild/imports \ -o build/objects/Cocoa.o \ @@ -65,6 +67,11 @@ libHSAppKit.a: ghcmake find build/objects/ -name \*.o | xargs libtool -static -o libHSAppKit.a +libHSAppKit_dyn.dylib: ghcmake + export MACOSX_DEPLOYMENT_TARGET=10.3 && find build/objects/ -name \*.o \ + | xargs libtool -read_only_relocs suppress -dynamic -o $@ -undefined dynamic_lookup + install_name_tool -id "`pwd`/$@" $@ + #libHSAppKit.a: HSAppKit.o # rm -f libHSAppKit.a # ar cq libHSAppKit.a HSAppKit.o @@ -76,8 +83,8 @@ install: all AppKit.conf mkdir -p $(GHC_LIB_PATH)/AppKit - cp -R libHSAppKit.a HSAppKit.o build/imports \ - $(GHC_LIB_PATH)/AppKit/ + cp -R libHSAppKit.a HSAppKit.o build/imports libHSAppKit_dyn.dylib \ + $(GHC_LIB_PATH)/AppKit/ ranlib $(GHC_LIB_PATH)/AppKit/libHSAppKit.a ghc-pkg --update-package \ --input-file=AppKit.conf |