X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=7e1a621e0dd902222885be01ba93679d619b789b;hb=db39fbf447d14801fe8ee4555bf51990944865c4;hp=7d4c06777bf15327ab44b09c8e7f8b9470ded13c;hpb=364193a015565b043c5d0417750b023af6760c4f;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 7d4c067..7e1a621 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -13,21 +13,23 @@ # or the following is equivalent: # # make rebuild.library. +# +# 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 build.library.foo .PHONY: default_target default_target: build -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 filepath pretty \ +SUBDIRS = base old-locale old-time directory process filepath pretty \ template-haskell readline Cabal random haskell98 ifeq "$(GhcLibsWithUnix)" "YES" @@ -77,11 +79,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 := @@ -171,13 +171,29 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # 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) \ @@ -200,6 +216,13 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ $(addprefix --ghc-option=,$(GhcLibHcOpts)) ifBuildable/ifBuildable $* setup/Setup register --inplace +$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/CabalMakefile):\ +%/CabalMakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ + %/setup/Setup ifBuildable/ifBuildable + $(RM) $*/CabalMakefile + ifBuildable/ifBuildable $* setup/Setup makefile -f CabalMakefile \ + $(addprefix --ghc-option=,$(GhcLibHcOpts)) + .PHONY: doc DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS)) @@ -212,18 +235,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) + $(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 +278,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 +287,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 +300,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 -