[project @ 2002-04-12 03:52:31 by sof]

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index f16cc5e..78e86fc 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.2 2002/02/12 15:45:46 simonmar Exp $
+# $Id: package.mk,v 1.10 2002/04/12 03:52:31 sof Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -13,14 +13,12 @@ $(PACKAGE).conf.inplace   : $(PACKAGE).conf.in
                | sed 's/^#.*$$//g' >$@
 
 $(PACKAGE).conf.installed : $(PACKAGE).conf.in
-       $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLED -x c $(PACKAGE_CPP_OPTS) $< \
+       $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
                | sed 's/^#.*$$//g' >$@
 
 boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
-       -$(GHC_PKG_INPLACE) --remove-package $(PACKAGE)
-       $(GHC_PKG_INPLACE) --add-package <$(PACKAGE).conf.inplace
-       -$(GHC_PKG_INPLACE) -f $(GHC_DRIVER_DIR)/package.conf --remove-package $(PACKAGE)
-       $(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --add-package <$(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
 
 CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
 
@@ -60,27 +58,63 @@ all :: $(LIBRARY)
 # %.o : %.lhs
 #      $(GHC_INPLACE) $(HC_OPTS) --make $<
 
+# -----------------------------------------------------------------------------
+# Installation; need to install .hi files as well as libraries
+
+ifeq "$(DLLized)" "YES"
+INSTALL_PROGS += $(DLL_NAME)
+INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
+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)
+
+# 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)
+ifneq "$(ALL_DIRS)" ""
+install ::
+       @for i in $(ALL_DIRS); do \
+               $(INSTALL_DIR) $(datadir)/$$i; \
+       done
+endif
+else
+INSTALL_DATAS += $(HS_IFACES)
+endif
+
+# -----------------------------------------------------------------------------
+# Dependencies
+
+MKDEPENDHS = $(GHC_INPLACE)
+SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
+
+endif # $(PACKAGE) /= ""
+
+# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
+INSTALL_LIBS  += $(LIBRARY)
+
 #--------------------------------------------------------------
 # Building dynamically-linkable libraries for GHCi
 #
-# Build $(GHCI_LIBRARY) from $(OBJS)
+# Build $(GHCI_LIBRARY) whenever we build $(LIBRARY)
 #
 # Why?  GHCi can only link .o files (at the moment), not .a files
 # so we have to build libFoo.o as well as libFoo.a
 #
 # Furthermore, GHCi currently never loads 
 # profiling libraries (or other non-std ways)
-#
-# Inputs:
-#   $(GHCI_LIBRARY)
-#
-# Outputs:
-#   Rule to build $(GHCI_LIBRARY)
+
+ifneq "$(LIBRARY)" ""
 
 ifeq "$(way)" ""
 ifeq "$(GhcWithInterpreter)" "YES"
 
-GHCI_LIBRARY = HS$(PACKAGE)$(_cbits)$(_way).o
+GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
 
 INSTALL_LIBS += $(GHCI_LIBRARY)
 CLEAN_FILES  += $(GHCI_LIBRARY)
@@ -94,29 +128,10 @@ ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
 # when we can use a "fixed" ld.
 #
 $(GHCI_LIBRARY) : $(LIBOBJS)
-       $(LD) -r $(LD_X) -o $@ $(LIBOBJS)
+       $(LD) -r $(LD_X) -o $@ $(STUBOBJS) $(LIBOBJS)
 
 endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter
 endif # way
 
-# -----------------------------------------------------------------------------
-# Installation; need to install .hi files as well as libraries
-#
-# 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)
-
-# -----------------------------------------------------------------------------
-# Dependencies
-
-MKDEPENDHS = $(GHC_INPLACE)
-SRC_MKDEPENDC_OPTS += $(patsubst %,-I%,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
-
-endif # $(PACKAGE) /= ""
-
+endif # $(LIBRARY) /= ""