Libraries Makefile Hack for ndp
[ghc-hetmet.git] / libraries / Makefile
index 9b61df2..20a039c 100644 (file)
@@ -12,7 +12,7 @@
 #
 # or the following is equivalent:
 #
-#   make rebuild.library.<package>
+#   make remake.library.<package>
 #
 # To add a new library to the tree, do
 #
@@ -38,15 +38,15 @@ show:
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS  = base array packedstring containers bytestring
-SUBDIRS += old-locale old-time filepath directory
+SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base array packedstring
+SUBDIRS += containers bytestring old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
 ifeq "$(Windows)" "YES"
 SUBDIRS += $(wildcard Win32)
 endif
-SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98
+SUBDIRS += process pretty hpc template-haskell editline Cabal random haskell98
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
@@ -94,9 +94,10 @@ iprefix             = $$topdir
 ibindir             = $$topdir
 ilibdir             = $$topdir
 ilibexecdir         = $$topdir
+idynlibdir          = $$topdir
 idatadir            = $$topdir
 idocdir             = $$topdir/doc/libraries/$$pkg
-iinterfacedir       = $$topdir/doc/libraries/$$pkg
+ihaddockdir         = $$topdir/doc/libraries/$$pkg
 ihtmldir            = $$httptopdir/doc/libraries/$$pkg
 html_installed_root = $(prefix)/doc/libraries
 else
@@ -106,9 +107,10 @@ iprefix             = $(prefix)
 ibindir             = $(bindir)
 ilibdir             = $(libdir)
 ilibexecdir         = $(libexecdir)
+idynlibdir          = $(dynlibdir)
 idatadir            = $(datadir)
 idocdir             = $(docdir)/libraries/$$pkg
-iinterfacedir       = $(htmldir)/libraries/$$pkg
+ihaddockdir         = $(htmldir)/libraries/$$pkg
 ihtmldir            = $(htmldir)/libraries/$$pkg
 html_installed_root = $(htmldir)/libraries
 endif
@@ -141,6 +143,8 @@ BOOTSTRAP_LIBS = Cabal filepath
 BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
 BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
 BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
+DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
+                 $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
 .PHONY: subdirs
 
@@ -159,27 +163,44 @@ boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
 
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
+# -fffi is only needed for GHC 6.4 at the time of writing
+CABAL_GHC_FLAGS = -Wall -cpp -fffi
+
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
 %/setup/Setup: $(BOOTSTRAP_STAMPS)
        -$(RM) -rf $*/setup
        mkdir $*/setup
        $(CP) $*/Setup.*hs $*/setup
-       cd $*/setup && $(GHC) -Wall -cpp --make Setup.*hs -o Setup \
+       cd $*/setup && $(GHC) $(CABAL_GHC_FLAGS) --make Setup.*hs -o Setup \
                              $(BOOTSTRAP_INC_2_UP)
 
 installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
        -$(RM) -rf installPackage
        mkdir installPackage
        $(CP) installPackage.hs installPackage/
-       cd installPackage && $(GHC) -Wall -cpp \
+ifeq "$(stage)" "2"
+       cd installPackage && ../$(HC) $(CABAL_GHC_FLAGS) \
+                                   --make installPackage -o installPackage \
+                                   $(BOOTSTRAP_INC_1_UP) $(DEPLOYMENT_OPTS)
+else
+       cd installPackage && $(GHC) $(CABAL_GHC_FLAGS) \
                                    --make installPackage -o installPackage \
                                    $(BOOTSTRAP_INC_1_UP)
+endif
+# TODO: The conditional is yucky, but we need to be able to build with stage1
+#       for bindists and as installPackages/ has no Makefile, it seems hard
+#      to make this nicer.
 
 ifBuildable/ifBuildable: ifBuildable.hs
        -$(RM) -rf ifBuildable
        mkdir ifBuildable
        $(CP) ifBuildable.hs ifBuildable/
+ifeq "$(stage)" "2"
+       cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \
+                                $(DEPLOYMENT_OPTS)
+else
        cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
+endif
 
 $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
        $(RM) -rf bootstrapping.$*
@@ -197,9 +218,13 @@ all: doc
 endif
 
 .PHONY: rebuild.library.%
+.PHONY: remake.library.%
 
 $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
-rebuild.library.%: clean.library.% make.library.%
+rebuild.library.%: clean.library.% build.library.%
+
+$(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\
+remake.library.%: clean.library.% make.library.%
 
 # NB. we're depending on make chasing dependencies from left to right here.
 # This bit goes wrong with 'make -j'.
@@ -224,21 +249,23 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
                                  $(space)--configure-option=',\
                                  $(space)$(CONFIGURE_ARGS))
 
-$(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 \
+ifeq "$(Windows)" "YES"
+NONEXISTENT=c:/NONEXISTENT
+else
+NONEXISTENT=/NONEXISTENT
+endif
+
+ALL_CONFIGURE_FLAGS = \
                   $(CONFIGURE_OPTS) \
-                  --prefix=/NONEXISTANT \
-                  --bindir=/NONEXISTANT \
-                  --libdir=/NONEXISTANT \
+                  --prefix=$(NONEXISTENT) \
+                  --bindir=$(NONEXISTENT) \
+                  --libdir=$(NONEXISTENT) \
                   --libsubdir='$$pkgid' \
-                  --libexecdir=/NONEXISTANT \
-                  --datadir=/NONEXISTANT \
-                  --docdir=/NONEXISTANT \
-                          --interfacedir=/NONEXISTANT \
-                  --htmldir=/NONEXISTANT \
+                  --libexecdir=$(NONEXISTENT) \
+                  --datadir=$(NONEXISTENT) \
+                  --docdir=$(NONEXISTENT) \
+                          --haddockdir=$(NONEXISTENT) \
+                  --htmldir=$(NONEXISTENT) \
                   --with-compiler=../../compiler/stage1/ghc-inplace \
                   --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
                   --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
@@ -246,7 +273,13 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
                   --haddock-options="--use-contents=../index.html \
                                   --use-index=../doc-index.html" \
                   $(FLAGGED_CONFIGURE_ARGS) \
-                  --configure-option=--with-cc=$(CC) ) \
+                  --configure-option=--with-cc=$(CC)
+
+$(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 $(ALL_CONFIGURE_FLAGS) ) \
              && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
 # configuring it next time round, rather than assuming it'll still fail.
@@ -258,9 +291,11 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 # needs to be done.  However, we're careful not to overwrite GNUmakefile
 # if it hasn't changed, so that dependency-generation isn't forced
 # every time.
-$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
+# I doubt that the makefile way will work with ndp, so filter it out and use
+# a rule below to call build.library.ndp instead
+$(foreach SUBDIR,$(filter-out ndp,$(SUBDIRS)),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                %/setup/Setup ifBuildable/ifBuildable
+                %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \
@@ -271,6 +306,9 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
          ../installPackage/installPackage register --inplace; \
        fi
 
+# Hack for ndp, as described above
+make.library.ndp: build.library.ndp
+
 # Build the library using 'setup build' (not the default)
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
@@ -278,6 +316,7 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+         ../installPackage/installPackage register --inplace; \
        fi
 
 .PHONY: doc html
@@ -300,7 +339,9 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                                       $(CABAL_HADDOCK_FLAGS); \
        fi
 ifneq "$(HSCOLOUR)" ""
-       if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi
+# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer
+# mismatch
+       if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi
 endif
 
 .PHONY: distclean clean clean.library.%
@@ -359,7 +400,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
-         ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+         ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
        fi
 
 .PHONY: binary-dist binary-dist.library.%