From: Karel Zak <kzak@redhat.com>
Date: Thu, 31 May 2012 09:15:07 +0000 (+0200)
Subject: build-sys: move hwclock to sys-utils/
X-Git-Tag: v2.22-rc1~219
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7f753901f45bffdf39506e4f19bba4c37659ccc;p=thirdparty%2Futil-linux.git

build-sys: move hwclock to sys-utils/

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index 35cd0b9d0a..8b8d5a95da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,6 @@ bin_PROGRAMS =
 sbin_PROGRAMS =
 dist_usrbin_exec_SCRIPTS =
 
-INSTALL_EXEC_HOOKS =
-UNINSTALL_HOOKS =
-
 INSTALL_EXEC_HOOKS =
 UNINSTALL_HOOKS =
 INSTALL_DATA_HOOKS =
@@ -39,10 +36,6 @@ SUBDIRS = \
 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
 
-if BUILD_HWCLOCK
-SUBDIRS += hwclock
-endif
-
 if BUILD_PARTX
 SUBDIRS += partx
 endif
diff --git a/configure.ac b/configure.ac
index 84031154cf..def8bb53a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1288,7 +1288,6 @@ Makefile
 disk-utils/Makefile
 fdisk/Makefile
 getopt/Makefile
-hwclock/Makefile
 libblkid/blkid.pc
 libblkid/docs/Makefile
 libblkid/docs/version.xml
diff --git a/hwclock/.gitignore b/hwclock/.gitignore
deleted file mode 100644
index 97f59f3367..0000000000
--- a/hwclock/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-hwclock
diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am
deleted file mode 100644
index 90f5e0108e..0000000000
--- a/hwclock/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-dist_man_MANS = hwclock.8
-
-sbin_PROGRAMS = hwclock
-
-hwclock_SOURCES = \
-	clock.h \
-	cmos.c \
-	hwclock.c \
-	kd.c \
-	$(top_srcdir)/lib/strutils.c
-hwclock_LDADD =
-
-if LINUX
-hwclock_SOURCES += rtc.c
-endif
-
-if HAVE_AUDIT
-hwclock_LDADD += -laudit
-endif
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index b4adf634ec..cc1a3f63a7 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -314,3 +314,23 @@ bin_PROGRAMS += arch
 dist_man_MANS += sys-utils/arch.1
 arch_SOURCES = sys-utils/arch.c
 endif
+
+if BUILD_HWCLOCK
+sbin_PROGRAMS += hwclock
+dist_man_MANS += sys-utils/hwclock.8
+hwclock_SOURCES = \
+	sys-utils/hwclock.c \
+	sys-utils/hwclock.h \
+	sys-utils/hwclock-cmos.c \
+	sys-utils/hwclock-kd.c \
+	lib/strutils.c
+
+if LINUX
+hwclock_SOURCES += sys-utils/hwclock-rtc.c
+endif
+
+hwclock_LDADD =
+if HAVE_AUDIT
+hwclock_LDADD += -laudit
+endif
+endif # BUILD_HWCLOCK
diff --git a/hwclock/cmos.c b/sys-utils/hwclock-cmos.c
similarity index 99%
rename from hwclock/cmos.c
rename to sys-utils/hwclock-cmos.c
index 0c98fb8997..366d934fbd 100644
--- a/hwclock/cmos.c
+++ b/sys-utils/hwclock-cmos.c
@@ -93,7 +93,7 @@ int inb(int c __attribute__ ((__unused__)))
 }
 #endif				/* __alpha__ */
 
-#include "clock.h"
+#include "hwclock.h"
 
 #define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
 #define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
diff --git a/hwclock/kd.c b/sys-utils/hwclock-kd.c
similarity index 99%
rename from hwclock/kd.c
rename to sys-utils/hwclock-kd.c
index 36c1bb245c..ec98f45ba5 100644
--- a/hwclock/kd.c
+++ b/sys-utils/hwclock-kd.c
@@ -10,10 +10,11 @@
 # include <sys/ioctl.h>
 # include <unistd.h>
 
-# include "clock.h"
 # include "nls.h"
 # include "usleep.h"
 
+# include "hwclock.h"
+
 /* Get defines for KDGHWCLK and KDSHWCLK (m68k) */
 # include <linux/kd.h>
 
diff --git a/hwclock/rtc.c b/sys-utils/hwclock-rtc.c
similarity index 99%
rename from hwclock/rtc.c
rename to sys-utils/hwclock-rtc.c
index 33dbccc1e6..62adc49d7d 100644
--- a/hwclock/rtc.c
+++ b/sys-utils/hwclock-rtc.c
@@ -13,9 +13,10 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "clock.h"
 #include "nls.h"
 
+#include "hwclock.h"
+
 /*
  * Get defines for rtc stuff.
  *
diff --git a/hwclock/hwclock.8 b/sys-utils/hwclock.8
similarity index 100%
rename from hwclock/hwclock.8
rename to sys-utils/hwclock.8
diff --git a/hwclock/hwclock.c b/sys-utils/hwclock.c
similarity index 99%
rename from hwclock/hwclock.c
rename to sys-utils/hwclock.c
index 10ef8da428..c0ac678263 100644
--- a/hwclock/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -73,20 +73,21 @@
 #define OPTUTILS_EXIT_CODE EX_USAGE
 
 #include "c.h"
-#include "clock.h"
 #include "closestream.h"
 #include "nls.h"
 #include "optutils.h"
 #include "pathnames.h"
 #include "strutils.h"
+#include "hwclock.h"
 
-#define EXCL_ERROR "--{adjust,getepoch,hctosys,predict,set,setepoch,show,systohc,systz}"
 #ifdef HAVE_LIBAUDIT
 #include <libaudit.h>
 static int hwaudit_fd = -1;
 static int hwaudit_on;
 #endif
 
+#define EXCL_ERROR "--{adjust,getepoch,hctosys,predict,set,setepoch,show,systohc,systz}"
+
 /* The struct that holds our hardware access routines */
 struct clock_ops *ur;
 
diff --git a/hwclock/clock.h b/sys-utils/hwclock.h
similarity index 100%
rename from hwclock/clock.h
rename to sys-utils/hwclock.h