X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=4168ae5f1c7b13ab086bad6d13f75e6dafa9c456;hp=57c9adf3abb19d8843730fa9944d277efdccb5c2;hb=c571ccea941791fd30f640e93d163ee08171349a;hpb=1286d3e9d7c0ce82cf3451983139902b70fce7b5

diff --git a/libraries/Makefile b/libraries/Makefile
index 57c9adf..4168ae5 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -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,6 +94,7 @@ iprefix             = $$topdir
 ibindir             = $$topdir
 ilibdir             = $$topdir
 ilibexecdir         = $$topdir
+idynlibdir          = $$topdir
 idatadir            = $$topdir
 idocdir             = $$topdir/doc/libraries/$$pkg
 ihaddockdir         = $$topdir/doc/libraries/$$pkg
@@ -106,6 +107,7 @@ iprefix             = $(prefix)
 ibindir             = $(bindir)
 ilibdir             = $(libdir)
 ilibexecdir         = $(libexecdir)
+idynlibdir          = $(dynlibdir)
 idatadir            = $(datadir)
 idocdir             = $(docdir)/libraries/$$pkg
 ihaddockdir         = $(htmldir)/libraries/$$pkg
@@ -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
 
@@ -171,10 +175,10 @@ installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
 	-$(RM) -rf installPackage
 	mkdir installPackage
 	$(CP) installPackage.hs installPackage/
-ifeq "$(UseStage1)" "YES"
+ifeq "$(stage)" "2"
 	cd installPackage && ../$(HC) -Wall -cpp \
 	                            --make installPackage -o installPackage \
-	                            $(BOOTSTRAP_INC_1_UP)
+	                            $(BOOTSTRAP_INC_1_UP) $(DEPLOYMENT_OPTS)
 else
 	cd installPackage && $(GHC) -Wall -cpp \
 	                            --make installPackage -o installPackage \
@@ -188,8 +192,9 @@ ifBuildable/ifBuildable: ifBuildable.hs
 	-$(RM) -rf ifBuildable
 	mkdir ifBuildable
 	$(CP) ifBuildable.hs ifBuildable/
-ifeq "$(UseStage1)" "YES"
-	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+ifeq "$(stage)" "2"
+	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \
+	   	       	         $(DEPLOYMENT_OPTS)
 else
 	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 endif
@@ -210,9 +215,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'.
@@ -237,21 +246,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 \
-			   --haddockdir=/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 \
@@ -259,7 +270,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.
@@ -273,7 +290,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 # every time.
 $(foreach SUBDIR,$(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 .; \
@@ -313,7 +330,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.%
@@ -372,7 +391,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)' '$(ihaddockdir)' ; \
+	  ../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.%