diff options
author | Karel Zak | 2012-01-11 12:14:29 +0100 |
---|---|---|
committer | Karel Zak | 2012-01-11 12:14:29 +0100 |
commit | 143635c91f784a91d8a0efca1b2369448240f141 (patch) | |
tree | d19721916790625d17f2e9382948b55bf1b16422 /sys-utils/Makefile.am | |
parent | swapon: merge swap_constants.h into swapon.c (diff) | |
download | kernel-qcow2-util-linux-143635c91f784a91d8a0efca1b2369448240f141.tar.gz kernel-qcow2-util-linux-143635c91f784a91d8a0efca1b2369448240f141.tar.xz kernel-qcow2-util-linux-143635c91f784a91d8a0efca1b2369448240f141.zip |
build-sys: move swapon from mount/ to sys-utils/
... to make it independent on mount stuff.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/Makefile.am')
-rw-r--r-- | sys-utils/Makefile.am | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index a7e1471f7..0664b2d2c 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -9,6 +9,10 @@ dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \ readprofile.8 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_*. +# bin_PROGRAMS += dmesg sbin_PROGRAMS += ctrlaltdel fsfreeze fstrim usrbin_exec_PROGRAMS += cytune setarch @@ -16,7 +20,8 @@ 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 fstrim.8 -endif +endif # LINUX + if BUILD_LOSETUP sbin_PROGRAMS += losetup @@ -35,7 +40,6 @@ bin_PROGRAMS += losetup.static losetup_static_SOURCES = $(losetup_SOURCES) losetup_static_LDFLAGS = -all-static endif - endif # BUILD_LOSETUP @@ -47,6 +51,21 @@ prlimit_SOURCES = prlimit.c $(top_srcdir)/lib/strutils.c \ $(top_srcdir)/lib/tt.c endif +if BUILD_SWAPON +sbin_PROGRAMS += swapon +dist_man_MANS += swapoff.8 swapon.8 + +swapon_SOURCES = swapon.c \ + $(top_srcdir)/lib/linux_version.c \ + $(top_srcdir)/lib/blkdev.c \ + $(top_srcdir)/lib/fsprobe.c \ + $(top_srcdir)/lib/canonicalize.c \ + $(top_srcdir)/lib/mangle.c + +swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +swapon_LDADD = $(ul_libblkid_la) +endif + if BUILD_LSCPU usrbin_exec_PROGRAMS += lscpu lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \ @@ -142,6 +161,9 @@ $(SETARCH_MAN_LINKS): $(AM_V_GEN)echo ".so man8/setarch.8" > $@ install-exec-hook: +if BUILD_SWAPON + cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff +endif for I in $(SETARCH_LINKS); do \ cd $(DESTDIR)$(usrbin_execdir) && ln -sf setarch $$I ; \ done |