X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=094b6a574851f46ef4e532ba1582266f8f18bcb7;hp=cbec48dd80cee1c6fc46d8f0c1c14a1fca1780b3;hb=b0ca990457eaf7991e72b13d0040d937b5759b36;hpb=9de82d47542f75325e2db14632c1f7ee81d2da75

diff --git a/mk/package.mk b/mk/package.mk
index cbec48d..094b6a5 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,9 +3,6 @@
 
 ifneq "$(PACKAGE)" ""
 
-# FIXME: does anyone do this any more?
-STANDALONE_PACKAGE = NO
-
 # -----------------------------------------------------------------------------
 # Directory layouts, installation etc.
 
@@ -13,9 +10,7 @@ STANDALONE_PACKAGE = NO
 # to the compiler, and spliced into package.conf in place of $topdir at
 # runtime.
 #
-# On Unix, we only use absolute paths in package.conf, except that when
-# building a binary distribution we use $libdir and $datadir in package.conf
-# which are then replaced by the correct values at install time.
+# On Unix, we only use absolute paths in package.conf.
 #
 
 ifeq "$(Windows)" "YES"
@@ -25,13 +20,8 @@ PKG_DATADIR = $$topdir
 
 else
 
-ifeq "$(BIN_DIST)" ""
 PKG_LIBDIR  = $(libdir)
 PKG_DATADIR = $(datadir)
-else
-PKG_LIBDIR  = $$libdir
-PKG_DATADIR = $$datadir
-endif
 
 endif # Unix
 
@@ -61,11 +51,7 @@ HADDOCK_IFACE_INSTALLED = $(HTML_DIR_INSTALLED)/$(PACKAGE).haddock
 
 ifeq "$(way)" ""
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
-else
-PACKAGE_CPP_OPTS += -Iinclude
-endif
 
 PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE}
 PACKAGE_CPP_OPTS += -DVERSION=${VERSION}
@@ -86,17 +72,19 @@ package.conf.inplace   : package.conf.in
 	grep -v '^#pragma GCC' | \
 	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
 
-package.conf.installed : package.conf.in
+install::
 	$(CPP) $(RAWCPP_FLAGS) -P -DINSTALLING \
-		-DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \
-		-DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \
-		-DINCLUDE_DIR='"$(INCLUDE_DIR_INSTALLED)"' \
-		-DDATA_DIR='"$(DATA_DIR_INSTALLED)"' \
-		-DHTML_DIR='"$(HTML_DIR_INSTALLED)"' \
-		-DHADDOCK_IFACE='"$(HADDOCK_IFACE_INSTALLED)"' \
-		 -x c $(PACKAGE_CPP_OPTS) $< | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
+	       -DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \
+	       -DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \
+	       -DINCLUDE_DIR='"$(INCLUDE_DIR_INSTALLED)"' \
+	       -DDATA_DIR='"$(DATA_DIR_INSTALLED)"' \
+	       -DHTML_DIR='"$(HTML_DIR_INSTALLED)"' \
+	       -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INSTALLED)"' \
+	       -I../includes \
+	       -x c $(PACKAGE_CPP_OPTS) package.conf.in \
+	    | grep -v '^#pragma GCC' \
+	    | sed -e 's/""//g' -e 's/:[   ]*,/: /g' \
+	    | $(GHC_PKG_PROG) --global-conf $(DESTDIR)$(libdir)/package.conf update - --force
 
 # we could be more accurate here and add a dependency on
 # driver/package.conf, but that doesn't work too well because of
@@ -109,7 +97,6 @@ package.conf.installed : package.conf.in
 # to 'make clean' in ghc without cleaning in libraries too, the packages
 # will be correctly re-installed.
 #
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 
 STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
 CLEAN_FILES += $(STAMP_PKG_CONF)
@@ -118,31 +105,11 @@ ifneq "$(BootingFromHc)" "YES"
 boot all :: $(STAMP_PKG_CONF)
 endif
 
-$(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
-	$(GHC_PKG_INPLACE) --force --update-package <package.conf.inplace
-	$(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --force --update-package <package.conf.installed
+$(STAMP_PKG_CONF) : package.conf.inplace
+	$(GHC_PKG_INPLACE) update - --force-files <package.conf.inplace
 	@touch $(STAMP_PKG_CONF)
 
-CLEAN_FILES += package.conf.installed package.conf.inplace 
-
-else # $(STANDALONE_PACKAGE) == "YES"
-
-PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
-PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
-PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
-
-# 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.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)
+CLEAN_FILES += package.conf.inplace 
 
 endif # $(way) == ""
 
@@ -151,19 +118,10 @@ endif # $(way) == ""
 
 SRC_HSC2HS_OPTS += -I.
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
+ifneq "$(NO_SET_HC)" "YES"
 HC = $(GHC_INPLACE)
+endif
 IGNORE_PACKAGE_FLAG = -package-name  $(PACKAGE)-$(VERSION)
-else
-# Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later.
-# (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.)
-ifeq "$(strip $(GHC))" ""
-IGNORE_PACKAGE_FLAG = -ignore-package $(PACKAGE)
-else
-# Making the assumption here that standalone packages will be using mk/config.mk:GHC
-IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi) $(PACKAGE)
-endif 
-endif # STANDALONE_PACKAGE
 
 ifeq "$(NON_HS_PACKAGE)" ""
 SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG)
@@ -180,8 +138,12 @@ SRC_HC_OPTS	+= -fgenerics
 endif
 
 ifndef LIBRARY
+ifeq "$(_way:%_dyn=YES)" "YES"
+LIBRARY      	= libHS$(PACKAGE)$(_way:%_dyn=%)-ghc$(ProjectVersion)$(soext)
+else
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
 endif
+endif
 
 ifeq "$(WAYS)" ""
 WAYS = $(GhcLibWays)
@@ -238,15 +200,10 @@ endif
 # -----------------------------------------------------------------------------
 # Dependencies
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 MKDEPENDHS = $(GHC_INPLACE)
-endif
 
 SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS))
-
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
-endif
 
 endif # $(PACKAGE) != ""
 
@@ -277,10 +234,6 @@ ifndef GHCI_LIBRARY
 GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
 endif
 
-ifneq "$(NO_INSTALL_LIBRARY)" "YES"
-INSTALL_LIBS += $(GHCI_LIBRARY)
-endif
-
 CLEAN_FILES  += $(GHCI_LIBRARY)
 
 all :: $(GHCI_LIBRARY)
@@ -297,62 +250,13 @@ $(GHCI_LIBRARY) : $(LIBOBJS)
 endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter
 endif # way
-
-ifeq "$(GhcBuildDylibs)" "YES"
-
-    # Build dynamic libraries.
-    # Currently, this is a hack. Anyone, PLEASE clean it up.
-
-    # For now, we pretend that there are two operating systems in the world;
-    # Darwin, and Everything Else. Furthermore, we pretend that Everything Else
-    # behaves like Linux.
-    
-ifeq "$(darwin_TARGET_OS)" "1"
-    # Darwin: Shared libraries end in .dylib
-DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY))
-
-    # About the options used for Darwin:
-    # -dynamiclib
-    #   Apple's way of saying -shared
-    # -flat_namespace -undefined suppress:
-    #   Without these options, we'd have to specify the correct dependencies
-    #   for each of the dylibs. Twolevel namespaces are in general a good thing
-    #   (they make things more robust), so we should fix this sooner or later.
-    # -install_name
-    #   Causes the dynamic linker to ignore the DYLD_LIBRARY_PATH when loading
-    #   this lib and instead look for it at its absolute path.
-    #   When installing the .dylibs (see target.mk), we'll change that path to
-    #   point to the place they are installed.
-    #   Note: I'm not yet sure about this, but I think it will be convenient for
-    #         users not to have to set up DYLD_LIBRARY_PATH to point to the GHC
-    #         library dir. -- Wolfgang
-
-$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
-	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@
-else
-DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY))
-
-$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
-	$(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
-endif
-
-ifneq "$(NO_INSTALL_LIBRARY)" "YES"
-INSTALL_LIBS += $(DYLD_LIBRARY)
-endif
-
-CLEAN_FILES += $(DYLD_LIBRARY)
-
-all :: $(DYLD_LIBRARY)
-
-endif # $(GhcBuildDylibs) == "YES"
-
 endif # $(LIBRARY) /= ""
 
 # -----------------------------------------------------------------------------
 # Doc building with Haddock
 
 ifneq "$(PACKAGE)" ""
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK_DOCS)" "YES"
 
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS)
 
@@ -381,6 +285,7 @@ $(HTML_DOC) : $(HS_PPS)
 		--package=$(PACKAGE) \
 		--dump-interface=$(PACKAGE).haddock \
 		--use-index=../doc-index.html --use-contents=../index.html \
+		--source-module=$(PackageSourceURL) \
 		$(foreach pkg, $(PACKAGE_DEPS), \
 		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
 
@@ -392,8 +297,7 @@ CLEAN_FILES += $(PACKAGE).haddock
 %.raw-hs : %.hs
 	$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
-HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
-#  NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on
+HTML_INSTALL_DIR = $(DESTDIR)$(htmldir)/libraries/html/$(PACKAGE)
 
 install-docs :: $(HTML_DOC)
 	@$(INSTALL_DIR) $(HTML_INSTALL_DIR)
@@ -404,7 +308,7 @@ install-docs :: $(HTML_DOC)
 	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR); \
 
 endif # HS_PPS
-endif # NO_HADDOCK_DOCS
+endif # HADDOCK_DOCS
 endif # $(PACKAGE) /= ""
 
 # -----------------------------------------------------------------------------