Add several new record features

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 7ac1243..63f852a 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -24,14 +24,16 @@
 
 default_target: build
 
-ifeq "$(IN_BIN_DIST)" "1"
-include ../Makefile-vars
-else
+# make doesn't give us an easy way to get the libraries built in
+# dependency order the first time, but not rebuild base (for example)
+# when we want to rebuild another library later.
+# So for now we just don't do anything in parallel in here.
+.NOTPARALLEL:
+
 # Ideally we'd just include something to give us variables
 # for paths and arguments to tools etc, and those set in mk/build.mk.
-TOP=.
+TOP=..
 include $(TOP)/mk/boilerplate.mk
-endif
 
 SUBDIRS = base old-locale old-time directory process filepath pretty \
           template-haskell readline Cabal random haskell98
@@ -76,6 +78,7 @@ ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
 SUBDIRS += $(wildcard parallel)
+SUBDIRS += $(wildcard ndp)
 endif
 
 # -----------------------------------------------------------------------------
@@ -83,11 +86,9 @@ endif
 empty=
 space=$(empty) $(empty)
 
-ifeq "$(Windows)" "YES"
-dot_bat=.bat
-else
-dot_bat=
-endif
+# -----------------------------------------------------------------------------
+
+ifneq "$(DOING_BIN_DIST)" "YES"
 
 CONFIGURE_OPTS =
 CONFIGURE_STAMP_EXTRAS :=
@@ -157,7 +158,7 @@ $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
 
 all: build
 
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK_DOCS)" "YES"
 all: doc
 endif
 
@@ -177,6 +178,20 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
+# We explicitly set datadir to "$prefix/share" as, while that is the
+# default on Linux, on Windows it defaults to
+# "C:\\Program Files\\Common Files"
+
+# We also set libsubdir differently on Windows and non-Windows, as on
+# non-Windows the path we deduce is highre up than the path passed to
+# the executable with the shell script on non-Windows. This should
+# probably be tidied up so that we can always pass the same libsubdir.
+ifeq "$(Windows)" "YES"
+libsubdir = $$pkgid
+else
+libsubdir = $$compiler/lib/$$pkgid
+endif
+
 $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
@@ -184,7 +199,8 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
        ( cd $* && setup/Setup configure \
                   $(CONFIGURE_OPTS) \
                   --prefix='$$topdir' \
-                  --libsubdir='$$compiler/lib/$$pkgid' \
+                  --datadir='$$prefix/share' \
+                  --libsubdir='$(libsubdir)' \
                   --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
                   --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \
                   --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \
@@ -226,12 +242,31 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup ifBuildable/ifBuildable
        ifBuildable/ifBuildable $* setup/Setup haddock
 
+.PHONY: distclean clean clean.library.%
+
+distclean: clean
+
+clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
+       $(RM) -f stamp/bootstrapping.*
+       $(RM) -rf bootstrapping.*
+       $(RM) -rf ifBuildable
+       $(RM) -f libraries.txt index.html doc-index.html
+
+$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
+clean.library.%:
+       $(RM) -f stamp/configure.library.*.$* $*/unbuildable
+       -cd $* && setup/Setup clean
+       $(RM) -rf $*/setup
+endif
+
+# -----------------------------------------------------------------------------
+
 .PHONY: install install-docs install.library.%
 
 ROOT=$(prefix)/share/ghc/doc/html/
 
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK_DOCS)" "YES"
        $(INSTALL_DIR)                                            $(ROOT)
        $(INSTALL_DATA)   index.html doc-index.html               $(ROOT)
        $(INSTALL_SCRIPT) gen_contents_index                      $(ROOT)
@@ -259,6 +294,8 @@ BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
 binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
        mkdir                               $(BIN_DIST_LIBDIR)/installPackage
        cp        installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage
+       mkdir                               $(BIN_DIST_LIBDIR)/ifBuildable
+       cp        ifBuildable/ifBuildable       $(BIN_DIST_LIBDIR)/ifBuildable
        cp    Makefile                      $(BIN_DIST_LIBDIR)
        cp    gen_contents_index            $(BIN_DIST_LIBDIR)
        cp    index.html                    $(BIN_DIST_LIBDIR)
@@ -270,25 +307,11 @@ binary-dist.library.%:
        $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*
        ifBuildable/ifBuildable $* cp    $*.cabal      $(BIN_DIST_LIBDIR)/$*
        ifBuildable/ifBuildable $* cp -a dist          $(BIN_DIST_LIBDIR)/$*
+       # Euch
+       ifBuildable/ifBuildable $* cp -aL include      $(BIN_DIST_LIBDIR)/$* || :
        ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
             \( -name "*_split" -o -name "autogen" \) | xargs rm -rf
        ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
             \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
             -exec rm {} \;
 
-.PHONY: distclean clean clean.library.%
-
-distclean: clean
-
-clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-       $(RM) -f stamp/bootstrapping.*
-       $(RM) -rf bootstrapping.*
-       $(RM) -rf ifBuildable
-       $(RM) -f libraries.txt index.html doc-index.html
-
-$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
-clean.library.%:
-       $(RM) -f stamp/configure.library.*.$* $*/unbuildable
-       -cd $* && setup/Setup clean
-       $(RM) -rf $*/setup
-