projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-09-10 09:46:21 by simonmar]
[ghc-hetmet.git]
/
mk
/
boilerplate.mk
diff --git
a/mk/boilerplate.mk
b/mk/boilerplate.mk
index
1066cd5
..
bb6483a
100644
(file)
--- a/
mk/boilerplate.mk
+++ b/
mk/boilerplate.mk
@@
-29,17
+29,21
@@
default: all
# -----------------------------------------------------------------------------
# make sure the autoconf stuff is up to date...
# -----------------------------------------------------------------------------
# make sure the autoconf stuff is up to date...
-$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure
+$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
+ @echo "Running autoreconf in $(FPTOOLS_TOP) ..."
+ @( cd $(FPTOOLS_TOP) && autoreconf )
+
+$(TOP)/config.status : $(TOP)/configure
@if test ! -f $(FPTOOLS_TOP)/config.status; then \
echo "You haven't run $(FPTOOLS_TOP)/configure yet."; \
exit 1; \
fi
@if test ! -f $(FPTOOLS_TOP)/config.status; then \
echo "You haven't run $(FPTOOLS_TOP)/configure yet."; \
exit 1; \
fi
- @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."
- @( cd $(FPTOOLS_TOP) && ./config.status )
+ echo "configure changed, reconfiguring with same settings..."; \
+ ( cd $(FPTOOLS_TOP) && ./config.status --recheck ); \
-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
- @echo "Regenerating $(FPTOOLS_TOP)/configure..."
- @( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
+$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure $(TOP)/config.status
+ @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info...";
+ @( cd $(FPTOOLS_TOP) && ./config.status )
# -----------------------------------------------------------------------------
# Misc bits
# -----------------------------------------------------------------------------
# Misc bits