projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Libraries Makefile Hack for ndp
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
112e9e5
..
20a039c
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-291,7
+291,9
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
# needs to be done. However, we're careful not to overwrite GNUmakefile
# if it hasn't changed, so that dependency-generation isn't forced
# every time.
# needs to be done. However, we're careful not to overwrite GNUmakefile
# if it hasn't changed, so that dependency-generation isn't forced
# every time.
-$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
+# I doubt that the makefile way will work with ndp, so filter it out and use
+# a rule below to call build.library.ndp instead
+$(foreach SUBDIR,$(filter-out ndp,$(SUBDIRS)),make.library.$(SUBDIR)):\
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
if ifBuildable/ifBuildable $*; then \
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
if ifBuildable/ifBuildable $*; then \
@@
-304,6
+306,9
@@
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
../installPackage/installPackage register --inplace; \
fi
../installPackage/installPackage register --inplace; \
fi
+# Hack for ndp, as described above
+make.library.ndp: build.library.ndp
+
# Build the library using 'setup build' (not the default)
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
# Build the library using 'setup build' (not the default)
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
@@
-311,6
+316,7
@@
build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
if ifBuildable/ifBuildable $*; then \
cd $* && \
setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
if ifBuildable/ifBuildable $*; then \
cd $* && \
setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+ ../installPackage/installPackage register --inplace; \
fi
.PHONY: doc html
fi
.PHONY: doc html