[hoc-cvs] hoc/AppKit AppKit-macos.conf-inplace.in,NONE,1.1 AppKit-macos.conf.in,NONE,1.1 .cvsignore,1.1,1.2 AppKit-macos.conf,1.1,1.2 Makefile.in,1.6,1.7

[Andre P. <at...@us...>]

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

Modified Files:
	.cvsignore AppKit-macos.conf Makefile.in 
Added Files:
	AppKit-macos.conf-inplace.in AppKit-macos.conf.in 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in	6 Dec 2004 03:46:49 -0000	1.6
+++ Makefile.in	31 Mar 2005 16:37:57 -0000	1.7
@@ -7,11 +7,11 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSAppKit.a HSAppKit.o ../inplace.conf
+all: libHSAppKit.a HSAppKit.o register-inplace
 
-../inplace.conf: AppKit.conf-inplace
-	$(GHC_PKG) unregister --force --package-conf=../inplace.conf AppKit || true
-	$(GHC_PKG) register AppKit.conf-inplace \
+register-inplace: AppKit.conf-inplace
+	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
+	$(GHC_PKG) update AppKit.conf-inplace \
 		--package-conf=../inplace.conf
 
 exposed-modules.txt:
@@ -22,8 +22,8 @@
 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
+AppKit.conf: AppKit-$(PLATFORM).conf exposed-modules.txt
+	cat AppKit-$(PLATFORM).conf exposed-modules.txt > AppKit.conf
 
 ghcmake: ghcmake.build-stamp
 

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

import-dirs:	    "@GHC_LIB_PATH@/AppKit/imports"
library-dirs:	    "@GHC_LIB_PATH@/AppKit/"
hs-libraries:	    "HSAppKit"
frameworks:         "AppKit"
depends:            HOC, Foundation

exposed-modules:
    AppKit

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 15:41:23 -0000	1.1
+++ .cvsignore	31 Mar 2005 16:37:57 -0000	1.2
@@ -1,2 +1,7 @@
 build
 Makefile
+exposed-modules.txt
+ghcmake.build-stamp
+
+AppKit.conf
+AppKit.conf-inplace

Index: AppKit-macos.conf
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/AppKit-macos.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AppKit-macos.conf	5 Apr 2004 00:04:46 -0000	1.1
+++ AppKit-macos.conf	31 Mar 2005 16:37:57 -0000	1.2
@@ -1,18 +1,12 @@
-Package
-{
-    name = "AppKit",
-    auto = True,
-    import_dirs = ["$libdir/AppKit/imports"],
-    source_dirs = [],
-    library_dirs = ["$libdir/AppKit/"],
-    hs_libraries = ["HSAppKit"],
-    extra_libraries = [],
-    include_dirs = [],
-    c_includes = [],
-    package_deps = ["Foundation"],
-    extra_ghc_opts = [],
-    extra_cc_opts = [],
-    extra_ld_opts = [],
-    framework_dirs = [],
-    extra_frameworks = ["AppKit"]
-}
+name:               AppKit
+maintainer:         wol...@gm...
+exposed:            True
+
+import-dirs:	    "/usr/local/lib/ghc-6.4/AppKit/imports"
+library-dirs:	    "/usr/local/lib/ghc-6.4/AppKit/"
+hs-libraries:	    "HSAppKit"
+frameworks:         "AppKit"
+depends:            HOC, Foundation
+
+exposed-modules:
+    AppKit

--- NEW FILE: AppKit-macos.conf-inplace.in ---
name:               AppKit
maintainer:         wol...@gm...
exposed:            True

import-dirs:	    "../AppKit/build/imports"
library-dirs:	    "../AppKit"
hs-libraries:	    "HSAppKit"
frameworks:         "AppKit"
depends:            HOC, Foundation

exposed-modules:
    AppKit