Merge "Enable smack build configuration option on commandline fix rpmlint errors...

[platform/upstream/coreutils.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8ae8650..36e715d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils.                                      -*-Makefile-*-
 
-# Copyright (C) 1990-2012 Free Software Foundation, Inc.
+# Copyright (C) 1990-2013 Free Software Foundation, Inc.
 
 # 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
@@ -17,7 +17,7 @@
 
 ALL_RECURSIVE_TARGETS =
 
-SUBDIRS = lib po . tests gnulib-tests
+SUBDIRS = po . gnulib-tests
 
 changelog_etc =                                \
   ChangeLog-2005                       \
@@ -53,6 +53,7 @@ EXTRA_DIST =                          \
   cfg.mk                               \
   dist-check.mk                                \
   maint.mk                             \
+  tests/GNUmakefile                    \
   thanks-gen
 
 gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.sh
@@ -72,11 +73,6 @@ $(srcdir)/src/cu-progs.mk: $(gen_progs_lists)
 
 ACLOCAL_AMFLAGS = -I m4
 
-# Some tests always need root privileges, others need them only sometimes.
-ALL_RECURSIVE_TARGETS += check-root
-check-root:
-       cd tests && $(MAKE) $@ SUBDIRS=
-
 # Shortcut targets to make it easier to run (very) expensive tests.
 check-expensive:
        $(MAKE) check RUN_EXPENSIVE_TESTS=yes
@@ -181,6 +177,15 @@ check-git-hook-script-sync:
        rm -rf $$t;                                                     \
        test $$fail = 0
 
+noinst_LIBRARIES =
+MOSTLYCLEANFILES =
+CLEANFILES =
+MOSTLYCLEANDIRS =
+
+AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src
+
+include $(top_srcdir)/lib/local.mk
 include $(top_srcdir)/src/local.mk
 include $(top_srcdir)/doc/local.mk
 include $(top_srcdir)/man/local.mk
+include $(top_srcdir)/tests/local.mk