[hoc-cvs] hoc/AppKit Makefile.in,1.5,1.6

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

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

Modified Files:
	Makefile.in 
Log Message:
Upgrade to GHC 6.3, recent snapshot.
I'm sure there are more places in HOC.* where we can take advantage of
TH 2.0's new features,
and the Cabal-aware build system is still quite fragile.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	17 May 2004 18:07:41 -0000	1.5
+++ Makefile.in	6 Dec 2004 03:46:49 -0000	1.6
@@ -7,7 +7,23 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSAppKit.a HSAppKit.o
+all: libHSAppKit.a HSAppKit.o ../inplace.conf
+
+../inplace.conf: AppKit.conf-inplace
+	$(GHC_PKG) unregister --force --package-conf=../inplace.conf AppKit || true
+	$(GHC_PKG) register AppKit.conf-inplace \
+		--package-conf=../inplace.conf
+
+exposed-modules.txt:
+	find build/imports | grep '\.hi' \
+            | 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: AppKit-$(PLATFORM).conf.in exposed-modules.txt
+	cat AppKit-$(PLATFORM).conf.in exposed-modules.txt > AppKit.conf
 
 ghcmake: ghcmake.build-stamp
 
@@ -22,50 +38,47 @@
 	mkdir -p build/objects
 	mkdir -p build/imports
 	$(GHC) --make AppKit.hs	\
-		-package-name AppKit	\
+		-ignore-package AppKit	\
 		-odir build/objects \
 		-hidir build/imports	\
-		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
-		-package-conf ../Foundation/Foundation.conf-inplace \
+		-package-conf ../inplace.conf \
 		-fglasgow-exts
 	test ! -r GNUstepGUI.hs || \
 		$(GHC) --make GNUstepGUI.hs	\
-			-package-name AppKit	\
+			-ignore-package AppKit	\
 			-odir build/objects \
 			-hidir build/imports	\
-			-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
-			-package-conf ../Foundation/Foundation.conf-inplace \
+			-package-conf ../inplace.conf \
 			-fglasgow-exts
 	$(GHC) -c Cocoa.hs \
-		-package-name AppKit	\
+		-ignore-package AppKit	\
 		-ibuild/imports	   \
 		-o build/objects/Cocoa.o	\
 		-ohi build/imports/Cocoa.hi \
-		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
-		-package-conf ../Foundation/Foundation.conf-inplace \
+		-package-conf ../inplace.conf \
 		-fglasgow-exts
 	touch $@
 	
 HSAppKit.o: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs ld -r -x -o HSAppKit.o
 
-#libHSAppKit.a: ghcmake
-#	find build/objects/ -name \*.o | xargs libtool -static -o libHSAppKit.a
+libHSAppKit.a: ghcmake
+	find build/objects/ -name \*.o | xargs libtool -static -o libHSAppKit.a
 
-libHSAppKit.a: HSAppKit.o
-	rm -f libHSAppKit.a
-	ar cq libHSAppKit.a HSAppKit.o
-	ranlib libHSAppKit.a
+#libHSAppKit.a: HSAppKit.o
+#	rm -f libHSAppKit.a
+#	ar cq libHSAppKit.a HSAppKit.o
+#	ranlib libHSAppKit.a
 
 clean:
 	rm -rf build libHSAppKit.a HSAppKit.o AppKit.hs AppKit \
 	    Cocoa.hs ghcmake.build-stamp
 
-install: all
+install: all AppKit.conf
 	mkdir -p $(GHC_LIB_PATH)/AppKit
 	cp -R libHSAppKit.a HSAppKit.o build/imports \
 		$(GHC_LIB_PATH)/AppKit/
 	ranlib $(GHC_LIB_PATH)/AppKit/libHSAppKit.a
 	ghc-pkg --update-package	\
-			--input-file=AppKit-$(PLATFORM).conf
+			--input-file=AppKit.conf