fstests: drop check.log and check.time into section specific results dir

[xfstests-dev.git] / Makefile

diff --git a/Makefile b/Makefile
index a7f6f9d374cac92d25c415cf2bfbfea19f12af59..9fd37e0cca54f8029d4613e64b749372be7aefd7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,6 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
 # 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")
   BUILD_VERBOSE = $(V)
 endif
@@ -41,11 +25,13 @@ endif
 
 SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group)
-CONFIGURE = configure include/builddefs include/config.h
+CONFIGURE = configure include/config.h include/config.h.in \
+           aclocal.m4 config.guess config.sub install-sh ltmain.sh \
+           m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \
+           m4/lt~obsolete.m4
 LSRCFILES = configure configure.ac aclocal.m4 README VERSION
 LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
-       conftest* check.log check.time
+       conftest* check.log check.time libtool include/builddefs
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 LDIRT += $(SRCTAR)
@@ -60,7 +46,7 @@ endif
 export TESTS_DIR = tests
 SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
 
-default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
+default: include/builddefs $(DMAPI_MAKEFILE)
 ifeq ($(HAVE_BUILDDEFS), no)
        $(Q)$(MAKE) $(MAKEOPTS) $@
 else
@@ -77,12 +63,16 @@ clean:  # if configure hasn't run, nothing to clean
 endif
 
 configure: configure.ac
+       libtoolize -cfi
+       cp include/install-sh .
+       aclocal -I m4
        autoheader
        autoconf
 
 include/builddefs include/config.h: configure
        ./configure \
-                --libexecdir=/usr/lib
+                --libexecdir=/usr/lib \
+                --exec_prefix=/var/lib
 
 aclocal.m4::
        aclocal --acdir=`pwd`/m4 --output=$@