projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-11-15 19:37:13 by panne]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
4d3d257
..
d3be9c3
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.29 2003/05/29 14:47:05 reid Exp $
+# $Id: package.mk,v 1.31 2003/11/11 11:50:55 simonmar Exp $
ifneq "$(PACKAGE)" ""
ifneq "$(PACKAGE)" ""
@@
-24,12
+24,13
@@
ifeq "$(STANDALONE_PACKAGE)" "NO"
package.conf.inplace : package.conf.in
$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
package.conf.inplace : package.conf.in
$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
-endif
package.conf.installed : package.conf.in
$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
package.conf.installed : package.conf.in
$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
+endif
+
# we could be more accurate here and add a dependency on
# ghc/driver/package.conf, but that doesn't work too well because of
# make's limited accuracy with modification times: when doing 'make
# we could be more accurate here and add a dependency on
# ghc/driver/package.conf, but that doesn't work too well because of
# make's limited accuracy with modification times: when doing 'make
@@
-59,12
+60,19
@@
CLEAN_FILES += package.conf.installed package.conf.inplace
else # $(STANDALONE_PACKAGE) == "YES"
else # $(STANDALONE_PACKAGE) == "YES"
+PACKAGE_CPP_OPTS += -DPACKAGE=\"${PACKAGE}\"
+PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(patsubst %,"%"$(comma),$(PACKAGE_DEPS))'
+PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
+PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
+
# Let the package configuration file refer to $(libdir) as
# ${pkglibdir}. Note we can't use ${libdir} because ghc-pkg already
# redefines it to point to GHC's libdir (bug or feature?).
#
# Let the package configuration file refer to $(libdir) as
# ${pkglibdir}. Note we can't use ${libdir} because ghc-pkg already
# redefines it to point to GHC's libdir (bug or feature?).
#
-install :: package.conf.installed
- pkglibdir=$(libdir) $(GHC_PKG) --force --update-package <package.conf.installed
+install :: package.conf.in
+ $(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
+ | sed -e 's/^#.*$$//g' -e 's/""//g' -e 's/, ]/ ]/g' \
+ | $(GHC_PKG) --force --update-package
endif # $(STANDALONE_PACKAGE)
endif # $(STANDALONE_PACKAGE)
@@
-199,7
+207,7
@@
ifneq "$(NO_HADDOCK_DOCS)" "YES"
HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
HTML_DIR = html
HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
HTML_DIR = html
-HTML_DOC = $(HTML_DIR)/index.html
+HTML_DOC = $(HTML_DIR)/haddock.css
ifneq "$(HS_PPS)" ""
ifneq "$(HS_PPS)" ""
@@
-220,7
+228,9
@@
extraclean ::
$(HTML_DOC) : $(HS_PPS)
@$(INSTALL_DIR) $(HTML_DIR)
$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
$(HTML_DOC) : $(HS_PPS)
@$(INSTALL_DIR) $(HTML_DIR)
$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
+ --package=$(PACKAGE) \
--dump-interface=$(PACKAGE).haddock \
--dump-interface=$(PACKAGE).haddock \
+ --use-index=../doc-index.html --use-contents=../index.html \
$(foreach pkg, $(PACKAGE_DEPS), \
--read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
$(foreach pkg, $(PACKAGE_DEPS), \
--read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
@@
-233,12
+243,12
@@
CLEAN_FILES += $(PACKAGE).haddock
$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
install-docs :: $(HTML_DOC)
$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
install-docs :: $(HTML_DOC)
- @$(INSTALL_DIR) $(datadir)/html/$(PACKAGE)
+ @$(INSTALL_DIR) $(datadir)/html/libraries/$(PACKAGE)
@for i in $(HTML_DIR)/*; do \
@for i in $(HTML_DIR)/*; do \
- echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
+ echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries/$(PACKAGE); \
+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries/$(PACKAGE); \
done
done
- $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/$(PACKAGE)
+ $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/libraries/$(PACKAGE)
endif # HS_PPS
endif # NO_HADDOCK_DOCS
endif # HS_PPS
endif # NO_HADDOCK_DOCS