X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=079e4f6a530c2f466db44329dd88c4b48bd8e703;hp=7397e63d51b83cff8993f76c810619ca18c9fa22;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=394394f9f78d5a078f14ca289d1c9fbb43dd7159 diff --git a/mk/package.mk b/mk/package.mk index 7397e63..079e4f6 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,16 +1,8 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.48 2005/02/10 13:38:35 simonmar Exp $ +# $Id: package.mk,v 1.55 2005/05/13 10:05:33 krasimir Exp $ ifneq "$(PACKAGE)" "" -ifeq "$(STANDALONE_PACKAGE)" "" -ifeq "$(ProjectNameShort)" "ghc" -STANDALONE_PACKAGE = NO -else -STANDALONE_PACKAGE = YES -endif -endif - # ----------------------------------------------------------------------------- # Directory layouts, installation etc. @@ -18,9 +10,7 @@ endif # to the compiler, and spliced into package.conf in place of $topdir at # runtime. # -# On Unix, we only use absolute paths in package.conf, except that when -# building a binary distribution we use $libdir and $datadir in package.conf -# which are then replaced by the correct values at install time. +# On Unix, we only use absolute paths in package.conf. # ifeq "$(Windows)" "YES" @@ -30,13 +20,8 @@ PKG_DATADIR = $$topdir else -ifeq "$(BIN_DIST)" "" PKG_LIBDIR = $(libdir) PKG_DATADIR = $(datadir) -else -PKG_LIBDIR = $$libdir -PKG_DATADIR = $$datadir -endif endif # Unix @@ -66,11 +51,7 @@ HADDOCK_IFACE_INSTALLED = $(HTML_DIR_INSTALLED)/$(PACKAGE).haddock ifeq "$(way)" "" -ifeq "$(STANDALONE_PACKAGE)" "NO" PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude -else -PACKAGE_CPP_OPTS += -Iinclude -endif PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE} PACKAGE_CPP_OPTS += -DVERSION=${VERSION} @@ -86,25 +67,29 @@ package.conf.inplace : package.conf.in -DDATA_DIR='"$(DATA_DIR_INPLACE)"' \ -DHTML_DIR='"$(HTML_DIR_INPLACE)"' \ -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INPLACE)"' \ - -DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\" \ + -DFPTOOLS_TOP_ABS='"${FPTOOLS_TOP_ABS}"' \ -x c $(PACKAGE_CPP_OPTS) $< | \ grep -v '^#pragma GCC' | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$@ -package.conf.installed : package.conf.in +install:: $(CPP) $(RAWCPP_FLAGS) -P -DINSTALLING \ - -DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \ - -DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \ - -DINCLUDE_DIR='"$(INCLUDE_DIR_INSTALLED)"' \ - -DDATA_DIR='"$(DATA_DIR_INSTALLED)"' \ - -DHTML_DIR='"$(HTML_DIR_INSTALLED)"' \ - -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INSTALLED)"' \ - -x c $(PACKAGE_CPP_OPTS) $< | \ - grep -v '^#pragma GCC' | \ - sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$@ + -DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \ + -DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \ + -DINCLUDE_DIR='"$(INCLUDE_DIR_INSTALLED)"' \ + -DDATA_DIR='"$(DATA_DIR_INSTALLED)"' \ + -DHTML_DIR='"$(HTML_DIR_INSTALLED)"' \ + -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INSTALLED)"' \ + -I../includes \ + -x c $(PACKAGE_CPP_OPTS) package.conf.in \ + | grep -v '^#pragma GCC' \ + | sed -e 's/""//g' -e 's/:[ ]*,/: /g' \ + | $(GHC_PKG_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force + +GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg # we could be more accurate here and add a dependency on -# ghc/driver/package.conf, but that doesn't work too well because of +# driver/package.conf, but that doesn't work too well because of # make's limited accuracy with modification times: when doing 'make # boot' in multiple packages, make won't detect that the package # configuration needs updating if it was updated already in the last @@ -114,7 +99,6 @@ package.conf.installed : package.conf.in # to 'make clean' in ghc without cleaning in libraries too, the packages # will be correctly re-installed. # -ifeq "$(STANDALONE_PACKAGE)" "NO" STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE) CLEAN_FILES += $(STAMP_PKG_CONF) @@ -123,63 +107,54 @@ ifneq "$(BootingFromHc)" "YES" boot all :: $(STAMP_PKG_CONF) endif -$(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed - $(GHC_PKG_INPLACE) --force --update-package .a -ifeq "$(STANDALONE_PACKAGE)" "NO" +SRC_HSC2HS_OPTS += -I. + +ifneq "$(NO_SET_HC)" "YES" HC = $(GHC_INPLACE) +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS = endif - -SRC_HSC2HS_OPTS += -I. +IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION) ifeq "$(NON_HS_PACKAGE)" "" -SRC_HC_OPTS += -ignore-package $(PACKAGE) +SRC_HC_OPTS += $(IGNORE_PACKAGE_FLAG) SRC_HC_OPTS += $(GhcLibHcOpts) SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS)) endif -# -fgenerics switches on generation of support code for +# -XGenerics switches on generation of support code for # derivable type classes. This is now off by default, # but we switch it on for the libraries so that we generate # the code in case someone importing wants it. ifeq "$(NON_HS_PACKAGE)" "" -SRC_HC_OPTS += -fgenerics +SRC_HC_OPTS += -XGenerics endif +ifndef DONT_WANT_STD_LIBRARY +ifndef LIBRARY +ifeq "$(_way:%_dyn=YES)" "YES" +LIBRARY = libHS$(PACKAGE)$(_way:%_dyn=%)-ghc$(ProjectVersion)$(soext) +else LIBRARY = libHS$(PACKAGE)$(_way).a +endif +endif +endif ifeq "$(WAYS)" "" WAYS = $(GhcLibWays) endif +ifdef LIBRARY all :: $(LIBRARY) # POSSIBLE alternative version using --make: @@ -204,6 +179,7 @@ ifeq "$(DLLized)" "YES" INSTALL_PROGS += $(DLL_NAME) INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY)) endif +endif # The interface files are put inside the $(libdir), since they # might (potentially) be platform specific.. @@ -231,15 +207,10 @@ endif # ----------------------------------------------------------------------------- # Dependencies -ifeq "$(STANDALONE_PACKAGE)" "NO" MKDEPENDHS = $(GHC_INPLACE) -endif SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) - -ifeq "$(STANDALONE_PACKAGE)" "NO" SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) -endif endif # $(PACKAGE) != "" @@ -266,10 +237,8 @@ ifneq "$(LIBRARY)" "" ifeq "$(way)" "" ifeq "$(GhcWithInterpreter)" "YES" +ifndef GHCI_LIBRARY GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY)) - -ifneq "$(NO_INSTALL_LIBRARY)" "YES" -INSTALL_LIBS += $(GHCI_LIBRARY) endif CLEAN_FILES += $(GHCI_LIBRARY) @@ -288,79 +257,23 @@ $(GHCI_LIBRARY) : $(LIBOBJS) endif # DONT_WANT_STD_GHCI_LIB_RULE endif # GhcWithInterpreter endif # way - -ifeq "$(GhcBuildDylibs)" "YES" - - # Build dynamic libraries. - # Currently, this is a hack. Anyone, PLEASE clean it up. - - # For now, we pretend that there are two operating systems in the world; - # Darwin, and Everything Else. Furthermore, we pretend that Everything Else - # behaves like Linux. - -ifeq "$(darwin_TARGET_OS)" "1" - # Darwin: Shared libraries end in .dylib -DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY)) - - # About the options used for Darwin: - # -dynamiclib - # Apple's way of saying -shared - # -flat_namespace -undefined suppress: - # Without these options, we'd have to specify the correct dependencies - # for each of the dylibs. Twolevel namespaces are in general a good thing - # (they make things more robust), so we should fix this sooner or later. - # -install_name - # Causes the dynamic linker to ignore the DYLD_LIBRARY_PATH when loading - # this lib and instead look for it at its absolute path. - # When installing the .dylibs (see target.mk), we'll change that path to - # point to the place they are installed. - # Note: I'm not yet sure about this, but I think it will be convenient for - # users not to have to set up DYLD_LIBRARY_PATH to point to the GHC - # library dir. -- Wolfgang - -$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) - $(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@ -else -DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY)) - -$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) - $(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS) -endif - -ifneq "$(PACKAGE)" "" -INSTALL_LIBS += $(DYLD_LIBRARY) -endif - -CLEAN_FILES += $(DYLD_LIBRARY) - -all :: $(DYLD_LIBRARY) - -endif # $(GhcBuildDylibs) == "YES" - endif # $(LIBRARY) /= "" # ----------------------------------------------------------------------------- # Doc building with Haddock ifneq "$(PACKAGE)" "" -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" -HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) +HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS) -HTML_DIR = html +HTML_DIR = ../html-docs/$(PACKAGE) HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js ifneq "$(HS_PPS)" "" CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS)) -ifeq "$(HADDOCK)" "" -html :: - @echo Haddock must be installed in order to build HTML library documentation. - @echo Please install Haddock and re-configure. - @exit 1 -endif - html :: $(HTML_DOC) extraclean :: @@ -372,30 +285,30 @@ $(HTML_DOC) : $(HS_PPS) --package=$(PACKAGE) \ --dump-interface=$(PACKAGE).haddock \ --use-index=../doc-index.html --use-contents=../index.html \ + --source-module=$(PackageSourceURL) \ $(foreach pkg, $(PACKAGE_DEPS), \ --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock) CLEAN_FILES += $(PACKAGE).haddock %.raw-hs : %.lhs - $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@ + $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@ %.raw-hs : %.hs - $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@ + $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@ -HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE) -# NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on +HTML_INSTALL_DIR = $(DESTDIR)$(htmldir)/libraries/html/$(PACKAGE) install-docs :: $(HTML_DOC) @$(INSTALL_DIR) $(HTML_INSTALL_DIR) - @for i in $(HTML_DIR)/*; do \ - echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \ - done - $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR) + for i in $(HTML_DIR)/*; do \ + echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \ + done; \ + $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR); \ endif # HS_PPS -endif # NO_HADDOCK_DOCS +endif # HADDOCK_DOCS endif # $(PACKAGE) /= "" # -----------------------------------------------------------------------------