[PATCH 08/33] build system: collapse tests/Makefile.am in top-level makefile.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx>
---
 Makefile.am       |   16 +++++++++++++---
 configure.ac      |    1 -
 tests/Makefile.am |   15 ---------------
 3 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 tests/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9e612ad..1b97292 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,9 +54,7 @@ SUBDIRS = \
 	po \
 	schedutils \
 	sys-utils \
-	text-utils \
-	tests
-
+	text-utils
 
 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
 		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
@@ -85,9 +83,21 @@ EXTRA_DIST = \
 		licenses \
 		example.files \
 		po/update-potfiles \
+		tests/expected \
+		tests/ts \
+		tests/functions.sh \
+		tests/README \
+		tests/run.sh \
 		tools \
 		docs
 
+noinst_PROGRAMS = tests/helpers/test_sysinfo tests/helpers/test_pathnames tests/helpers/test_byteswap \
+		  tests/helpers/test_md5
+
+tests_helpers_test_md5_SOURCES = tests/helpers/test_md5.c lib/md5.c
+
+clean-local:
+	rm -rf tests/output tests/diff
 
 distclean-local:
 	-find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f
diff --git a/configure.ac b/configure.ac
index 7eb6f22..975df77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1168,7 +1168,6 @@ shlibs/uuid/man/Makefile
 shlibs/uuid/src/Makefile
 sys-utils/Makefile
 tests/commands.sh
-tests/Makefile
 text-utils/Makefile
 ])
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index e83e137..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-noinst_PROGRAMS = helpers/test_sysinfo helpers/test_pathnames helpers/test_byteswap \
-		  helpers/test_md5
-
-helpers_test_md5_SOURCES = helpers/test_md5.c $(top_srcdir)/lib/md5.c
-
-EXTRA_DIST = 	expected \
-		ts \
-		functions.sh \
-		README \
-		run.sh
-
-clean-local:
-	rm -rf output diff
-- 
1.7.1.1

--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux