diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-05-11 20:39:32 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-05-11 20:39:32 +0000 |
| commit | 4e0972788c3a67337b1671e46692fbf18c5f504d (patch) | |
| tree | 2babfde16014b539908ac528c76e24fe3bebbf92 /libraries | |
| parent | c30bedd511c983b5f2b0dae4d4cc5a2baa1cb0c2 (diff) | |
| download | haskell-4e0972788c3a67337b1671e46692fbf18c5f504d.tar.gz | |
Pull the configure options out into a variable in libraries/Makefile
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 53a13e6a77..29079961f3 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -246,11 +246,7 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\ $(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 \ @@ -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) \ - --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. |