Add ASSERTs to all calls of nameModule

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index aca0869..43220f6 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -17,16 +17,13 @@
 # To add a new library to the tree, do
 #
 #   darcs get http://darcs.haskell.org/packages/foo
-#   [ -e foo/configure.ac ] && ( cd foo && autoreconf )
+#   [ -f foo/configure.ac ] && ( cd foo && autoreconf )
 #   make make.library.foo
 
-.PHONY: default_target show
+.PHONY: default_target
 
 default_target: all
 
-show:
-       @echo '$(VALUE)="$($(VALUE))"'
-
 # 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.
@@ -207,8 +204,7 @@ dph/%:
 
 $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \
-                                                          bootstrapping.conf
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
        -$(RM) -f stamp/configure.library.*.$* $*/unbuildable
        $(MKDIRHIER) `dirname $@`
        ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \
@@ -225,7 +221,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \
 # every time.
 $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                cabal-bin ifBuildable/ifBuildable bootstrapping.conf
+                cabal-bin ifBuildable/ifBuildable
        if $(IFBUILDABLE) $*; then \
          cd $* && \
          cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \
@@ -241,7 +237,7 @@ MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local
 # Build the library using 'setup build' (not the default)
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                 cabal-bin ifBuildable/ifBuildable bootstrapping.conf
+                 cabal-bin ifBuildable/ifBuildable
        if $(IFBUILDABLE) $*; then \
          cd $* && \
          $(CABAL) build $(BUILD_FLAGS); \
@@ -266,7 +262,7 @@ CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-i
 
 $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               cabal-bin ifBuildable/ifBuildable bootstrapping.conf
+               cabal-bin ifBuildable/ifBuildable
        if $(IFBUILDABLE) $*; then \
          cd $* && $(CABAL) haddock --html-location='../$$pkg' \
                                    $(CABAL_HADDOCK_FLAGS); \
@@ -280,8 +276,9 @@ ifneq "$(HSCOLOUR)" ""
        if $(IFBUILDABLE) $* && [ -d $*/dist/doc/html/*/src/ ]; then cp hscolour.css $*/dist/doc/html/*/src/; fi
 endif
 
-.PHONY: distclean clean clean.library.%
+.PHONY: maintainer-clean distclean clean clean.library.%
 
+maintainer-clean: clean
 distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
@@ -300,7 +297,7 @@ ifneq "$(wildcard dph)" ""
        $(MAKE) -C dph clean
 endif
 
-distclean:
+maintainer-clean distclean:
        $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
@@ -351,7 +348,6 @@ install.library.%: ifBuildable/ifBuildable
 
 BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
 
-BINDIST_EXTRAS += ifBuildable/ifBuildable
 binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
 ifeq "$(WHERE_AM_I)" ""
        echo "I don't know where I am" >&2
@@ -363,6 +359,7 @@ endif
 # a Cabal package if we keep it. However, once we drop extralibs we can
 # probably remove it anyway.
        echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST)
+       for FILE in dph/dph-prim-interface/interface/*.h dph/dph/LICENSE; do if [ -f $$FILE ]; then echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); fi; done
 ifeq "$(HADDOCK_DOCS)" "YES"
        for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
 endif