Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 8 +++- configure.ac | 1 - sys-utils/Makefile.am | 106 ----------------------------------------------- sys-utils/module.am | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 109 deletions(-) delete mode 100644 sys-utils/Makefile.am create mode 100644 sys-utils/module.am diff --git a/Makefile.am b/Makefile.am index ce0ffd0..c8cba43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/config/include-Makefile.am INSTALL_EXEC_HOOKS = +UNINSTALL_HOOKS = INSTALL_DATA_HOOKS = noinst_HEADERS = \ @@ -48,8 +49,7 @@ endif SUBDIRS = \ $(SHLIBS_DIRS) \ - po \ - sys-utils + po 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 @@ -79,6 +79,7 @@ EXTRA_DIST = \ CLEANFILES = dist_man_MANS = +man_MANS = TESTS = tests/run.sh @@ -105,6 +106,7 @@ include misc-utils/module.am include schedutils/module.am include text-utils/module.am include mount/module.am +include sys-utils/module.am clean-local: rm -rf tests/output tests/diff @@ -126,6 +128,8 @@ checkconfig: install-exec-hook: $(INSTALL_EXEC_HOOKS) +uninstall-hook: $(UNINSTALL_HOOKS) + install-data-hook: $(INSTALL_DATA_HOOKS) ENABLE_ALL = --enable-static-programs \ diff --git a/configure.ac b/configure.ac index 8d364ec..d497086 100644 --- a/configure.ac +++ b/configure.ac @@ -1155,7 +1155,6 @@ shlibs/uuid/uuid.pc shlibs/uuid/Makefile shlibs/uuid/man/Makefile shlibs/uuid/src/Makefile -sys-utils/Makefile tests/commands.sh ]) diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am deleted file mode 100644 index 166d718..0000000 --- a/sys-utils/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -bin_PROGRAMS = -sbin_PROGRAMS = -usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid -usrsbin_exec_PROGRAMS = readprofile - -dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \ - readprofile.1 - -if LINUX -bin_PROGRAMS += dmesg -sbin_PROGRAMS += ctrlaltdel fsfreeze -usrbin_exec_PROGRAMS += cytune setarch -usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake - -dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ - ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 - -if HAVE_CPU_SET_T -usrbin_exec_PROGRAMS += lscpu -lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c -dist_man_MANS += lscpu.1 -endif - -endif - -cytune_SOURCES = cytune.c cyclades.h -tunelp_SOURCES = tunelp.c lp.h - -info_TEXINFOS = ipc.texi - - -if BUILD_FALLOCATE -usrbin_exec_PROGRAMS += fallocate -fallocate_SOURCES = fallocate.c $(top_srcdir)/lib/strtosize.c -dist_man_MANS += fallocate.1 -endif - -if BUILD_PIVOT_ROOT -sbin_PROGRAMS += pivot_root -dist_man_MANS += pivot_root.8 -endif - -if BUILD_SWITCH_ROOT -sbin_PROGRAMS += switch_root -dist_man_MANS += switch_root.8 -endif - -if BUILD_UNSHARE -usrbin_exec_PROGRAMS += unshare -dist_man_MANS += unshare.1 -endif - -if BUILD_ARCH -bin_PROGRAMS += arch -dist_man_MANS += arch.1 -endif - -SETARCH_LINKS = linux32 linux64 - -if ARCH_S390 -SETARCH_LINKS += s390 s390x -endif -if ARCH_I86 -SETARCH_LINKS += i386 -endif -if ARCH_86_64 -SETARCH_LINKS += i386 x86_64 -endif -if ARCH_PPC -SETARCH_LINKS += ppc ppc64 ppc32 -endif -if ARCH_SPARC -SETARCH_LINKS += sparc sparc64 sparc32 sparc32bash -endif -if ARCH_MIPS -SETARCH_LINKS += mips mips64 mips32 -endif -if ARCH_IA64 -SETARCH_LINKS += i386 ia64 -endif -if ARCH_HPPA -SETARCH_LINKS += parisc parisc64 parisc32 -endif - -SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8) -man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS) -CLEANFILES = $(man_MANS) - -$(SETARCH_MAN_LINKS): - $(AM_V_GEN)echo ".so man8/setarch.8" > $@ - -install-exec-hook: - for I in $(SETARCH_LINKS); do \ - cd $(DESTDIR)$(usrbin_execdir) && ln -sf setarch $$I ; \ - done - -uninstall-hook: - for I in $(RDEV_LINKS); do \ - rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \ - done - for I in $(SETARCH_LINKS); do \ - rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \ - done - diff --git a/sys-utils/module.am b/sys-utils/module.am new file mode 100644 index 0000000..37380b3 --- /dev/null +++ b/sys-utils/module.am @@ -0,0 +1,110 @@ +usrbin_exec_PROGRAMS += sys-utils/flock sys-utils/ipcrm sys-utils/ipcs \ + sys-utils/ipcmk sys-utils/renice \ + sys-utils/setsid +usrsbin_exec_PROGRAMS += sys-utils/readprofile + +dist_man_MANS += sys-utils/flock.1 sys-utils/ipcrm.1 sys-utils/ipcs.1 \ + sys-utils/ipcmk.1 sys-utils/renice.1 \ + sys-utils/setsid.1 sys-utils/readprofile.1 + +if LINUX +bin_PROGRAMS += sys-utils/dmesg +sbin_PROGRAMS += sys-utils/ctrlaltdel sys-utils/fsfreeze +usrbin_exec_PROGRAMS += sys-utils/cytune sys-utils/setarch +usrsbin_exec_PROGRAMS += sys-utils/ldattach sys-utils/tunelp sys-utils/rtcwake + +dist_man_MANS += sys-utils/dmesg.1 sys-utils/ctrlaltdel.8 \ + sys-utils/cytune.8 sys-utils/setarch.8 \ + sys-utils/ldattach.8 sys-utils/tunelp.8 \ + sys-utils/rtcwake.8 sys-utils/fsfreeze.8 + +if HAVE_CPU_SET_T +usrbin_exec_PROGRAMS += sys-utils/lscpu +sys_utils_lscpu_SOURCES = sys-utils/lscpu.c lib/cpuset.c +dist_man_MANS += sys-utils/lscpu.1 +endif + +endif + +sys_utils_cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h +sys_utils_tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h + +info_TEXINFOS = sys-utils/ipc.texi + + +if BUILD_FALLOCATE +usrbin_exec_PROGRAMS += sys-utils/fallocate +sys_utils_fallocate_SOURCES = sys-utils/fallocate.c lib/strtosize.c +dist_man_MANS += sys-utils/fallocate.1 +endif + +if BUILD_PIVOT_ROOT +sbin_PROGRAMS += sys-utils/pivot_root +dist_man_MANS += sys-utils/pivot_root.8 +endif + +if BUILD_SWITCH_ROOT +sbin_PROGRAMS += sys-utils/switch_root +dist_man_MANS += sys-utils/switch_root.8 +endif + +if BUILD_UNSHARE +usrbin_exec_PROGRAMS += sys-utils/unshare +dist_man_MANS += sys-utils/unshare.1 +endif + +if BUILD_ARCH +bin_PROGRAMS += sys-utils/arch +dist_man_MANS += sys-utils/arch.1 +endif + +SETARCH_LINKS = linux32 linux64 + +if ARCH_S390 +SETARCH_LINKS += s390 s390x +endif +if ARCH_I86 +SETARCH_LINKS += i386 +endif +if ARCH_86_64 +SETARCH_LINKS += i386 x86_64 +endif +if ARCH_PPC +SETARCH_LINKS += ppc ppc64 ppc32 +endif +if ARCH_SPARC +SETARCH_LINKS += sparc sparc64 sparc32 sparc32bash +endif +if ARCH_MIPS +SETARCH_LINKS += mips mips64 mips32 +endif +if ARCH_IA64 +SETARCH_LINKS += i386 ia64 +endif +if ARCH_HPPA +SETARCH_LINKS += parisc parisc64 parisc32 +endif + +SETARCH_MAN_LINKS = $(SETARCH_LINKS:%=sys-utils/%.8) +man_MANS += $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS) +CLEANFILES += $(man_MANS) + +$(SETARCH_MAN_LINKS): + @$(mkdir_p) sys-utils + $(AM_V_GEN)echo ".so man8/setarch.8" > $@ + +install-exec-hook-sys-utils: + for I in $(SETARCH_LINKS); do \ + cd $(DESTDIR)$(usrbin_execdir) && ln -sf setarch $$I ; \ + done + +uninstall-hook-sys-utils: + for I in $(RDEV_LINKS); do \ + rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \ + done + for I in $(SETARCH_LINKS); do \ + rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \ + done + +INSTALL_EXEC_HOOKS += install-exec-hook-sys-utils +UNINSTALL_HOOKS += uninstall-hook-sys-utils -- 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
