Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 5 ++- configure.ac | 1 - misc-utils/Makefile.am | 128 ------------------------------------------------ misc-utils/module.am | 128 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 130 deletions(-) delete mode 100644 misc-utils/Makefile.am create mode 100644 misc-utils/module.am diff --git a/Makefile.am b/Makefile.am index d1522aa..b509309 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,6 @@ endif SUBDIRS = \ $(SHLIBS_DIRS) \ - misc-utils \ po \ schedutils \ sys-utils \ @@ -86,6 +85,8 @@ EXTRA_DIST = \ tools \ docs +CLEANFILES = + dist_man_MANS = TESTS = tests/run.sh @@ -97,6 +98,7 @@ noinst_PROGRAMS = bin_PROGRAMS = sbin_PROGRAMS = usrbin_exec_PROGRAMS = +usrbin_exec_SCRIPTS = usrsbin_exec_PROGRAMS = tests_helpers_test_md5_SOURCES = tests/helpers/test_md5.c lib/md5.c @@ -108,6 +110,7 @@ include fsck/module.am include getopt/module.am include hwclock/module.am include login-utils/module.am +include misc-utils/module.am clean-local: rm -rf tests/output tests/diff diff --git a/configure.ac b/configure.ac index 1510996..fbbebd2 100644 --- a/configure.ac +++ b/configure.ac @@ -1134,7 +1134,6 @@ AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([ Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl -misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am deleted file mode 100644 index 6a16f99..0000000 --- a/misc-utils/Makefile.am +++ /dev/null @@ -1,128 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -EXTRA_DIST = README.flushb uuidd.rc - -bin_PROGRAMS = -sbin_PROGRAMS = -usrsbin_exec_PROGRAMS = - -usrbin_exec_PROGRAMS = cal ddate logger look mcookie \ - namei script whereis scriptreplay -EXTRA_DIST += README.cal README.ddate README.namei README.namei2 - -mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c -script_LDADD = - -usrbin_exec_SCRIPTS = chkdupexe - -CLEANFILES = chkdupexe - -dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ - namei.1 script.1 whereis.1 scriptreplay.1 - -if BUILD_LIBUUID -usrbin_exec_PROGRAMS += uuidgen -dist_man_MANS += uuidgen.1 -uuidgen_LDADD = $(ul_libuuid_la) -uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir) -if BUILD_UUIDD -usrsbin_exec_PROGRAMS += uuidd -dist_man_MANS += uuidd.8 -uuidd_LDADD = $(ul_libuuid_la) -uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir) -endif -endif - -if BUILD_LIBBLKID -sbin_PROGRAMS += blkid findfs wipefs -dist_man_MANS += blkid.8 findfs.8 wipefs.8 -blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/strtosize.c -blkid_LDADD = $(ul_libblkid_la) -blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -findfs_LDADD = $(ul_libblkid_la) -findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strtosize.c -wipefs_LDADD = $(ul_libblkid_la) -wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -if HAVE_STATIC_BLKID -sbin_PROGRAMS += blkid.static -blkid_static_SOURCES = $(blkid_SOURCES) -blkid_static_LDFLAGS = -all-static -blkid_static_LDADD = $(ul_libblkid_la) -blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -endif -endif - -if BUILD_LIBMOUNT -bin_PROGRAMS += findmnt -dist_man_MANS += findmnt.8 -findmnt_LDADD = $(ul_libmount_la) -findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c -endif - -cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c -if HAVE_TINFO -cal_LDADD = -ltinfo @NCURSES_LIBS@ -else -if HAVE_NCURSES -cal_LDADD = @NCURSES_LIBS@ -else -if HAVE_TERMCAP -cal_LDADD = -ltermcap -endif -endif -endif - -if HAVE_UTIL -script_LDADD += -lutil -endif - -if HAVE_UTEMPTER -script_LDADD += -lutempter -endif - -if HAVE_NCURSES -if LINUX -usrbin_exec_PROGRAMS += setterm -dist_man_MANS += setterm.1 -endif -if HAVE_TINFO -setterm_LDADD = -ltinfo -else -setterm_LDADD = @NCURSES_LIBS@ -endif -endif - -if BUILD_KILL -bin_PROGRAMS += kill -kill_SOURCES = kill.c procs.c kill.h -dist_man_MANS += kill.1 -endif - -if BUILD_RENAME -usrbin_exec_PROGRAMS += rename -dist_man_MANS += rename.1 -endif - -if BUILD_RESET -dist_usrbin_exec_SCRIPTS = reset -dist_man_MANS += reset.1 -endif -EXTRA_DIST += README.reset reset.033c - -if BUILD_WRITE -usrbin_exec_PROGRAMS += write -dist_man_MANS += write.1 -write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) - -if USE_TTY_GROUP -if MAKEINSTALL_DO_CHOWN -install-exec-hook:: - chgrp tty $(DESTDIR)$(usrbin_execdir)/write - chmod g+s $(DESTDIR)$(usrbin_execdir)/write -endif -endif -endif diff --git a/misc-utils/module.am b/misc-utils/module.am new file mode 100644 index 0000000..c2adf8f --- /dev/null +++ b/misc-utils/module.am @@ -0,0 +1,128 @@ +EXTRA_DIST += misc-utils/README.flushb misc-utils/uuidd.rc + +usrbin_exec_PROGRAMS += misc-utils/cal misc-utils/ddate \ + misc-utils/logger misc-utils/look misc-utils/mcookie \ + misc-utils/namei misc-utils/script misc-utils/whereis \ + misc-utils/scriptreplay +EXTRA_DIST += misc-utils/README.cal misc-utils/README.ddate \ + misc-utils/README.namei misc-utils/README.namei2 + +misc_utils_mcookie_SOURCES = misc-utils/mcookie.c lib/md5.c +misc_utils_script_LDADD = + +usrbin_exec_SCRIPTS += misc-utils/chkdupexe + +CLEANFILES += misc-utils/chkdupexe + +dist_man_MANS += misc-utils/cal.1 misc-utils/chkdupexe.1 \ + misc-utils/ddate.1 misc-utils/logger.1 misc-utils/look.1 \ + misc-utils/mcookie.1 misc-utils/namei.1 misc-utils/script.1 \ + misc-utils/whereis.1 misc-utils/scriptreplay.1 + +if BUILD_LIBUUID +usrbin_exec_PROGRAMS += misc-utils/uuidgen +dist_man_MANS += misc-utils/uuidgen.1 +misc_utils_uuidgen_LDADD = $(ul_libuuid_la) +misc_utils_uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir) +if BUILD_UUIDD +usrsbin_exec_PROGRAMS += misc-utils/uuidd +dist_man_MANS += misc-utils/uuidd.8 +misc_utils_uuidd_LDADD = $(ul_libuuid_la) +misc_utils_uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir) +endif +endif + +if BUILD_LIBBLKID +sbin_PROGRAMS += misc-utils/blkid misc-utils/findfs misc-utils/wipefs +dist_man_MANS += misc-utils/blkid.8 misc-utils/findfs.8 misc-utils/wipefs.8 +misc_utils_blkid_SOURCES = misc-utils/blkid.c lib/ismounted.c lib/strtosize.c +misc_utils_blkid_LDADD = $(ul_libblkid_la) +misc_utils_blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +misc_utils_findfs_LDADD = $(ul_libblkid_la) +misc_utils_findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +misc_utils_wipefs_SOURCES = misc-utils/wipefs.c lib/strtosize.c +misc_utils_wipefs_LDADD = $(ul_libblkid_la) +misc_utils_wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +if HAVE_STATIC_BLKID +sbin_PROGRAMS += misc-utils/blkid.static +misc_utils_blkid_static_SOURCES = $(misc_utils_blkid_SOURCES) +misc_utils_blkid_static_LDFLAGS = -all-static +misc_utils_blkid_static_LDADD = $(ul_libblkid_la) +misc_utils_blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +endif +endif + +if BUILD_LIBMOUNT +bin_PROGRAMS += misc-utils/findmnt +dist_man_MANS += misc-utils/findmnt.8 +misc_utils_findmnt_LDADD = $(ul_libmount_la) +misc_utils_findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) +misc_utils_findmnt_SOURCES = misc-utils/findmnt.c lib/tt.c +endif + +misc_utils_cal_SOURCES = misc-utils/cal.c lib/mbsalign.c +if HAVE_TINFO +misc_utils_cal_LDADD = -ltinfo $(NCURSES_LIBS) +else +if HAVE_NCURSES +misc_utils_cal_LDADD = $(NCURSES_LIBS) +else +if HAVE_TERMCAP +misc_utils_cal_LDADD = -ltermcap +endif +endif +endif + +if HAVE_UTIL +misc_utils_script_LDADD += -lutil +endif + +if HAVE_UTEMPTER +misc_utils_script_LDADD += -lutempter +endif + +if HAVE_NCURSES +if LINUX +usrbin_exec_PROGRAMS += misc-utils/setterm +dist_man_MANS += misc-utils/setterm.1 +endif +if HAVE_TINFO +misc_utils_setterm_LDADD = -ltinfo +else +misc_utils_setterm_LDADD = $(NCURSES_LIBS) +endif +endif + +if BUILD_KILL +bin_PROGRAMS += misc-utils/kill +misc_utils_kill_SOURCES = misc-utils/kill.c misc-utils/procs.c misc-utils/kill.h +dist_man_MANS += misc-utils/kill.1 +endif + +if BUILD_RENAME +usrbin_exec_PROGRAMS += misc-utils/rename +dist_man_MANS += misc-utils/rename.1 +endif + +if BUILD_RESET +dist_usrbin_exec_SCRIPTS = misc-utils/reset +dist_man_MANS += misc-utils/reset.1 +endif +EXTRA_DIST += misc-utils/README.reset misc-utils/reset.033c + +if BUILD_WRITE +usrbin_exec_PROGRAMS += misc-utils/write +dist_man_MANS += misc-utils/write.1 +misc_utils_write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +misc_utils_write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) + +if USE_TTY_GROUP +if MAKEINSTALL_DO_CHOWN +install-exec-hook-write: + chgrp tty $(DESTDIR)$(usrbin_execdir)/write + chmod g+s $(DESTDIR)$(usrbin_execdir)/write + +INSTALL_EXEC_HOOKS += install-exec-hook-write +endif +endif +endif -- 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
