projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Monadify typecheck/TcPat: use return and standard monad functions
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
38bf497
..
60418f1
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-94,9
+94,10
@@
iprefix = $$topdir
ibindir = $$topdir
ilibdir = $$topdir
ilibexecdir = $$topdir
ibindir = $$topdir
ilibdir = $$topdir
ilibexecdir = $$topdir
+idynlibdir = $$topdir
idatadir = $$topdir
idocdir = $$topdir/doc/libraries/$$pkg
idatadir = $$topdir
idocdir = $$topdir/doc/libraries/$$pkg
-iinterfacedir = $$topdir/doc/libraries/$$pkg
+ihaddockdir = $$topdir/doc/libraries/$$pkg
ihtmldir = $$httptopdir/doc/libraries/$$pkg
html_installed_root = $(prefix)/doc/libraries
else
ihtmldir = $$httptopdir/doc/libraries/$$pkg
html_installed_root = $(prefix)/doc/libraries
else
@@
-106,9
+107,10
@@
iprefix = $(prefix)
ibindir = $(bindir)
ilibdir = $(libdir)
ilibexecdir = $(libexecdir)
ibindir = $(bindir)
ilibdir = $(libdir)
ilibexecdir = $(libexecdir)
+idynlibdir = $(dynlibdir)
idatadir = $(datadir)
idocdir = $(docdir)/libraries/$$pkg
idatadir = $(datadir)
idocdir = $(docdir)/libraries/$$pkg
-iinterfacedir = $(htmldir)/libraries/$$pkg
+ihaddockdir = $(htmldir)/libraries/$$pkg
ihtmldir = $(htmldir)/libraries/$$pkg
html_installed_root = $(htmldir)/libraries
endif
ihtmldir = $(htmldir)/libraries/$$pkg
html_installed_root = $(htmldir)/libraries
endif
@@
-171,15
+173,28
@@
installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
-$(RM) -rf installPackage
mkdir installPackage
$(CP) installPackage.hs installPackage/
-$(RM) -rf installPackage
mkdir installPackage
$(CP) installPackage.hs installPackage/
+ifeq "$(UseStage1)" "YES"
+ cd installPackage && ../$(HC) -Wall -cpp \
+ --make installPackage -o installPackage \
+ $(BOOTSTRAP_INC_1_UP)
+else
cd installPackage && $(GHC) -Wall -cpp \
--make installPackage -o installPackage \
$(BOOTSTRAP_INC_1_UP)
cd installPackage && $(GHC) -Wall -cpp \
--make installPackage -o installPackage \
$(BOOTSTRAP_INC_1_UP)
+endif
+# TODO: The conditional is yucky, but we need to be able to build with stage1
+# for bindists and as installPackages/ has no Makefile, it seems hard
+# to make this nicer.
ifBuildable/ifBuildable: ifBuildable.hs
-$(RM) -rf ifBuildable
mkdir ifBuildable
$(CP) ifBuildable.hs ifBuildable/
ifBuildable/ifBuildable: ifBuildable.hs
-$(RM) -rf ifBuildable
mkdir ifBuildable
$(CP) ifBuildable.hs ifBuildable/
+ifeq "$(UseStage1)" "YES"
+ cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+else
cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
+endif
$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
$(RM) -rf bootstrapping.$*
$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
$(RM) -rf bootstrapping.$*
@@
-237,7
+252,7
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--libexecdir=/NONEXISTANT \
--datadir=/NONEXISTANT \
--docdir=/NONEXISTANT \
--libexecdir=/NONEXISTANT \
--datadir=/NONEXISTANT \
--docdir=/NONEXISTANT \
- --interfacedir=/NONEXISTANT \
+ --haddockdir=/NONEXISTANT \
--htmldir=/NONEXISTANT \
--with-compiler=../../compiler/stage1/ghc-inplace \
--with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
--htmldir=/NONEXISTANT \
--with-compiler=../../compiler/stage1/ghc-inplace \
--with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
@@
-260,7
+275,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).% \
# 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 .; \
if ifBuildable/ifBuildable $*; then \
cd $* && \
cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \
@@
-268,7
+283,7
@@
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
setup/Setup makefile -f GNUmakefile; \
cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
$(MAKE) $(MFLAGS) && \
setup/Setup makefile -f GNUmakefile; \
cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
$(MAKE) $(MFLAGS) && \
- setup/Setup register --inplace; \
+ ../installPackage/installPackage register --inplace; \
fi
# Build the library using 'setup build' (not the default)
fi
# Build the library using 'setup build' (not the default)
@@
-300,7
+315,7
@@
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
$(CABAL_HADDOCK_FLAGS); \
fi
ifneq "$(HSCOLOUR)" ""
$(CABAL_HADDOCK_FLAGS); \
fi
ifneq "$(HSCOLOUR)" ""
- ifBuildable/ifBuildable $* && cp hscolour.css $*/dist/doc/html/$*/src/
+ if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi
endif
.PHONY: distclean clean clean.library.%
endif
.PHONY: distclean clean clean.library.%
@@
-359,7
+374,7
@@
$(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
- ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+ ../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.%
fi
.PHONY: binary-dist binary-dist.library.%