diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | misc-utils/.gitignore | 1 | ||||
| -rw-r--r-- | misc-utils/Makefile.am | 10 | ||||
| -rw-r--r-- | sys-utils/.gitignore | 1 | ||||
| -rw-r--r-- | sys-utils/Makefile.am | 13 | ||||
| -rw-r--r-- | sys-utils/eject.1 (renamed from misc-utils/eject.1) | 0 | ||||
| -rw-r--r-- | sys-utils/eject.c (renamed from misc-utils/eject.c) | 0 |
7 files changed, 15 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 4e9b5f4ee..18ed3fe0c 100644 --- a/configure.ac +++ b/configure.ac @@ -868,6 +868,7 @@ AC_ARG_ENABLE([eject], ) UL_BUILD_INIT([eject]) UL_REQUIRES_LINUX([eject]) +AM_CONDITIONAL(BUILD_EJECT, test "x$build_eject" = xyes) AC_ARG_ENABLE([agetty], @@ -878,8 +879,6 @@ UL_BUILD_INIT([agetty]) AM_CONDITIONAL(BUILD_AGETTY, test "x$build_agetty" = xyes) - - AC_ARG_ENABLE([cramfs], AS_HELP_STRING([--disable-cramfs], [do not build fsck.cramfs, mkfs.cramfs]), [], enable_cramfs=check diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore index aeefb6ef7..927af2326 100644 --- a/misc-utils/.gitignore +++ b/misc-utils/.gitignore @@ -18,4 +18,3 @@ wipefs findmnt lsblk lslocks -eject diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 1ba1827b1..acf2c9d1a 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -32,16 +32,6 @@ dist_man_MANS = \ namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c -usrbin_exec_PROGRAMS += eject -eject_SOURCES = \ - eject.c \ - $(top_srcdir)/lib/strutils.c \ - $(top_srcdir)/lib/sysfs.c \ - $(top_srcdir)/lib/at.c -eject_LDADD = $(ul_libmount_la) -eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -dist_man_MANS += eject.1 - if BUILD_DDATE usrbin_exec_PROGRAMS += ddate dist_man_MANS += ddate.1 diff --git a/sys-utils/.gitignore b/sys-utils/.gitignore index 38e8874b3..a5bf223c1 100644 --- a/sys-utils/.gitignore +++ b/sys-utils/.gitignore @@ -2,6 +2,7 @@ arch ctrlaltdel cytune dmesg +eject fallocate flock fsfreeze diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index 83f38cf90..828c48d9b 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -43,6 +43,19 @@ dist_man_MANS += \ endif # LINUX +if BUILD_EJECT +usrbin_exec_PROGRAMS += eject +eject_SOURCES = \ + eject.c \ + $(top_srcdir)/lib/strutils.c \ + $(top_srcdir)/lib/sysfs.c \ + $(top_srcdir)/lib/at.c +eject_LDADD = $(ul_libmount_la) +eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) +dist_man_MANS += eject.1 +endif + + if BUILD_LOSETUP sbin_PROGRAMS += losetup dist_man_MANS += losetup.8 diff --git a/misc-utils/eject.1 b/sys-utils/eject.1 index 8b1b11bc1..8b1b11bc1 100644 --- a/misc-utils/eject.1 +++ b/sys-utils/eject.1 diff --git a/misc-utils/eject.c b/sys-utils/eject.c index 2d8b0cbcc..2d8b0cbcc 100644 --- a/misc-utils/eject.c +++ b/sys-utils/eject.c |