X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=8d9bd710d50191bc98af67c98cf9fef4b0856aa5;hp=a76739ee87e4372bcda13910307101e92239a67d;hb=ae1d4548d997731878e8c1220fc996a79f47a3e3;hpb=d11e18f6a7716bf716d25893de61daf3b096abb1

diff --git a/libraries/Makefile b/libraries/Makefile
index a76739e..8d9bd71 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -8,24 +8,32 @@
 # To rebuild a particular library <package>:
 #
 #   make clean.library.<package>
-#   make build.library.<package>
+#   make make.library.<package>
 #
 # or the following is equivalent:
 #
 #   make rebuild.library.<package>
+#
+# To add a new library to the tree, do
+#
+#   darcs get http://darcs.haskell.org/packages/foo
+#   [ -e foo/configure.ac ] && ( cd foo && autoreconf )
+#   make make.library.foo
 
 .PHONY: default_target
 
-default_target: build
+default_target: all
+
+# 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:
 
-ifeq "$(IN_BIN_DIST)" "1"
-include ../Makefile-vars
-else
 # 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
@@ -70,6 +78,7 @@ ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
 SUBDIRS += $(wildcard parallel)
+SUBDIRS += $(wildcard ndp)
 endif
 
 # -----------------------------------------------------------------------------
@@ -77,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 :=
@@ -110,6 +117,7 @@ subdirs:
 
 boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
 	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \
+	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile) \
 	  installPackage/installPackage
 
 # We build the Setup program in a setup subdirectory to stop it trying
@@ -151,33 +159,52 @@ $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
 
 all: build
 
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK_DOCS)" "YES"
 all: doc
 endif
 
 .PHONY: rebuild.library.%
 
 $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
-rebuild.library.%: clean.library.% build.library.%
+rebuild.library.%: clean.library.% make.library.%
 
-build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR))
+# NB. we're depending on make chasing dependencies from left to right here.
+# This bit goes wrong with 'make -j'.
+build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR))
 build: installPackage/installPackage
 
 configure: $(foreach SUBDIR,$(SUBDIRS), \
              stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR))
 
 .PHONY: build.library.%
+.PHONY: make.library.%
 
 # 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
 	-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
 	( cd $* && setup/Setup configure \
 	           $(CONFIGURE_OPTS) \
-	           --prefix=$(prefix) \
+	           --prefix='$$topdir' \
+	           --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) \
@@ -193,12 +220,27 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 # This is particularly important for corelibs, where failure means the
 # build dies!
 
+# Build the library using 'make'
+$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
+make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
+		%/GNUmakefile \
+                %/setup/Setup ifBuildable/ifBuildable
+	ifBuildable/ifBuildable $* $(MAKE)
+	ifBuildable/ifBuildable $* setup/Setup register --inplace
+
+# Build the library using 'setup build' (not the default)
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  %/setup/Setup ifBuildable/ifBuildable
 	ifBuildable/ifBuildable $* setup/Setup build \
 	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
-	ifBuildable/ifBuildable $* setup/Setup register --inplace
+
+$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
+%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
+                 %/setup/Setup ifBuildable/ifBuildable
+	$(RM) $*/GNUmakefile
+	cp Makefile.local $*
+	ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile
 
 .PHONY: doc
 
@@ -212,18 +254,38 @@ 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.%
 
-INSTALL_DIR=$(prefix)/share/ghc/doc/html/
+ROOT=$(prefix)/share/ghc/doc/html/
 
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
-	$(INSTALL_DATA)   index.html doc-index.html 			  $(INSTALL_DIR)
-	$(INSTALL_SCRIPT) gen_contents_index 					  $(INSTALL_DIR)
+ifeq "$(HADDOCK_DOCS)" "YES"
+	$(INSTALL_DIR)                                            $(ROOT)
+	$(INSTALL_DATA)   index.html doc-index.html               $(ROOT)
+	$(INSTALL_SCRIPT) gen_contents_index                      $(ROOT)
 	# Hacks:
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.css $(INSTALL_DIR)
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(INSTALL_DIR)
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR)
+	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.css $(ROOT)
+	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(ROOT)
+	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -235,7 +297,7 @@ install-docs:
 # Thus if you install without building then it will just break.
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
-	ifBuildable/ifBuildable $* ../installPackage/installPackage
+	ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg
 
 .PHONY: binary-dist binary-dist.library.%
 
@@ -244,6 +306,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)
@@ -255,25 +319,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
-