X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=93fed7607565107d4fceac31f4388ec25ad20f85;hb=4f457f34795745c1fad5847d1983887e7666a6b7;hp=78e86fcbd19f186a2a13107e97a3b3387c4bcec8;hpb=f0c6ec20cc373dcf415adc941b33eb8fac042d99;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 78e86fc..93fed76 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,45 +1,121 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.10 2002/04/12 03:52:31 sof Exp $
+# $Id: package.mk,v 1.43 2005/01/14 08:01:27 wolfgang 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.
 
 ifeq "$(way)" ""
 
-$(PACKAGE).conf.inplace   : $(PACKAGE).conf.in
-	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -x c $(PACKAGE_CPP_OPTS) $< \
-		| sed 's/^#.*$$//g' >$@
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
+else
+PACKAGE_CPP_OPTS += -Iinclude
+endif
 
-$(PACKAGE).conf.installed : $(PACKAGE).conf.in
-	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
-		| sed 's/^#.*$$//g' >$@
+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) -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) -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
+# make's limited accuracy with modification times: when doing 'make
+# boot' in multiple packages, make won't detect that the package
+# configuration needs updating if it was updated already in the last
+# second.
+#
+# The stamp file goes in $(GHC_DRIVER_DIR), so that if someone happens
+# to 'make clean' in ghc without cleaning in libraries too, the packages
+# will be correctly re-installed.
+#
+ifeq "$(STANDALONE_PACKAGE)" "NO"
 
-boot all :: $(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
+STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
+CLEAN_FILES += $(STAMP_PKG_CONF)
 
-CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
+ifneq "$(BootingFromHc)" "YES"
+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
+	@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)\"
+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.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)
 
 endif # $(way) == ""
 
 # -----------------------------------------------------------------------------
 # Building the static library libHS<pkg>.a
 
-HC 	     	= $(GHC_INPLACE)
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+HC = $(GHC_INPLACE)
+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)
 
@@ -68,30 +144,39 @@ endif
 
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
-#
-# override is used here because for binary distributions, datadir is
-# set on the command line. sigh.
-override datadir:=$(libdir)/imports/$(PACKAGE)
+
+ifeq "$(HIERARCHICAL_LIB)" "YES"
+ifacedir = $(libdir)/imports
+else
+ifacedir = $(libdir)/hslibs-imports/$(PACKAGE)
+endif
 
 # If the lib consists of a hierachy of modules, we must retain the directory
 # structure when we install the interfaces.
 ifeq "$(HIERARCHICAL_LIB)" "YES"
-INSTALL_DATAS_WITH_DIRS += $(HS_IFACES)
+INSTALL_IFACES_WITH_DIRS += $(HS_IFACES)
 ifneq "$(ALL_DIRS)" ""
 install ::
 	@for i in $(ALL_DIRS); do \
-		$(INSTALL_DIR) $(datadir)/$$i; \
+		$(INSTALL_DIR) $(ifacedir)/$$i; \
 	done
 endif
 else
-INSTALL_DATAS += $(HS_IFACES)
+INSTALL_IFACES += $(HS_IFACES)
 endif
 
 # -----------------------------------------------------------------------------
 # Dependencies
 
+ifeq "$(STANDALONE_PACKAGE)" "NO"
 MKDEPENDHS = $(GHC_INPLACE)
-SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
+endif
+
+SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS))
+
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
+endif
 
 endif # $(PACKAGE) /= ""
 
@@ -134,4 +219,106 @@ 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
+
+INSTALL_LIBS += $(DYLD_LIBRARY)
+CLEAN_FILES += $(DYLD_LIBRARY)
+
+all :: $(DYLD_LIBRARY)
+
+
+endif
+
+# -----------------------------------------------------------------------------
+# Doc building with Haddock
+
+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_DIR)/haddock.js
+
+ifneq "$(HS_PPS)" ""
+
+CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
+
+ifeq "$(HADDOCK)" ""
+html ::
+	@echo Haddock must be installed in order to build HTML library documentation.
+	@echo Please install Haddock and re-configure.
+	@exit 1
+endif
+
+html :: $(HTML_DOC)
+
+extraclean :: 
+	$(RM) -rf $(HTML_DIR)
+
+$(HTML_DOC) : $(HS_PPS)
+	@$(INSTALL_DIR) $(HTML_DIR)
+	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
+		--package=$(PACKAGE) \
+		--dump-interface=$(PACKAGE).haddock \
+		--use-index=../doc-index.html --use-contents=../index.html \
+		$(foreach pkg, $(PACKAGE_DEPS), \
+		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
+
+CLEAN_FILES += $(PACKAGE).haddock
+
+%.raw-hs : %.lhs
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+
+%.raw-hs : %.hs
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+
+install-docs :: $(HTML_DOC)
+	@$(INSTALL_DIR) $(datadir)/html/libraries/$(PACKAGE)
+	@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); \
+	done
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/libraries/$(PACKAGE)
+
+endif # HS_PPS
+endif # NO_HADDOCK_DOCS
+
+# -----------------------------------------------------------------------------
+
 endif # $(LIBRARY) /= ""