Fixed merge problems

[xfstests-dev.git] / Makefile

diff --git a/Makefile b/Makefile
index 8c2e7a12f92334d294f6c8f2f1765c35a0476284..aabe9c995fa11f3659b959bf54a7f3a0cd2fc52e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -38,12 +38,12 @@ include $(TOPDIR)/include/builddefs
 endif
 
 TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group)
-CONFIGURE = configure include/builddefs
-LSRCFILES = configure configure.in
-LDIRT = *.bad *.new *.core *.full *.raw core a.out *.bak \
-       check.log check.time config.* conftest*
+CONFIGURE = configure include/builddefs include/config.h
+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 src
+SUBDIRS = include lib ltp src m4
 
 default: $(CONFIGURE) new remake check $(TESTS)
 ifeq ($(HAVE_BUILDDEFS), no)
@@ -58,13 +58,16 @@ else
 clean:  # if configure hasn't run, nothing to clean
 endif
 
-$(CONFIGURE): configure.in include/builddefs.in
-       rm -f config.cache
+$(CONFIGURE):
+       autoheader
        autoconf
        ./configure
 
-install install-dev: default
-       $(SUBDIRS_MAKERULE)
+aclocal.m4::
+       aclocal --acdir=$(TOPDIR)/m4 --output=$@
+
+install install-dev install-lib:
 
 realclean distclean: clean
        rm -f $(LDIRT) $(CONFIGURE)
+       rm -rf autom4te.cache Logs