X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=7397e63d51b83cff8993f76c810619ca18c9fa22;hb=394394f9f78d5a078f14ca289d1c9fbb43dd7159;hp=6d80f252dc48961531f0b3386b1b84c137713dca;hpb=1ab6db45b93eff1bbea2f33e7be8a62798fb4369;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 6d80f25..7397e63 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,35 +1,107 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.33 2004/01/09 12:42:15 simonmar Exp $
+# $Id: package.mk,v 1.48 2005/02/10 13:38:35 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
+ifeq "$(STANDALONE_PACKAGE)" ""
 ifeq "$(ProjectNameShort)" "ghc"
 STANDALONE_PACKAGE = NO
 else
 STANDALONE_PACKAGE = YES
 endif
+endif
+
+# -----------------------------------------------------------------------------
+# Directory layouts, installation etc.
+
+# Here Windows & Unix differ.  On Windows, the value of $(prefix) is known
+# 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.
+#
+
+ifeq "$(Windows)" "YES"
+
+PKG_LIBDIR  = $$topdir
+PKG_DATADIR = $$topdir
+
+else
+
+ifeq "$(BIN_DIST)" ""
+PKG_LIBDIR  = $(libdir)
+PKG_DATADIR = $(datadir)
+else
+PKG_LIBDIR  = $$libdir
+PKG_DATADIR = $$datadir
+endif
+
+endif # Unix
+
+IMPORT_DIR_INSTALLED = $(PKG_LIBDIR)/imports
+IMPORT_DIR_INPLACE   = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)
+
+INCLUDE_DIR_INSTALLED = $(PKG_LIBDIR)/include
+INCLUDE_DIR_INPLACE   = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)/include
+
+LIB_DIR_INSTALLED    = $(PKG_LIBDIR)
+LIB_DIR_INPLACE	     = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)
+
+DATA_DIR_INSTALLED   = $(PKG_DATADIR)
+DATA_DIR_INPLACE     = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)
+
+HTML_DIR_INPLACE     = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)/html
+HTML_DIR_INSTALLED   = $(PKG_DATADIR)/html/libraries/$(PACKAGE)
+
+HADDOCK_IFACE_INPLACE   = $(HTML_DIR_INPLACE)/$(PACKAGE).haddock
+HADDOCK_IFACE_INSTALLED = $(HTML_DIR_INSTALLED)/$(PACKAGE).haddock
 
 # -----------------------------------------------------------------------------
 # Build the package configuration file and tell the compiler about it.
 
+# We want to build two versions of the package configuration: one for use
+# in the 
+
 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}
+
+PACKAGE_CPP_OPTS += -DPKG_LIBDIR='"$(PKG_LIBDIR)"'
+PACKAGE_CPP_OPTS += -DPKG_DATADIR='"$(PKG_DATADIR)"'
+
 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)"' \
+		-DINCLUDE_DIR='"$(INCLUDE_DIR_INPLACE)"' \
+		-DDATA_DIR='"$(DATA_DIR_INPLACE)"' \
+		-DHTML_DIR='"$(HTML_DIR_INPLACE)"' \
+		-DHADDOCK_IFACE='"$(HADDOCK_IFACE_INPLACE)"' \
+		-DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\" \
+		-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)"' \
+		-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' >$@
 
 # we could be more accurate here and add a dependency on
 # ghc/driver/package.conf, but that doesn't work too well because of
@@ -52,16 +124,15 @@ boot all :: $(STAMP_PKG_CONF)
 endif
 
 $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
-	$(GHC_PKG_INPLACE) --update-package <package.conf.inplace
-	$(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --update-package <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
 	@touch $(STAMP_PKG_CONF)
 
 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)\"
 
@@ -69,10 +140,12 @@ PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
 # ${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 +161,24 @@ 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
 
+#	-fgenerics switches on generation of support code for 
+#		derivable type classes.  This is now off by default,
+#		but we switch it on for the libraries so that we generate
+#		the code in case someone importing wants it.
+ifeq "$(NON_HS_PACKAGE)" ""
+SRC_HC_OPTS	+= -fgenerics
+endif
+
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
 
-WAYS         	= $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
 
 all :: $(LIBRARY)
 
@@ -158,10 +241,14 @@ ifeq "$(STANDALONE_PACKAGE)" "NO"
 SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 endif
 
-endif # $(PACKAGE) /= ""
+endif # $(PACKAGE) != ""
+
+#--------------------------------------------------------------
+# Installation
 
-# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
-INSTALL_LIBS  += $(LIBRARY)
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
+INSTALL_LIBS  += $(LIBRARY) $(GHCI_LIBRARY)
+endif
 
 #--------------------------------------------------------------
 # Building dynamically-linkable libraries for GHCi
@@ -181,7 +268,10 @@ ifeq "$(GhcWithInterpreter)" "YES"
 
 GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
 
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
 INSTALL_LIBS += $(GHCI_LIBRARY)
+endif
+
 CLEAN_FILES  += $(GHCI_LIBRARY)
 
 all :: $(GHCI_LIBRARY)
@@ -199,15 +289,66 @@ 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 "$(PACKAGE)" ""
+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"
 
 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)" ""
 
@@ -237,22 +378,25 @@ $(HTML_DOC) : $(HS_PPS)
 CLEAN_FILES += $(PACKAGE).haddock
 
 %.raw-hs : %.lhs
-	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P -cpp $< -o $@
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
 
 %.raw-hs : %.hs
 	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
 
+HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
+#  NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on
+
 install-docs :: $(HTML_DOC)
-	@$(INSTALL_DIR) $(datadir)/html/libraries/$(PACKAGE)
+	@$(INSTALL_DIR) $(HTML_INSTALL_DIR)
 	@for i in $(HTML_DIR)/*; do \
-	   echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries/$(PACKAGE); \
-	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries/$(PACKAGE); \
+	   echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
+	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
 	done
-	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/libraries/$(PACKAGE)
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR)
 
 endif # HS_PPS
 endif # NO_HADDOCK_DOCS
+endif # $(PACKAGE) /= ""
 
 # -----------------------------------------------------------------------------
 
-endif # $(LIBRARY) /= ""