xfstests: rework "dmapi" subtree build mechanism

The "dmapi" subtree was developed separate from and sort of wedged
into the rest of the "xfstests" code.  As a result, it has a lot of
build infrastructure that's just different from the unified way used
for everything else.

This patch changes all that, making the "dmapi" subtree be a more
normal component of "xfstests" with respect to its build process.

This involves removing all the cruft needed and used by the dmapi
"configure" script, and replacing each "Makefile.am" file with a
proper "Makefile" that includes a simple set of rules that are
compatible with the broader "xfstests" build.

The result is a much cleaner, consistent build.  It also deletes
a considerable amount of code.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Alex Elder
2011-03-04 20:00:22 +00:00
parent a241a16214
commit fa83948599
46 changed files with 486 additions and 44600 deletions
+19 -14
View File
@@ -1,5 +1,20 @@
#
# Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved.
# Copyright (C) 2000-2008, 2011 SGI All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#
ifeq ("$(origin V)", "command line")
@@ -30,12 +45,12 @@ LSRCFILES = configure configure.in aclocal.m4 README VERSION
LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
conftest* check.log check.time
ifeq ($(HAVE_DMAPI), true)
DMAPI_MAKEFILE = dmapi/Makefile
endif
LIB_SUBDIRS = include lib
TOOL_SUBDIRS = ltp src m4
ifeq ($(HAVE_DMAPI), true)
TOOL_SUBDIRS += dmapi
endif
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
@@ -44,11 +59,6 @@ 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"
$(Q)$(MAKE) $(MAKEOPTS) -C $(TOPDIR)/dmapi all
endif
endif
# tool/lib dependencies
@@ -69,11 +79,6 @@ include/builddefs include/config.h: configure
--libexecdir=/usr/lib \
--enable-lib64=yes
ifeq ($(HAVE_DMAPI), true)
$(DMAPI_MAKEFILE):
$(Q)cd $(TOPDIR)/dmapi && ./configure
endif
aclocal.m4::
aclocal --acdir=`pwd`/m4 --output=$@