automake doesn't have "default" target but uses "all" target instead

Merge of master-melb:xfs-cmds:31021a by kenmcd.

  automake doesn't have "default" target but uses "all" target instead

diff --git a/Makefile b/Makefile
index 99509ff91e6ada48c5fc1c183b626ccd0e370b0e..0a0fc27939f535ecc758f91c62eaf2762c385409 100644 (file)
--- a/Makefile
+++ b/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)