X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=bff2772058af2598b9070a480081390fb27b6015;hb=c6d90de6e5236d32df49609bb9179b0108033c86;hp=665da7e32034d88ebddda5773c3ce98b6ac88011;hpb=5038d54ac9ef6eac1d852629b7fe885cb250f3aa;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 665da7e..bff2772 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,13 +1,15 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.34 2004/01/09 12:43:37 simonmar Exp $
+# $Id: package.mk,v 1.42 2004/11/26 16:22:13 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
+ifeq "$(STANDALONE_PACKAGE)" ""
 ifeq "$(ProjectNameShort)" "ghc"
 STANDALONE_PACKAGE = NO
 else
 STANDALONE_PACKAGE = YES
 endif
+endif
 
 # -----------------------------------------------------------------------------
 # Build the package configuration file and tell the compiler about it.
@@ -15,21 +17,35 @@ endif
 ifeq "$(way)" ""
 
 ifeq "$(STANDALONE_PACKAGE)" "NO"
-PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
+PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
 else
-PKGCONF_CPP_EXTRA_OPTS =
+PACKAGE_CPP_OPTS += -Iinclude
 endif
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
+PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE}
+PACKAGE_CPP_OPTS += -DVERSION=${VERSION}
+
+IMPORT_DIR_INSTALLED = $$libdir/imports
+IMPORT_DIR_INPLACE   = $$libdir/libraries/$(PACKAGE)
+
+LIB_DIR_INSTALLED    = $$libdir
+LIB_DIR_INPLACE	     = $$libdir/libraries/$(PACKAGE)
+
 package.conf.inplace   : package.conf.in
-	$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< \
-		| sed 's/^#.*$$//g' >$@
+	$(CPP) $(RAWCPP_FLAGS) -P \
+		-DIMPORT_DIR='"$(IMPORT_DIR_INPLACE)"' \
+		-DLIB_DIR='"$(LIB_DIR_INPLACE)"' \
+		-x c $(PACKAGE_CPP_OPTS) $< | \
+	grep -v '^#pragma GCC' | \
+	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
 
 package.conf.installed : package.conf.in
-	$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
-		| sed 's/^#.*$$//g' >$@
-
-endif
+	$(CPP) $(RAWCPP_FLAGS) -P -DINSTALLING \
+		-DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \
+		-DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \
+		 -x c $(PACKAGE_CPP_OPTS) $< | \
+	grep -v '^#pragma GCC' | \
+	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
 
 # we could be more accurate here and add a dependency on
 # ghc/driver/package.conf, but that doesn't work too well because of
@@ -60,19 +76,21 @@ CLEAN_FILES += package.conf.installed package.conf.inplace
 
 else # $(STANDALONE_PACKAGE) == "YES"
 
-PACKAGE_CPP_OPTS += -DPACKAGE=\"${PACKAGE}\"
-PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(patsubst %,"%"$(comma),$(PACKAGE_DEPS))'
+PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
 PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
 PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
+PACKAGE_CPP_OPTS += -DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\"
 
 # Let the package configuration file refer to $(libdir) as
 # ${pkglibdir}.  Note we can't use ${libdir} because ghc-pkg already
 # redefines it to point to GHC's libdir (bug or feature?).
 #
-install :: package.conf.in
-	$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
-	| sed -e 's/^#.*$$//g' -e 's/""//g' -e 's/, ]/ ]/g' \
-	| $(GHC_PKG) --force --update-package
+install :: package.conf.installed
+	$(GHC_PKG) --force --update-package <package.conf.installed
+
+# Invoke this rule by hand in order to use the package in-place
+install-inplace-pkg : package.conf.inplace
+	$(GHC_PKG) --force --update-package <package.conf.inplace
 
 endif # $(STANDALONE_PACKAGE)
 
@@ -88,14 +106,16 @@ endif
 SRC_HSC2HS_OPTS += -I.
 
 ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS 	+= -package-name $(PACKAGE)
+SRC_HC_OPTS 	+= -ignore-package $(PACKAGE)
 SRC_HC_OPTS 	+= $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
 endif
 
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
 
-WAYS         	= $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
 
 all :: $(LIBRARY)
 
@@ -207,7 +227,7 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
 HTML_DIR = html
-HTML_DOC = $(HTML_DIR)/haddock.css
+HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""