[hoc-cvs] hoc/Foundation Foundation.conf.in,NONE,1.1 Makefile.in,1.10,1.11 Foundation-macos.conf-inplace.in,1.2,NONE Foundation-macos.conf.in,1.3,NONE

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

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

Modified Files:
	Makefile.in 
Added Files:
	Foundation.conf.in 
Removed Files:
	Foundation-macos.conf-inplace.in Foundation-macos.conf.in 
Log Message:
Unify package config files for Cocoa and GNUstep


Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.in	1 Apr 2005 03:58:59 -0000	1.10
+++ Makefile.in	18 Apr 2005 00:45:42 -0000	1.11
@@ -19,11 +19,18 @@
             | sed 's@build/imports/@ ,@g' | sed 's/\.hi//g' | sed 's@/@.@g' \
             > exposed-modules.txt
 
-Foundation.conf-inplace: Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt
-	cat Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt > Foundation.conf-inplace
+Foundation.conf-inplace: Foundation.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@ Foundation.conf.in | grep -v '^#' > Foundation.conf-inplace 
+	cat exposed-modules.txt >> Foundation.conf-inplace
 
-Foundation.conf: Foundation-$(PLATFORM).conf exposed-modules.txt
-	cat Foundation-$(PLATFORM).conf exposed-modules.txt > Foundation.conf
+Foundation.conf: Foundation.conf.in exposed-modules.txt
+	gcc -E -x c -DGHC_LIB_PATH=@GHC_LIB_PATH@ \
+        	-DFOUNDATION_LIB_DIRS=@HOC_FOUNDATION_LIB_DIRS@ \
+		@HOC_DEFINES@ Foundation.conf.in | grep -v '^#' > $@ 
+	cat exposed-modules.txt >> Foundation.conf
 
 ghcmake: ghcmake.build-stamp
 
@@ -60,7 +67,7 @@
 
 libHSFoundation_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`/$@" $@
 
 #libHSFoundation.a: HSFoundation.o
@@ -69,7 +76,7 @@
 #	ranlib libHSFoundation.a
 
 clean:
-	rm -rf build libHSFoundation.a HSFoundation.o Foundation.hs \
+	rm -rf build libHSFoundation.a libHSFoundation_dyn.dylib HSFoundation.o Foundation.hs \
 	    Foundation ghcmake.build-stamp
 	
 install: all Foundation.conf

--- Foundation-macos.conf.in DELETED ---

--- NEW FILE: Foundation.conf.in ---
name:               Foundation
maintainer:         wol...@gm...
exposed:            True

hs-libraries:	    "HSFoundation"

#if INPLACE
import-dirs:        "../Foundation/build/imports"
library-dirs:       "../Foundation"
#else
import-dirs:        GHC_LIB_PATH/Foundation/imports
library-dirs:       GHC_LIB_PATH/Foundation
#endif

depends:            HOC

exposed-modules:
    Foundation


--- Foundation-macos.conf-inplace.in DELETED ---