projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c30bedd
)
Pull the configure options out into a variable in libraries/Makefile
author
Ian Lynagh
<igloo@earth.li>
Sun, 11 May 2008 20:39:32 +0000
(20:39 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 11 May 2008 20:39:32 +0000
(20:39 +0000)
libraries/Makefile
patch
|
blob
|
history
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
53a13e6
..
2907996
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-246,11
+246,7
@@
FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
-$(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 \
+ALL_CONFIGURE_FLAGS = \
$(CONFIGURE_OPTS) \
--prefix=/NONEXISTANT \
--bindir=/NONEXISTANT \
$(CONFIGURE_OPTS) \
--prefix=/NONEXISTANT \
--bindir=/NONEXISTANT \
@@
-268,7
+264,13
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--haddock-options="--use-contents=../index.html \
--use-index=../doc-index.html" \
$(FLAGGED_CONFIGURE_ARGS) \
--haddock-options="--use-contents=../index.html \
--use-index=../doc-index.html" \
$(FLAGGED_CONFIGURE_ARGS) \
- --configure-option=--with-cc=$(CC) ) \
+ --configure-option=--with-cc=$(CC)
+
+$(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 $(ALL_CONFIGURE_FLAGS) ) \
&& touch $@ || touch $*/unbuildable
# We don't touch $@ if configure failed as we would prefer to try
# configuring it next time round, rather than assuming it'll still fail.
&& touch $@ || touch $*/unbuildable
# We don't touch $@ if configure failed as we would prefer to try
# configuring it next time round, rather than assuming it'll still fail.