[PATCH 07/33] build system: remove tests/helpers/Makefile.am and collapse on tests/Makefile.am.

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

 



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

diff --git a/configure.ac b/configure.ac
index a259157..7eb6f22 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/helpers/Makefile
 tests/Makefile
 text-utils/Makefile
 ])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d4fa10..e83e137 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,9 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-SUBDIRS = helpers
+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 \
diff --git a/tests/helpers/Makefile.am b/tests/helpers/Makefile.am
deleted file mode 100644
index 26007d4..0000000
--- a/tests/helpers/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-noinst_PROGRAMS = test_sysinfo test_pathnames test_byteswap \
-		  test_md5
-
-test_md5_SOURCES = test_md5.c $(top_srcdir)/lib/md5.c
-
-- 
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