# -----------------------------------------------------------------------------
# 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
- @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
_way := _$(way)
endif
+
+# When using $(patsubst ...) and friends, you can't use a literal comma
+# freely - so we use ${comma} instead. (See PACKAGE_CPP_OPTS in package.mk
+# for an example usage.)
+comma=,
+
# -----------------------------------------------------------------------------
# Now follow the pieces of boilerplate
# The "-" signs tell make not to complain if they don't exist