[PATCH 16/33] build system: convert hwclock to non-recursive module format.

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

 



Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx>
---
 Makefile.am         |    2 +-
 configure.ac        |    1 -
 hwclock/Makefile.am |   14 --------------
 hwclock/module.am   |   14 ++++++++++++++
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 hwclock/Makefile.am
 create mode 100644 hwclock/module.am

diff --git a/Makefile.am b/Makefile.am
index ae0d9bf..4102e38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,6 @@ RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
 
 if LINUX
 SUBDIRS += \
-	hwclock \
 	partx
 
 linux_version_srcs = lib/linux_version.c
@@ -104,6 +103,7 @@ include disk-utils/module.am
 include fdisk/module.am
 include fsck/module.am
 include getopt/module.am
+include hwclock/module.am
 
 clean-local:
 	rm -rf tests/output tests/diff
diff --git a/configure.ac b/configure.ac
index 5670aef..c9d456e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1132,7 +1132,6 @@ LIBS=""
 AC_CONFIG_HEADERS(config.h)
 
 AC_CONFIG_FILES([
-hwclock/Makefile
 login-utils/Makefile
 Makefile
 misc-utils/chkdupexe:misc-utils/chkdupexe.pl
diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am
deleted file mode 100644
index 542521c..0000000
--- a/hwclock/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-dist_man_MANS = hwclock.8
-
-sbin_PROGRAMS = hwclock
-
-hwclock_SOURCES = hwclock.c cmos.c rtc.c kd.c clock.h
-hwclock_LDADD =
-
-if HAVE_AUDIT
-hwclock_LDADD += -laudit
-endif
-
-EXTRA_DIST = README.hwclock clock-ppc.c
diff --git a/hwclock/module.am b/hwclock/module.am
new file mode 100644
index 0000000..133eca9
--- /dev/null
+++ b/hwclock/module.am
@@ -0,0 +1,14 @@
+if LINUX
+dist_man_MANS += hwclock/hwclock.8
+sbin_PROGRAMS += hwclock/hwclock
+endif
+
+hwclock_hwclock_SOURCES = hwclock/hwclock.c hwclock/cmos.c		\
+			  hwclock/rtc.c hwclock/kd.c hwclock/clock.h
+hwclock_hwclock_LDADD =
+
+if HAVE_AUDIT
+hwclock_hwclock_LDADD += -laudit
+endif
+
+EXTRA_DIST += hwclock/README.hwclock hwclock/clock-ppc.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