Menu
▾
▴
[hoc-cvs] hoc/AppKit Makefile.in,1.3,1.4
|
From: Andre P. <at...@us...> - 2004-05-14 06:05:52
|
Update of /cvsroot/hoc/hoc/AppKit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/AppKit Modified Files: Makefile.in Log Message: More build system changes ... Build system now actually implements the --with-ghc parameter :) -- define a $GHC variable in config.mk Added --with-ghc-pkg parameter (if you want to e.g. do "--with-ghc-pkg=ghc-pkg-6.2.1") Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir` in all the Makefiles Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile Index: Makefile.in =================================================================== RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 12 May 2004 11:11:05 -0000 1.3 +++ Makefile.in 14 May 2004 06:05:11 -0000 1.4 @@ -14,7 +14,7 @@ ln -sf ../Bindings/ifgen-output/GNUstepGUI.hs . mkdir -p build/objects mkdir -p build/imports - ghc --make AppKit.hs \ + $(GHC) --make AppKit.hs \ -package-name AppKit \ -odir build/objects \ -hidir build/imports \ @@ -22,14 +22,14 @@ -package-conf ../Foundation/Foundation.conf-inplace \ -fglasgow-exts test ! -r GNUstepGUI.hs || \ - ghc --make GNUstepGUI.hs \ + $(GHC) --make GNUstepGUI.hs \ -package-name AppKit \ -odir build/objects \ -hidir build/imports \ -package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \ -package-conf ../Foundation/Foundation.conf-inplace \ -fglasgow-exts - ghc -c Cocoa.hs \ + $(GHC) -c Cocoa.hs \ -package-name AppKit \ -ibuild/imports \ -o build/objects/Cocoa.o \ @@ -55,9 +55,10 @@ Cocoa.hs ghcmake.build-stamp install: all - mkdir -p `ghc --print-libdir`/AppKit + mkdir -p $(GHC_LIB_PATH)/AppKit cp -R libHSAppKit.a HSAppKit.o build/imports \ - `ghc --print-libdir`/AppKit/ - ranlib `ghc --print-libdir`/AppKit/libHSAppKit.a + $(GHC_LIB_PATH)/AppKit/ + ranlib $(GHC_LIB_PATH)/AppKit/libHSAppKit.a ghc-pkg --update-package \ --input-file=AppKit-$(PLATFORM).conf + |
