[hoc-cvs] hoc/AppKit Makefile.in,1.12,1.13

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

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

Modified Files:
	Makefile.in 
Log Message:
Enable -O -fasm;
... and clean up the makefiles, remove stray -fPIC flags and vestiges of
dynamic linking experiments (this should be re-added using an optional
configure flag in the future).


Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.in	30 Jul 2005 08:24:42 -0000	1.12
+++ Makefile.in	3 Aug 2005 01:48:51 -0000	1.13
@@ -45,6 +45,7 @@
 	mkdir -p build/objects
 	mkdir -p build/imports
 	$(GHC) --make AppKit.hs	\
+		-O -fasm \
 		-ignore-package AppKit	\
 		-odir build/objects \
 		-hidir build/imports	\
@@ -58,7 +59,6 @@
 			-package-conf ../inplace.conf \
 			-fglasgow-exts
 	$(GHC) -c Cocoa.hs \
-		-fPIC -dynamic \
 		-ignore-package AppKit	\
 		-ibuild/imports	   \
 		-o build/objects/Cocoa.o	\
@@ -71,18 +71,13 @@
 	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
+	find build/objects/ -name \*.o | xargs $(MAKE_STATIC_LIB) libHSAppKit.a
 
 libHSAppKit_dyn.dylib: ghcmake
 	export MACOSX_DEPLOYMENT_TARGET=10.3 && find build/objects/ -name \*.o \
 	 | xargs libtool -dynamic -o $@ -undefined dynamic_lookup
 	install_name_tool -id "`pwd`/$@" $@
 
-#libHSAppKit.a: HSAppKit.o
-#	rm -f libHSAppKit.a
-#	ar cq libHSAppKit.a HSAppKit.o
-#	ranlib libHSAppKit.a
-
 clean:
 	rm -rf build libHSAppKit.a libHSAppKit_dyn.dylib HSAppKit.o \
 	    AppKit.hs AppKit Cocoa.hs ghcmake.build-stamp \