Update of /cvsroot/hoc/hoc/AppKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17071/AppKit
Modified Files:
Makefile.in
Added Files:
AppKit.conf.in
Removed Files:
AppKit-macos.conf AppKit-macos.conf-inplace.in
AppKit-macos.conf.in
Log Message:
Unify package config files for Cocoa and GNUstep
Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in 1 Apr 2005 03:58:58 -0000 1.9
+++ Makefile.in 18 Apr 2005 00:45:43 -0000 1.10
@@ -19,11 +19,18 @@
| sed 's@build/imports/@ ,@g' | sed 's/\.hi//g' | sed 's@/@.@g' \
> exposed-modules.txt
-AppKit.conf-inplace: AppKit-$(PLATFORM).conf-inplace.in exposed-modules.txt
- cat AppKit-$(PLATFORM).conf-inplace.in exposed-modules.txt > AppKit.conf-inplace
+AppKit.conf-inplace: AppKit.conf.in exposed-modules.txt
+ gcc -E -x c -DINPLACE=1 \
+ -DGHC_LIB_PATH=@GHC_LIB_PATH@ \
+ -DFOUNDATION_LIB_DIRS=@HOC_FOUNDATION_LIB_DIRS@ \
+ @HOC_DEFINES@ AppKit.conf.in | grep -v '^#' > AppKit.conf-inplace
+ cat exposed-modules.txt >> AppKit.conf-inplace
-AppKit.conf: AppKit-$(PLATFORM).conf exposed-modules.txt
- cat AppKit-$(PLATFORM).conf exposed-modules.txt > AppKit.conf
+AppKit.conf: AppKit.conf.in exposed-modules.txt
+ gcc -E -x c -DGHC_LIB_PATH=@GHC_LIB_PATH@ \
+ -DFOUNDATION_LIB_DIRS=@HOC_FOUNDATION_LIB_DIRS@ \
+ @HOC_DEFINES@ AppKit.conf.in | grep -v '^#' > $@
+ cat exposed-modules.txt >> AppKit.conf
ghcmake: ghcmake.build-stamp
@@ -68,7 +75,7 @@
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
+ | xargs libtool -dynamic -o $@ -undefined dynamic_lookup
install_name_tool -id "`pwd`/$@" $@
#libHSAppKit.a: HSAppKit.o
@@ -77,7 +84,7 @@
# ranlib libHSAppKit.a
clean:
- rm -rf build libHSAppKit.a HSAppKit.o AppKit.hs AppKit \
+ rm -rf build libHSAppKit.a libHSAppKit_dyn.dylib HSAppKit.o AppKit.hs AppKit \
Cocoa.hs ghcmake.build-stamp
install: all AppKit.conf
--- AppKit-macos.conf.in DELETED ---
--- NEW FILE: AppKit.conf.in ---
name: AppKit
maintainer: wol...@gm...
exposed: True
hs-libraries: "HSAppKit"
#if GNUSTEP
extra-libraries: "gnustep-gui"
#else
frameworks: "AppKit"
#endif
#if INPLACE
import-dirs: "../AppKit/build/imports"
library-dirs: "../AppKit"
FOUNDATION_LIB_DIRS
#else
import-dirs: GHC_LIB_PATH/AppKit/imports
library-dirs: GHC_LIB_PATH/AppKit
FOUNDATION_LIB_DIRS
#endif
depends: HOC, Foundation
exposed-modules:
AppKit
--- AppKit-macos.conf DELETED ---
--- AppKit-macos.conf-inplace.in DELETED ---
|
