diff options
| -rw-r--r-- | configure.ac | 50 | ||||
| -rw-r--r-- | sys-utils/Makemodule.am | 36 |
2 files changed, 78 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index aa7bf1ca7..7347965fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1180,6 +1180,56 @@ UL_REQUIRES_SYSCALL_CHECK([pivot_root], [UL_CHECK_SYSCALL([pivot_root])]) AM_CONDITIONAL([BUILD_PIVOT_ROOT], [test "x$build_pivot_root" = xyes]) +UL_BUILD_INIT([flock], [yes]) +AM_CONDITIONAL([BUILD_FLOCK], [test "x$build_flock" = xyes]) + +UL_BUILD_INIT([ipcmk], [yes]) +AM_CONDITIONAL([BUILD_IPCMK], [test "x$build_ipcmk" = xyes]) + +UL_BUILD_INIT([ipcrm], [yes]) +AM_CONDITIONAL([BUILD_IPCRM], [test "x$build_ipcrm" = xyes]) + +UL_BUILD_INIT([ipcs], [yes]) +AM_CONDITIONAL([BUILD_IPCS], [test "x$build_ipcs" = xyes]) + +UL_BUILD_INIT([renice], [yes]) +AM_CONDITIONAL([BUILD_RENICE], [test "x$build_renice" = xyes]) + +UL_BUILD_INIT([setsid], [yes]) +AM_CONDITIONAL([BUILD_SETSID], [test "x$build_setsid" = xyes]) + +UL_BUILD_INIT([readprofile], [check]) +UL_REQUIRES_LINUX([readprofile]) +AM_CONDITIONAL([BUILD_READPROFILE], [test "x$build_readprofile" = xyes]) + +UL_BUILD_INIT([dmesg], [check]) +UL_REQUIRES_LINUX([dmesg]) +AM_CONDITIONAL([BUILD_DMESG], [test "x$build_dmesg" = xyes]) + +UL_BUILD_INIT([ctrlaltdel], [check]) +UL_REQUIRES_LINUX([ctrlaltdel]) +AM_CONDITIONAL([BUILD_CTRLALTDEL], [test "x$build_ctrlaltdel" = xyes]) + +UL_BUILD_INIT([fsfreeze], [check]) +UL_REQUIRES_LINUX([fsfreeze]) +AM_CONDITIONAL([BUILD_FSFREEZE], [test "x$build_fsfreeze" = xyes]) + +UL_BUILD_INIT([blkdiscard], [check]) +UL_REQUIRES_LINUX([blkdiscard]) +AM_CONDITIONAL([BUILD_BLKDISCARD], [test "x$build_blkdiscard" = xyes]) + +UL_BUILD_INIT([ldattach], [check]) +UL_REQUIRES_LINUX([ldattach]) +AM_CONDITIONAL([BUILD_LDATTACH], [test "x$build_ldattach" = xyes]) + +UL_BUILD_INIT([rtcwake], [check]) +UL_REQUIRES_LINUX([rtcwake]) +AM_CONDITIONAL([BUILD_RTCWAKE], [test "x$build_rtcwake" = xyes]) + +UL_BUILD_INIT([setarch], [check]) +UL_REQUIRES_LINUX([setarch]) +AM_CONDITIONAL([BUILD_SETARCH], [test "x$build_setarch" = xyes]) + AC_ARG_ENABLE([tunelp], AS_HELP_STRING([--enable-tunelp], [build tunelp]), [], [enable_tunelp=no] diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 9d69bc60e..2653385ef 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -1,38 +1,50 @@ - +if BUILD_FLOCK usrbin_exec_PROGRAMS += flock dist_man_MANS += sys-utils/flock.1 flock_SOURCES = sys-utils/flock.c flock_LDADD = $(LDADD) libcommon.la +endif +if BUILD_IPCMK usrbin_exec_PROGRAMS += ipcmk dist_man_MANS += sys-utils/ipcmk.1 ipcmk_SOURCES = sys-utils/ipcmk.c ipcmk_LDADD = $(LDADD) libcommon.la +endif +if BUILD_IPCRM usrbin_exec_PROGRAMS += ipcrm dist_man_MANS += sys-utils/ipcrm.1 ipcrm_SOURCES = sys-utils/ipcrm.c ipcrm_LDADD = $(LDADD) libcommon.la +endif +if BUILD_IPCS usrbin_exec_PROGRAMS += ipcs dist_man_MANS += sys-utils/ipcs.1 ipcs_SOURCES = sys-utils/ipcs.c \ sys-utils/ipcutils.c \ sys-utils/ipcutils.h ipcs_LDADD = $(LDADD) libcommon.la +endif - +if BUILD_RENICE usrbin_exec_PROGRAMS += renice dist_man_MANS += sys-utils/renice.1 renice_SOURCES = sys-utils/renice.c +endif +if BUILD_SETSID usrbin_exec_PROGRAMS += setsid dist_man_MANS += sys-utils/setsid.1 setsid_SOURCES = sys-utils/setsid.c +endif +if BUILD_READPROFILE usrsbin_exec_PROGRAMS += readprofile dist_man_MANS += sys-utils/readprofile.8 readprofile_SOURCES = sys-utils/readprofile.c +endif if BUILD_TUNELP usrsbin_exec_PROGRAMS += tunelp @@ -56,39 +68,47 @@ endif # BUILD_FSTRIM PATHFILES += sys-utils/fstrim.service EXTRA_DIST += sys-utils/fstrim.timer -if LINUX -# -# Linux-only utils with no another dependencies. All another dependencies have -# to be resolved in configure.ac end exported to makefiles by BUILD_*. -# +if BUILD_DMESG bin_PROGRAMS += dmesg dist_man_MANS += sys-utils/dmesg.1 dmesg_SOURCES = sys-utils/dmesg.c lib/boottime.c dmesg_LDADD = $(LDADD) libcommon.la -lrt +endif +if BUILD_CTRLALTDEL sbin_PROGRAMS += ctrlaltdel dist_man_MANS += sys-utils/ctrlaltdel.8 ctrlaltdel_SOURCES = sys-utils/ctrlaltdel.c +endif +if BUILD_FSFREEZE sbin_PROGRAMS += fsfreeze dist_man_MANS += sys-utils/fsfreeze.8 fsfreeze_SOURCES = sys-utils/fsfreeze.c +endif +if BUILD_BLKDISCARD sbin_PROGRAMS += blkdiscard dist_man_MANS += sys-utils/blkdiscard.8 blkdiscard_SOURCES = sys-utils/blkdiscard.c blkdiscard_LDADD = $(LDADD) libcommon.la +endif +if BUILD_LDATTACH usrsbin_exec_PROGRAMS += ldattach dist_man_MANS += sys-utils/ldattach.8 ldattach_SOURCES = sys-utils/ldattach.c ldattach_LDADD = $(LDADD) libcommon.la +endif +if BUILD_RTCWAKE usrsbin_exec_PROGRAMS += rtcwake dist_man_MANS += sys-utils/rtcwake.8 rtcwake_SOURCES = sys-utils/rtcwake.c rtcwake_LDADD = $(LDADD) libcommon.la +endif +if BUILD_SETARCH usrbin_exec_PROGRAMS += setarch dist_man_MANS += sys-utils/setarch.8 setarch_SOURCES = sys-utils/setarch.c @@ -140,7 +160,7 @@ uninstall-hook-setarch: INSTALL_EXEC_HOOKS += install-exec-hook-setarch UNINSTALL_HOOKS += uninstall-hook-setarch -endif # LINUX +endif # BUILD_SETARCH if BUILD_EJECT |