build-sys: convert misc-utils/ to module
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
c7f753901f
commit
37b88bfcd7
|
@ -14,6 +14,7 @@ usrlib_exec_LTLIBRARIES =
|
|||
bin_PROGRAMS =
|
||||
sbin_PROGRAMS =
|
||||
dist_usrbin_exec_SCRIPTS =
|
||||
systemdsystemunit_DATA =
|
||||
|
||||
INSTALL_EXEC_HOOKS =
|
||||
UNINSTALL_HOOKS =
|
||||
|
@ -29,7 +30,6 @@ SUBDIRS = \
|
|||
disk-utils \
|
||||
fdisk \
|
||||
getopt \
|
||||
misc-utils \
|
||||
po \
|
||||
tests
|
||||
|
||||
|
@ -62,6 +62,7 @@ include term-utils/Makemodule.am
|
|||
include login-utils/Makemodule.am
|
||||
include mount-deprecated/Makemodule.am
|
||||
include sys-utils/Makemodule.am
|
||||
include misc-utils/Makemodule.am
|
||||
|
||||
# Arrange so that .tarball-version appears only in the distribution
|
||||
# tarball, and never in a checked-out repository.
|
||||
|
|
|
@ -1199,7 +1199,7 @@ if test "x$with_systemdsystemunitdir" != "xno"; then
|
|||
AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ])
|
||||
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ])
|
||||
|
||||
|
||||
AC_ARG_ENABLE([pg-bell],
|
||||
|
@ -1298,7 +1298,6 @@ libmount/mount.pc
|
|||
libmount/src/libmount.h
|
||||
libuuid/uuid.pc
|
||||
man/ru/Makefile
|
||||
misc-utils/Makefile
|
||||
misc-utils/uuidd.service
|
||||
partx/Makefile
|
||||
po/Makefile.in
|
||||
|
|
|
@ -1,180 +0,0 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
bin_PROGRAMS =
|
||||
sbin_PROGRAMS =
|
||||
usrsbin_exec_PROGRAMS =
|
||||
|
||||
usrbin_exec_PROGRAMS = \
|
||||
cal \
|
||||
logger \
|
||||
look \
|
||||
mcookie \
|
||||
namei \
|
||||
whereis
|
||||
|
||||
logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c
|
||||
mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
|
||||
|
||||
usrbin_exec_SCRIPTS =
|
||||
CLEANFILES =
|
||||
|
||||
dist_man_MANS = \
|
||||
cal.1 \
|
||||
logger.1 \
|
||||
look.1 \
|
||||
mcookie.1 \
|
||||
namei.1 \
|
||||
whereis.1
|
||||
|
||||
namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
|
||||
|
||||
if BUILD_CHKDUPEXE
|
||||
usrbin_exec_SCRIPTS += chkdupexe
|
||||
CLEANFILES += chkdupexe
|
||||
dist_man_MANS += chkdupexe.1
|
||||
endif
|
||||
|
||||
if BUILD_DDATE
|
||||
usrbin_exec_PROGRAMS += ddate
|
||||
dist_man_MANS += ddate.1
|
||||
endif
|
||||
|
||||
if BUILD_LSLOCKS
|
||||
usrbin_exec_PROGRAMS += lslocks
|
||||
dist_man_MANS += lslocks.8
|
||||
lslocks_SOURCES = \
|
||||
lslocks.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/tt.c \
|
||||
$(top_srcdir)/lib/mbsalign.c
|
||||
endif
|
||||
|
||||
if BUILD_LSBLK
|
||||
bin_PROGRAMS += lsblk
|
||||
dist_man_MANS += lsblk.8
|
||||
lsblk_SOURCES = \
|
||||
lsblk.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/mangle.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/tt.c
|
||||
lsblk_LDADD = $(ul_libblkid_la) $(ul_libmount_la)
|
||||
lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir)
|
||||
if HAVE_UDEV
|
||||
lsblk_LDADD += -ludev
|
||||
endif
|
||||
endif
|
||||
|
||||
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)
|
||||
endif
|
||||
|
||||
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)
|
||||
uuidd_SOURCES = \
|
||||
uuidd.c
|
||||
if USE_SOCKET_ACTIVATION
|
||||
uuidd_SOURCES += sd-daemon.c
|
||||
uuidd_LDADD += -lrt
|
||||
endif
|
||||
if WITH_SYSTEMD
|
||||
systemdsystemunit_DATA = \
|
||||
uuidd.service \
|
||||
uuidd.socket
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_DIST = uuidd.rc uuidd.service.in uuidd.socket
|
||||
CLEANFILES += uuidd.service
|
||||
|
||||
|
||||
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/strutils.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/match.c \
|
||||
$(top_srcdir)/lib/strutils.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 # BUILD_LIBBLKID
|
||||
|
||||
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/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/tt.c
|
||||
|
||||
if !HAVE_LANGINFO
|
||||
findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c
|
||||
endif
|
||||
endif # BUILD_LIBMOUNT
|
||||
|
||||
cal_SOURCES = \
|
||||
cal.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
if !HAVE_LANGINFO
|
||||
cal_SOURCES += $(top_srcdir)/lib/langinfo.c
|
||||
endif
|
||||
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 BUILD_KILL
|
||||
bin_PROGRAMS += kill
|
||||
kill_SOURCES = \
|
||||
kill.c \
|
||||
kill.h \
|
||||
procs.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
dist_man_MANS += kill.1
|
||||
endif
|
||||
|
||||
if BUILD_RENAME
|
||||
usrbin_exec_PROGRAMS += rename
|
||||
dist_man_MANS += rename.1
|
||||
endif
|
|
@ -0,0 +1,191 @@
|
|||
|
||||
usrbin_exec_PROGRAMS += cal
|
||||
dist_man_MANS += misc-utils/cal.1
|
||||
cal_SOURCES = \
|
||||
misc-utils/cal.c \
|
||||
lib/mbsalign.c \
|
||||
lib/strutils.c
|
||||
|
||||
if !HAVE_LANGINFO
|
||||
cal_SOURCES += lib/langinfo.c
|
||||
endif
|
||||
|
||||
cal_LDADD =
|
||||
|
||||
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 # !HAVE_NCURSES
|
||||
endif # !HAVE_TINFO
|
||||
|
||||
|
||||
usrbin_exec_PROGRAMS += logger
|
||||
dist_man_MANS += misc-utils/logger.1
|
||||
logger_SOURCES = misc-utils/logger.c lib/strutils.c
|
||||
|
||||
usrbin_exec_PROGRAMS += look
|
||||
dist_man_MANS += misc-utils/look.1
|
||||
look_SOURCES = misc-utils/look.c
|
||||
|
||||
usrbin_exec_PROGRAMS += mcookie
|
||||
dist_man_MANS += misc-utils/mcookie.1
|
||||
mcookie_SOURCES = misc-utils/mcookie.c lib/md5.c
|
||||
|
||||
usrbin_exec_PROGRAMS += namei
|
||||
dist_man_MANS += misc-utils/namei.1
|
||||
namei_SOURCES = misc-utils/namei.c lib/strutils.c
|
||||
|
||||
usrbin_exec_PROGRAMS += whereis
|
||||
dist_man_MANS += misc-utils/whereis.1
|
||||
whereis_SOURCES = misc-utils/whereis.c
|
||||
|
||||
|
||||
if BUILD_CHKDUPEXE
|
||||
dist_usrbin_exec_SCRIPTS += misc-utils/chkdupexe
|
||||
CLEANFILES += misc-utils/chkdupexe
|
||||
dist_man_MANS += misc-utils/chkdupexe.1
|
||||
endif
|
||||
|
||||
if BUILD_DDATE
|
||||
usrbin_exec_PROGRAMS += ddate
|
||||
dist_man_MANS += misc-utils/ddate.1
|
||||
ddate_SOURCES = misc-utils/ddate.c
|
||||
ruman1_DATA += man/ru/ddate.1
|
||||
EXTRA_DIST += $(ruman1_DATA)
|
||||
endif
|
||||
|
||||
if BUILD_LSLOCKS
|
||||
usrbin_exec_PROGRAMS += lslocks
|
||||
dist_man_MANS += misc-utils/lslocks.8
|
||||
lslocks_SOURCES = \
|
||||
misc-utils/lslocks.c \
|
||||
lib/at.c \
|
||||
lib/strutils.c \
|
||||
lib/tt.c \
|
||||
lib/mbsalign.c
|
||||
endif
|
||||
|
||||
if BUILD_LSBLK
|
||||
bin_PROGRAMS += lsblk
|
||||
dist_man_MANS += misc-utils/lsblk.8
|
||||
lsblk_SOURCES = \
|
||||
misc-utils/lsblk.c \
|
||||
lib/at.c \
|
||||
lib/canonicalize.c \
|
||||
lib/mbsalign.c \
|
||||
lib/mangle.c \
|
||||
lib/strutils.c \
|
||||
lib/sysfs.c \
|
||||
lib/tt.c
|
||||
lsblk_LDADD = libblkid.la libmount.la
|
||||
lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir)
|
||||
if HAVE_UDEV
|
||||
lsblk_LDADD += -ludev
|
||||
endif
|
||||
endif
|
||||
|
||||
if BUILD_LIBUUID
|
||||
usrbin_exec_PROGRAMS += uuidgen
|
||||
dist_man_MANS += misc-utils/uuidgen.1
|
||||
uuidgen_SOURCES = misc-utils/uuidgen.c
|
||||
uuidgen_LDADD = libuuid.la
|
||||
uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir)
|
||||
endif
|
||||
|
||||
if BUILD_UUIDD
|
||||
usrsbin_exec_PROGRAMS += uuidd
|
||||
dist_man_MANS += misc-utils/uuidd.8
|
||||
uuidd_LDADD = libuuid.la
|
||||
uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir)
|
||||
uuidd_SOURCES = misc-utils/uuidd.c
|
||||
if USE_SOCKET_ACTIVATION
|
||||
uuidd_SOURCES += misc-utils/sd-daemon.c
|
||||
uuidd_LDADD += -lrt
|
||||
endif
|
||||
if HAVE_SYSTEMD
|
||||
systemdsystemunit_DATA += \
|
||||
misc-utils/uuidd.service \
|
||||
misc-utils/uuidd.socket
|
||||
endif
|
||||
endif # BUILD_UUIDD
|
||||
|
||||
EXTRA_DIST += \
|
||||
misc-utils/uuidd.rc \
|
||||
misc-utils/uuidd.service.in \
|
||||
misc-utils/uuidd.socket
|
||||
CLEANFILES += misc-utils/uuidd.service
|
||||
|
||||
|
||||
if BUILD_LIBBLKID
|
||||
sbin_PROGRAMS += blkid
|
||||
dist_man_MANS += misc-utils/blkid.8
|
||||
blkid_SOURCES = \
|
||||
misc-utils/blkid.c \
|
||||
lib/ismounted.c \
|
||||
lib/strutils.c
|
||||
blkid_LDADD = libblkid.la
|
||||
blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
|
||||
sbin_PROGRAMS += findfs
|
||||
dist_man_MANS += misc-utils/findfs.8
|
||||
findfs_LDADD = libblkid.la
|
||||
findfs_SOURCES = misc-utils/findfs.c
|
||||
findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
|
||||
sbin_PROGRAMS += wipefs
|
||||
dist_man_MANS += misc-utils/wipefs.8
|
||||
wipefs_SOURCES = \
|
||||
misc-utils/wipefs.c \
|
||||
lib/match.c \
|
||||
lib/strutils.c
|
||||
wipefs_LDADD = 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 = libblkid.la
|
||||
blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
endif
|
||||
endif # BUILD_LIBBLKID
|
||||
|
||||
|
||||
if BUILD_LIBMOUNT
|
||||
bin_PROGRAMS += findmnt
|
||||
dist_man_MANS += misc-utils/findmnt.8
|
||||
findmnt_LDADD = libmount.la
|
||||
findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||
findmnt_SOURCES = \
|
||||
misc-utils/findmnt.c \
|
||||
lib/mbsalign.c \
|
||||
lib/strutils.c \
|
||||
lib/tt.c
|
||||
|
||||
if !HAVE_LANGINFO
|
||||
findmnt_SOURCES += lib/langinfo.c
|
||||
endif
|
||||
endif # BUILD_LIBMOUNT
|
||||
|
||||
|
||||
if BUILD_KILL
|
||||
bin_PROGRAMS += kill
|
||||
kill_SOURCES = \
|
||||
misc-utils/kill.c \
|
||||
misc-utils/kill.h \
|
||||
misc-utils/procs.c \
|
||||
lib/strutils.c
|
||||
dist_man_MANS += misc-utils/kill.1
|
||||
endif
|
||||
|
||||
if BUILD_RENAME
|
||||
usrbin_exec_PROGRAMS += rename
|
||||
dist_man_MANS += misc-utils/rename.1
|
||||
rename_SOURCES = misc-utils/rename.c
|
||||
endif
|
Loading…
Reference in New Issue