[hoc-cvs] hoc/HOC HOC.conf.in,NONE,1.1 Makefile.in,1.12,1.13 HOC-gnustep.conf,1.2,NONE HOC-gnustep.conf-inplace,1.2,NONE HOC-macos.conf-inplace,1.6,NONE HOC-macos.conf.in,1.2,NONE

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

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

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


--- HOC-macos.conf.in DELETED ---

--- HOC-gnustep.conf DELETED ---

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

exposed-modules:
    HOC,
    HOC.SelectorNameMangling,
    HOC.Arguments,
    HOC.FFICallInterface,
    HOC.StdArgumentTypes,
    HOC.TH,
    HOC.DeclareClass,
    HOC.ID,
    HOC.Class,
    HOC.DeclareSelector,
    HOC.SelectorMarshaller,
    HOC.Base,
    HOC.NewlyAllocated,
    HOC.Invocation,
    HOC.MsgSend,
    HOC.Utilities,
    HOC.ExportClass,
    HOC.NewClass

hs-libraries:       "HOC", "HOC_cbits"
depends:            base, template-haskell

#if GNUSTEP
extra-libraries:    "gnustep-base", "objc"
#else
extra-libraries:    "objc"
frameworks:         Foundation
#endif

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

Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.in	1 Apr 2005 03:58:59 -0000	1.12
+++ Makefile.in	18 Apr 2005 00:45:42 -0000	1.13
@@ -13,11 +13,21 @@
 
 all: libHOC.a libHOC_dyn.dylib HOC.o ../inplace.conf
 
-../inplace.conf: HOC-$(PLATFORM).conf-inplace
+../inplace.conf: HOC.conf-inplace
 	[ -f "$@" ] || echo '[]' > $@
-	$(GHC_PKG) register HOC-$(PLATFORM).conf-inplace \
+	$(GHC_PKG) update HOC.conf-inplace \
 		--package-conf=../inplace.conf
 
+%.conf: %.conf.in
+	gcc -E -x c -DGHC_LIB_PATH=@GHC_LIB_PATH@ \
+        	-DFOUNDATION_LIB_DIRS=@HOC_FOUNDATION_LIB_DIRS@ \
+		@HOC_DEFINES@ $< | grep -v '^#' > $@ 
+%.conf-inplace: %.conf.in
+	gcc -E -x c -DINPLACE=1 \
+		-DGHC_LIB_PATH=@GHC_LIB_PATH@ \
+        	-DFOUNDATION_LIB_DIRS=@HOC_FOUNDATION_LIB_DIRS@ \
+		@HOC_DEFINES@ $< | grep -v '^#' > $@ 
+
 libHOC.a: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs $(MAKE_STATIC_LIB) libHOC.a
 
@@ -25,7 +35,6 @@
 	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`/$@" $@
@@ -75,7 +84,7 @@
 
 install: all
 	mkdir -p $(GHC_LIB_PATH)/HOC
-	cp -R libHOC.a HOC.o build/imports \
+	cp -R libHOC.a libHOC_dyn.dylib HOC.o build/imports \
 		$(GHC_LIB_PATH)/HOC/
 	ranlib $(GHC_LIB_PATH)/HOC/libHOC.a
-	$(GHC_PKG) update HOC-$(PLATFORM).conf
+	$(GHC_PKG) update HOC.conf

--- HOC-gnustep.conf-inplace DELETED ---

--- HOC-macos.conf-inplace DELETED ---