A few changes to the Makefile:
- Separate the rules for "configure" and "include/builddefs" into
two parts, each of which generate one of the files
- Get rid of the rule for include/config.h, and group it with the
one for include/builddefs (the same command creates both files)
- Use the $(Q) convention in a few missed spots
- Stop a DMAPI-only comment from getting echoed on default build
Signed-off-by: Alex Elder <aelder@xxxxxxx>
---
Makefile | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ ifeq ($(HAVE_BUILDDEFS), no)
$(Q)$(MAKE) $(MAKEOPTS) $@
else
$(Q)$(MAKE) $(MAKEOPTS) $(SUBDIRS)
+ifeq ($(HAVE_DMAPI), true)
# automake doesn't always support "default" target
# so do dmapi make explicitly with "all"
-ifeq ($(HAVE_DMAPI), true)
$(Q)$(MAKE) $(MAKEOPTS) -C $(TOPDIR)/dmapi all
endif
endif
@@ -60,22 +60,19 @@ else
clean: # if configure hasn't run, nothing to clean
endif
-configure include/builddefs:
+configure: configure.in
autoheader
autoconf
+
+include/builddefs include/config.h: configure
./configure \
--libexecdir=/usr/lib \
--enable-lib64=yes
-include/config.h: include/builddefs
-## Recover from the removal of $@
- @if test -f $@; then :; else \
- rm -f include/builddefs; \
- $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \
- fi
-
+ifeq ($(HAVE_DMAPI), true)
$(DMAPI_MAKEFILE):
- cd $(TOPDIR)/dmapi/ ; ./configure
+ $(Q)cd $(TOPDIR)/dmapi && ./configure
+endif
aclocal.m4::
aclocal --acdir=`pwd`/m4 --output=$@
@@ -97,5 +94,5 @@ install-dev install-lib:
$(MAKE) $(MAKEOPTS) -C $* install
realclean distclean: clean
- rm -f $(LDIRT) $(CONFIGURE)
- rm -rf autom4te.cache Logs
+ $(Q)rm -f $(LDIRT) $(CONFIGURE)
+ $(Q)rm -rf autom4te.cache Logs
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
