[PATCH 12/33] build-system: declare the linux_version_srcs variable in toplevel Makefile.am

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

 



Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx>
---
 Makefile.am          |    2 ++
 disk-utils/module.am |    5 +----
 lib/module.am        |    6 +-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a526a1b..f2d17d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,8 @@ if LINUX
 SUBDIRS += \
 	hwclock \
 	partx
+
+linux_version_srcs = lib/linux_version.c
 endif
 
 if BUILD_MOUNT
diff --git a/disk-utils/module.am b/disk-utils/module.am
index c504f3a..833d19d 100644
--- a/disk-utils/module.am
+++ b/disk-utils/module.am
@@ -1,7 +1,4 @@
-disk_utils_common = lib/blkdev.c
-if LINUX
-disk_utils_common += lib/linux_version.c
-endif
+disk_utils_common = lib/blkdev.c $(linux_version_srcs)
 
 if HAVE_UUID
 if BUILD_LIBUUID
diff --git a/lib/module.am b/lib/module.am
index 1b8cd09..6ccbd9e 100644
--- a/lib/module.am
+++ b/lib/module.am
@@ -9,13 +9,9 @@ endif
 
 LIB_TESTS_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_PROGRAM
 
-lib_test_blkdev_SOURCES = lib/blkdev.c
+lib_test_blkdev_SOURCES = lib/blkdev.c $(linux_version_srcs)
 lib_test_blkdev_CPPFLAGS = $(LIB_TESTS_CPPFLAGS)
 
-if LINUX
-lib_test_blkdev_SOURCES += lib/linux_version.c
-endif
-
 lib_test_ismounted_SOURCES = lib/ismounted.c
 lib_test_ismounted_CPPFLAGS = $(LIB_TESTS_CPPFLAGS)
 
-- 
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