X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=606d102bc4fadbab888fc29d0f80af92b0175a34;hp=ed8bb947da8525dd6fac50ea096160b8642dadee;hb=6830e258b81ee97a0b7ed2ecc65695f616adeea3;hpb=80d2e6f711d54f59c4d698c7565f69d49d34d8b8 diff --git a/libraries/Makefile b/libraries/Makefile index ed8bb94..606d102 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -39,6 +39,8 @@ TOP=.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/cabal-flags.mk +# Any libraries listed here should also be in ../packages + SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring SUBDIRS += containers bytestring old-locale old-time filepath directory ifeq "$(GhcLibsWithUnix)" "YES" @@ -63,15 +65,9 @@ SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) SUBDIRS += $(wildcard time) -SUBDIRS += $(wildcard OpenGL) -SUBDIRS += $(wildcard GLUT) -SUBDIRS += $(wildcard OpenAL) -SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) -SUBDIRS += $(wildcard cgi) SUBDIRS += $(wildcard parallel) -SUBDIRS_BUILD += $(wildcard ndp) SUBDIRS_BUILD += $(wildcard dph/dph-base) SUBDIRS_BUILD += $(wildcard dph/dph-prim-interface) SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq) @@ -123,6 +119,8 @@ ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif +IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -133,7 +131,7 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif -ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" "" +ifeq "$(BuildSharedLibs)" "YES" CONFIGURE_OPTS += --enable-shared CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared endif @@ -143,9 +141,6 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif -DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ - $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) - .PHONY: subdirs subdirs: @@ -153,21 +148,22 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages -CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf - CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" CABAL_GHC_FLAGS += -cpp endif -BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc +# Euch, hideous hack: +CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g') + +BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc .PHONY: boot boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf cabal-bin: cabal-bin.hs + mkdir $(HERE_ABS)/bootstrapping $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin bootstrapping.conf: cabal-bin @@ -186,21 +182,12 @@ bootstrapping.conf: cabal-bin cd hpc && $(CABAL) install --distpref=dist-bootstrapping --inplace mv $@.tmp $@ -installPackage/installPackage: installPackage.hs - -$(RM) -rf installPackage - mkdir installPackage - $(CP) installPackage.hs installPackage/ - cd installPackage && $(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ - --make installPackage -o installPackage \ - $(DEPLOYMENT_OPTS) - 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) + cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable endif @@ -224,8 +211,7 @@ 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'. -build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) \ - installPackage/installPackage +build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -236,14 +222,10 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -ifeq "$(Windows)" "YES" -NONEXISTENT=c:/NONEXISTENT -else -NONEXISTENT=/NONEXISTENT -endif - ALL_CONFIGURE_FLAGS = \ - $(INSTALL_CONFIGURE_FLAGS) \ + $(INSTALL_DIRS_CONFIGURE_FLAGS) \ + $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(COMMON_CONFIGURE_FLAGS) \ --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(CONFIGURE_OPTS) @@ -330,12 +312,11 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping - $(RM) -rf bootstrapping/* + $(RM) -rf bootstrapping $(RM) -f bootstrapping.conf bootstrapping.conf.old $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old $(RM) -f cabal-bin cabal-bin.exe $(RM) -rf ifBuildable - $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html $(RM) -f haddock* *.gif @@ -380,46 +361,32 @@ install-docs: # overridden when installing a bindist. $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ -install.library.%: installPackage/installPackage ifBuildable/ifBuildable +install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(FPTOOLS_TOP_ABS)/libraries/installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries -binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) \ - installPackage/installPackage - 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) +BINDIST_EXTRAS += ifBuildable/ifBuildable +binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) + echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST) +# XXX This needs to be changed: This ifBuildable is built with the +# bootstrapping compiler, so isn't OS X friendly. It should be made into +# 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) ifeq "$(HADDOCK_DOCS)" "YES" - cp gen_contents_index $(BIN_DIST_LIBDIR) - cp index.html $(BIN_DIST_LIBDIR) - cp doc-index*.html $(BIN_DIST_LIBDIR) + for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done endif - cp -pR stamp $(BIN_DIST_LIBDIR) $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: if $(IFBUILDABLE) $*; then \ - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ - cd $* && \ - cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ - cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ - cp -R dist $(BIN_DIST_LIBDIR)/$* && \ - $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \ - $(FIND) . -name unbuildable -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \ - (cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \ - $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ - \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \ - $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ - \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ - -exec rm {} \; ; \ + $(MAKE) -C $* -f Makefile.local binary-dist BINDIST_EXTRAS="$*.cabal LICENSE $*.buildinfo unbuildable" WHERE_AM_I=$(WHERE_AM_I)/$*; \ fi # Ignore some doc targets that we don't support