review: xfstests/Makefile for dmapi

review: xfstests/Makefile for dmapi

[Timothy Shimmin]

Hi,

In some tests I found that Automake 1.9.1 output a "default" target
whereas Automake 1.9.6 did not produce a "default" target - in each
case they used the "all" target.
So change the default Make to build dmapi with the "all" target
instead of using SUBDIRS_MAKERULE on default for it.
The SUBDIRS_MAKERULE in xfstests only seems to be used for the
default target.

--Tim

diff --git a/xfstests/Makefile b/xfstests/Makefile
index 99509ff..0a0fc27 100644
--- a/xfstests/Makefile
+++ b/xfstests/Makefile
@@ -1,5 +1,5 @@
  #
-# Copyright (c) 2000-2006 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2008 Silicon Graphics, Inc.  All Rights Reserved.
  #

  TOPDIR = .
@@ -16,13 +16,16 @@ LSRCFILES = configure configure.in aclocal.m4 README VERSION
  LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
  	check.log check.time

-SUBDIRS = include lib ltp src m4 dmapi
+SUBDIRS = include lib ltp src m4

  default: $(CONFIGURE) $(DMAPI_MAKEFILE) new remake check $(TESTS)
  ifeq ($(HAVE_BUILDDEFS), no)
  	$(MAKE) $@
  else
  	$(SUBDIRS_MAKERULE)
+	# automake doesn't always support "default" target
+	# so do dmapi make explicitly with "all"
+	cd $(TOPDIR)/dmapi; make all
  endif

  ifeq ($(HAVE_BUILDDEFS), yes)