build-sys: enhance readability of the autotools files
Several horizontal lists are turned to vertical, and sorted to alphabetical order. Additionally spaces are converted to tabs where ever possible. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
parent
9fbc2dffb0
commit
f06b43285d
15
Makefile.am
15
Makefile.am
|
@ -17,20 +17,20 @@ endif
|
|||
MAN_DIRS = man/ru
|
||||
|
||||
SUBDIRS = \
|
||||
include \
|
||||
$(MAN_DIRS) \
|
||||
$(SHLIBS_DIRS) \
|
||||
disk-utils \
|
||||
fdisk \
|
||||
getopt \
|
||||
include \
|
||||
lib \
|
||||
$(SHLIBS_DIRS) \
|
||||
$(MAN_DIRS) \
|
||||
login-utils \
|
||||
misc-utils \
|
||||
po \
|
||||
sys-utils \
|
||||
term-utils \
|
||||
text-utils \
|
||||
tests
|
||||
tests \
|
||||
text-utils
|
||||
|
||||
|
||||
RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
|
||||
|
@ -62,10 +62,9 @@ ACLOCAL_AMFLAGS = -I m4
|
|||
EXTRA_DIST = \
|
||||
.version \
|
||||
autogen.sh \
|
||||
README.licensing \
|
||||
Documentation \
|
||||
po/update-potfiles \
|
||||
tools \
|
||||
Documentation
|
||||
README.licensing
|
||||
|
||||
# Arrange so that .tarball-version appears only in the distribution
|
||||
# tarball, and never in a checked-out repository.
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
|
||||
AM_CPPFLAGS = \
|
||||
-include $(top_builddir)/config.h \
|
||||
-I$(top_srcdir)/include \
|
||||
-DLOCALEDIR=\"$(localedir)\"
|
||||
AM_CFLAGS = -fsigned-char
|
||||
AM_LDFLAGS =
|
||||
|
|
132
configure.ac
132
configure.ac
|
@ -130,49 +130,49 @@ AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [
|
|||
#include <linux/compiler.h>
|
||||
#endif
|
||||
])
|
||||
AC_CHECK_HEADERS(
|
||||
[err.h \
|
||||
AC_CHECK_HEADERS([ \
|
||||
asm/io.h \
|
||||
err.h \
|
||||
errno.h \
|
||||
fcntl.h \
|
||||
getopt.h \
|
||||
inttypes.h \
|
||||
linux/cdrom.h \
|
||||
linux/falloc.h \
|
||||
linux/fd.h \
|
||||
linux/raw.h \
|
||||
linux/tiocl.h \
|
||||
linux/version.h \
|
||||
linux/falloc.h \
|
||||
linux/cdrom.h \
|
||||
fcntl.h \
|
||||
locale.h \
|
||||
stdint.h \
|
||||
inttypes.h \
|
||||
paths.h \
|
||||
pty.h \
|
||||
mntent.h \
|
||||
net/if.h \
|
||||
net/if_dl.h \
|
||||
netinet/in.h \
|
||||
paths.h \
|
||||
pty.h \
|
||||
security/pam_misc.h \
|
||||
stdint.h \
|
||||
stdlib.h \
|
||||
asm/io.h \
|
||||
sys/disk.h \
|
||||
sys/disklabel.h \
|
||||
sys/ioctl.h \
|
||||
sys/ioccom.h \
|
||||
sys/file.h \
|
||||
sys/io.h \
|
||||
sys/time.h \
|
||||
sys/ioccom.h \
|
||||
sys/ioctl.h \
|
||||
sys/mkdev.h \
|
||||
sys/prctl.h \
|
||||
sys/queue.h \
|
||||
sys/sockio.h \
|
||||
sys/resource.h \
|
||||
sys/socket.h \
|
||||
sys/syscall.h \
|
||||
sys/file.h \
|
||||
sys/ioctl.h \
|
||||
sys/sockio.h \
|
||||
sys/stat.h \
|
||||
sys/swap.h \
|
||||
sys/syscall.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
sys/un.h \
|
||||
sys/swap.h \
|
||||
sys/resource.h \
|
||||
security/pam_misc.h \
|
||||
linux/raw.h \
|
||||
unistd.h ])
|
||||
unistd.h \
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS([langinfo.h],
|
||||
[AM_CONDITIONAL([HAVE_LANGINFO], [true])],
|
||||
|
@ -244,42 +244,42 @@ AC_CHECK_DECL([lseek64],
|
|||
#define _LARGEFILE64_SOURCE
|
||||
#include <unistd.h>])
|
||||
|
||||
AC_CHECK_FUNCS(
|
||||
[\
|
||||
AC_CHECK_FUNCS([ \
|
||||
__secure_getenv \
|
||||
err \
|
||||
errx \
|
||||
futimens \
|
||||
fsync \
|
||||
futimens \
|
||||
getdomainname \
|
||||
usleep \
|
||||
nanosleep \
|
||||
personality \
|
||||
updwtmp \
|
||||
getdtablesize \
|
||||
getexecname \
|
||||
getmntinfo \
|
||||
getrlimit \
|
||||
inotify_init \
|
||||
jrand48 \
|
||||
lchown \
|
||||
llseek \
|
||||
lseek64 \
|
||||
nanosleep \
|
||||
personality \
|
||||
posix_fadvise \
|
||||
prctl \
|
||||
rpmatch \
|
||||
scandirat \
|
||||
strtoull \
|
||||
sysconf \
|
||||
getdtablesize \
|
||||
getexecname \
|
||||
getrlimit \
|
||||
sigqueue \
|
||||
srandom \
|
||||
setresgid \
|
||||
setresuid \
|
||||
sigqueue \
|
||||
srandom \
|
||||
strnchr \
|
||||
strndup \
|
||||
strnlen \
|
||||
strnchr \
|
||||
inotify_init \
|
||||
prctl \
|
||||
posix_fadvise \
|
||||
getmntinfo \
|
||||
__secure_getenv \
|
||||
strtoull \
|
||||
sysconf \
|
||||
updwtmp \
|
||||
usleep \
|
||||
warn \
|
||||
warnx \
|
||||
rpmatch])
|
||||
])
|
||||
AC_FUNC_FSEEKO
|
||||
|
||||
AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no])
|
||||
|
@ -1157,6 +1157,7 @@ LIBS=""
|
|||
AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
disk-utils/Makefile
|
||||
fdisk/Makefile
|
||||
fsck/Makefile
|
||||
|
@ -1164,40 +1165,39 @@ getopt/Makefile
|
|||
hwclock/Makefile
|
||||
include/Makefile
|
||||
lib/Makefile
|
||||
libblkid/Makefile
|
||||
libblkid/blkid.pc
|
||||
libblkid/docs/Makefile
|
||||
libblkid/docs/version.xml
|
||||
libblkid/samples/Makefile
|
||||
libblkid/src/Makefile
|
||||
libblkid/src/blkid.h
|
||||
libblkid/src/partitions/Makefile
|
||||
libblkid/src/superblocks/Makefile
|
||||
libblkid/src/topology/Makefile
|
||||
libmount/Makefile
|
||||
libmount/docs/Makefile
|
||||
libmount/docs/version.xml
|
||||
libmount/mount.pc
|
||||
libmount/src/Makefile
|
||||
libmount/src/libmount.h
|
||||
libuuid/Makefile
|
||||
libuuid/man/Makefile
|
||||
libuuid/src/Makefile
|
||||
libuuid/uuid.pc
|
||||
login-utils/Makefile
|
||||
Makefile
|
||||
man/ru/Makefile
|
||||
misc-utils/chkdupexe:misc-utils/chkdupexe.pl
|
||||
misc-utils/Makefile
|
||||
misc-utils/chkdupexe:misc-utils/chkdupexe.pl
|
||||
mount/Makefile
|
||||
partx/Makefile
|
||||
po/Makefile.in
|
||||
schedutils/Makefile
|
||||
libblkid/blkid.pc
|
||||
libblkid/Makefile
|
||||
libblkid/docs/Makefile
|
||||
libblkid/docs/version.xml
|
||||
libblkid/src/Makefile
|
||||
libblkid/src/blkid.h
|
||||
libblkid/src/superblocks/Makefile
|
||||
libblkid/src/topology/Makefile
|
||||
libblkid/src/partitions/Makefile
|
||||
libblkid/samples/Makefile
|
||||
libmount/mount.pc
|
||||
libmount/Makefile
|
||||
libmount/src/Makefile
|
||||
libmount/src/libmount.h
|
||||
libmount/docs/Makefile
|
||||
libmount/docs/version.xml
|
||||
libuuid/uuid.pc
|
||||
libuuid/Makefile
|
||||
libuuid/man/Makefile
|
||||
libuuid/src/Makefile
|
||||
sys-utils/Makefile
|
||||
term-utils/Makefile
|
||||
tests/Makefile
|
||||
tests/commands.sh
|
||||
tests/helpers/Makefile
|
||||
tests/Makefile
|
||||
text-utils/Makefile
|
||||
])
|
||||
|
||||
|
|
|
@ -10,21 +10,46 @@ uuid_cflags = -I$(ul_libuuid_srcdir)
|
|||
uuid_ldadd = $(ul_libuuid_la)
|
||||
endif
|
||||
|
||||
dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
|
||||
fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
|
||||
dist_man_MANS = \
|
||||
fsck.minix.8 \
|
||||
isosize.8 \
|
||||
mkfs.8 \
|
||||
mkfs.bfs.8 \
|
||||
mkfs.minix.8 \
|
||||
mkswap.8
|
||||
|
||||
sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
|
||||
sbin_PROGRAMS = \
|
||||
fsck.minix \
|
||||
mkfs \
|
||||
mkfs.bfs \
|
||||
mkfs.minix \
|
||||
mkswap
|
||||
|
||||
fsck_minix_SOURCES = fsck.minix.c minix_programs.h $(top_srcdir)/lib/ismounted.c
|
||||
mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h $(utils_common) \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) $(top_srcdir)/lib/strutils.c
|
||||
fsck_minix_SOURCES = \
|
||||
fsck.minix.c \
|
||||
minix_programs.h \
|
||||
$(top_srcdir)/lib/ismounted.c
|
||||
|
||||
mkfs_minix_SOURCES = \
|
||||
minix_programs.h \
|
||||
mkfs.minix.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(utils_common)
|
||||
|
||||
mkfs_bfs_SOURCES = \
|
||||
mkfs.bfs.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(utils_common)
|
||||
|
||||
swaplabel_SOURCES = swaplabel.c $(utils_common)
|
||||
swaplabel_LDADD = $(uuid_ldadd)
|
||||
swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
||||
|
||||
mkswap_SOURCES = mkswap.c $(utils_common) $(top_srcdir)/lib/wholedisk.c $(top_srcdir)/lib/strutils.c
|
||||
mkswap_SOURCES = \
|
||||
mkswap.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/wholedisk.c \
|
||||
$(utils_common)
|
||||
mkswap_LDADD = $(uuid_ldadd)
|
||||
mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
||||
|
||||
|
@ -60,10 +85,16 @@ dist_man_MANS += raw.8
|
|||
endif
|
||||
|
||||
if BUILD_CRAMFS
|
||||
cramfs_common = $(utils_common) cramfs.h cramfs_common.c
|
||||
cramfs_common = \
|
||||
$(utils_common) \
|
||||
cramfs.h \
|
||||
cramfs_common.c
|
||||
sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
|
||||
fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
|
||||
mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c \
|
||||
mkfs_cramfs_SOURCES = \
|
||||
mkfs.cramfs.c \
|
||||
$(cramfs_common) \
|
||||
$(top_srcdir)/lib/md5.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
fsck_cramfs_LDADD = -lz
|
||||
mkfs_cramfs_LDADD = -lz
|
||||
|
@ -72,4 +103,3 @@ endif
|
|||
if HAVE_SELINUX
|
||||
mkswap_LDADD += -lselinux
|
||||
endif
|
||||
|
||||
|
|
|
@ -2,9 +2,15 @@ include $(top_srcdir)/config/include-Makefile.am
|
|||
|
||||
EXTRA_DIST = partitiontype.c
|
||||
|
||||
fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
|
||||
$(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \
|
||||
$(top_srcdir)/lib/mbsalign.c $(top_srcdir)/lib/strutils.c
|
||||
fdisk_common = \
|
||||
common.h \
|
||||
gpt.c \
|
||||
gpt.h \
|
||||
i386_sys_types.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/wholedisk.c
|
||||
|
||||
if LINUX
|
||||
fdisk_common += $(top_srcdir)/lib/linux_version.c
|
||||
|
@ -14,10 +20,21 @@ if !ARCH_M68K
|
|||
|
||||
sbin_PROGRAMS = fdisk
|
||||
dist_man_MANS = fdisk.8
|
||||
fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \
|
||||
fdisksunlabel.c fdiskaixlabel.c fdiskmaclabel.c partname.c \
|
||||
fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h \
|
||||
fdiskbsdlabel.h fdiskmaclabel.h $(fdisk_common) \
|
||||
fdisk_SOURCES = \
|
||||
fdisk.c \
|
||||
fdisk.h \
|
||||
fdiskaixlabel.c \
|
||||
fdiskaixlabel.h \
|
||||
fdiskbsdlabel.c \
|
||||
fdiskbsdlabel.h \
|
||||
fdiskmaclabel.c \
|
||||
fdiskmaclabel.h \
|
||||
fdisksgilabel.c \
|
||||
fdisksgilabel.h \
|
||||
fdisksunlabel.c \
|
||||
fdisksunlabel.h \
|
||||
partname.c \
|
||||
$(fdisk_common) \
|
||||
$(top_srcdir)/lib/canonicalize.c
|
||||
|
||||
cflags_blkid = $(AM_CFLAGS)
|
||||
|
@ -43,7 +60,10 @@ if !ARCH_SPARC
|
|||
|
||||
sbin_PROGRAMS += sfdisk
|
||||
dist_man_MANS += sfdisk.8
|
||||
sfdisk_SOURCES = sfdisk.c partname.c $(fdisk_common) \
|
||||
sfdisk_SOURCES = \
|
||||
partname.c \
|
||||
sfdisk.c \
|
||||
$(fdisk_common) \
|
||||
$(top_srcdir)/lib/canonicalize.c
|
||||
|
||||
if HAVE_STATIC_SFDISK
|
||||
|
@ -70,4 +90,3 @@ endif
|
|||
|
||||
endif # !ARCH_SPARC
|
||||
endif # !ARCH_M68K
|
||||
|
||||
|
|
|
@ -4,7 +4,12 @@ dist_man_MANS = hwclock.8
|
|||
|
||||
sbin_PROGRAMS = hwclock
|
||||
|
||||
hwclock_SOURCES = hwclock.c cmos.c kd.c clock.h $(top_srcdir)/lib/strutils.c
|
||||
hwclock_SOURCES = \
|
||||
clock.h \
|
||||
cmos.c \
|
||||
hwclock.c \
|
||||
kd.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
hwclock_LDADD =
|
||||
|
||||
if LINUX
|
||||
|
|
|
@ -4,9 +4,9 @@ dist_noinst_HEADERS = \
|
|||
at.h \
|
||||
bitops.h \
|
||||
blkdev.h \
|
||||
c.h \
|
||||
canonicalize.h \
|
||||
carefulputc.h \
|
||||
c.h \
|
||||
cpuset.h \
|
||||
crc32.h \
|
||||
env.h \
|
||||
|
@ -28,6 +28,7 @@ dist_noinst_HEADERS = \
|
|||
path.h \
|
||||
pathnames.h \
|
||||
procutils.h \
|
||||
rpmatch.h \
|
||||
setproctitle.h \
|
||||
strutils.h \
|
||||
swapheader.h \
|
||||
|
@ -37,6 +38,5 @@ dist_noinst_HEADERS = \
|
|||
wholedisk.h \
|
||||
widechar.h \
|
||||
writeall.h \
|
||||
rpmatch.h \
|
||||
xgetpass.h \
|
||||
xalloc.h
|
||||
|
|
|
@ -2,9 +2,17 @@ include $(top_srcdir)/config/include-Makefile.am
|
|||
|
||||
AM_CPPFLAGS += -DTEST_PROGRAM
|
||||
|
||||
noinst_PROGRAMS = test_blkdev test_ismounted test_wholedisk test_mangle \
|
||||
test_tt test_canonicalize test_strutils test_procutils \
|
||||
test_at
|
||||
noinst_PROGRAMS = \
|
||||
test_at \
|
||||
test_blkdev \
|
||||
test_canonicalize \
|
||||
test_ismounted \
|
||||
test_mangle \
|
||||
test_procutils \
|
||||
test_strutils \
|
||||
test_tt \
|
||||
test_wholedisk
|
||||
|
||||
if LINUX
|
||||
if HAVE_CPU_SET_T
|
||||
noinst_PROGRAMS += test_cpuset
|
||||
|
@ -28,10 +36,11 @@ test_cpuset_SOURCES = cpuset.c
|
|||
test_sysfs_SOURCES = sysfs.c at.c
|
||||
test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
|
||||
|
||||
test_loopdev_SOURCES = loopdev.c \
|
||||
test_loopdev_SOURCES = \
|
||||
loopdev.c \
|
||||
$(test_sysfs_SOURCES) \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/canonicalize.c
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/linux_version.c
|
||||
|
||||
test_loopdev_CFLAGS = -DTEST_PROGRAM_LOOPDEV
|
||||
endif
|
||||
|
@ -44,4 +53,3 @@ test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE
|
|||
if LINUX
|
||||
test_blkdev_SOURCES += linux_version.c
|
||||
endif
|
||||
|
||||
|
|
|
@ -13,4 +13,3 @@ pkgconfig_DATA = blkid.pc
|
|||
dist_man_MANS = libblkid.3
|
||||
|
||||
EXTRA_DIST = blkid.pc.in libblkid.3
|
||||
|
||||
|
|
|
@ -3,5 +3,8 @@ include $(top_srcdir)/config/include-Makefile.am
|
|||
AM_CPPFLAGS += -I$(ul_libblkid_incdir)
|
||||
AM_LDFLAGS += $(ul_libblkid_la)
|
||||
|
||||
noinst_PROGRAMS = topology partitions mkfs superblocks
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
mkfs \
|
||||
partitions \
|
||||
superblocks \
|
||||
topology
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
SUBDIRS = superblocks topology partitions .
|
||||
SUBDIRS = \
|
||||
partitions \
|
||||
superblocks \
|
||||
topology \
|
||||
.
|
||||
|
||||
common_ldadd =
|
||||
common_cflags =
|
||||
|
@ -10,43 +14,73 @@ common_ldadd += $(ul_libuuid_la)
|
|||
common_cflags += -I$(ul_libuuid_srcdir)
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) $(common_cflags)
|
||||
AM_CPPFLAGS += \
|
||||
-I$(ul_libblkid_incdir) \
|
||||
-I$(ul_libblkid_srcdir) \
|
||||
$(common_cflags)
|
||||
|
||||
# includes
|
||||
blkidincdir = $(includedir)/blkid
|
||||
nodist_blkidinc_HEADERS = blkid.h
|
||||
|
||||
usrlib_exec_LTLIBRARIES = libblkid.la
|
||||
libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \
|
||||
probe.c read.c resolve.c save.c tag.c version.c verify.c \
|
||||
encode.c blkidP.h superblocks/superblocks.h \
|
||||
config.c evaluate.c \
|
||||
libblkid_la_SOURCES = \
|
||||
blkidP.h \
|
||||
cache.c \
|
||||
config.c \
|
||||
dev.c \
|
||||
devname.c \
|
||||
devno.c \
|
||||
encode.c \
|
||||
evaluate.c \
|
||||
getsize.c \
|
||||
llseek.c \
|
||||
probe.c \
|
||||
read.c \
|
||||
resolve.c \
|
||||
save.c \
|
||||
superblocks/superblocks.h \
|
||||
tag.c \
|
||||
verify.c \
|
||||
version.c \
|
||||
$(blkidinc_HEADERS) \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/md5.c \
|
||||
$(top_srcdir)/lib/crc32.c \
|
||||
$(top_srcdir)/include/list.h \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/crc32.c \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/md5.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/sysfs.c
|
||||
|
||||
nodist_libblkid_la_SOURCES = blkid.h
|
||||
|
||||
libblkid_la_LIBADD = superblocks/libblkid_superblocks.la \
|
||||
topology/libblkid_topology.la \
|
||||
libblkid_la_LIBADD = \
|
||||
partitions/libblkid_partitions.la \
|
||||
superblocks/libblkid_superblocks.la \
|
||||
topology/libblkid_topology.la \
|
||||
$(common_ldadd)
|
||||
|
||||
libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym blkid.h.in
|
||||
|
||||
libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
|
||||
libblkid_la_LDFLAGS = \
|
||||
-Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
|
||||
-version-info $(LIBBLKID_VERSION_INFO)
|
||||
|
||||
tests = test_cache test_config test_dev test_devname test_devno \
|
||||
test_read test_resolve test_save test_tag test_verify test_evaluate
|
||||
tests = \
|
||||
test_cache \
|
||||
test_config \
|
||||
test_dev \
|
||||
test_devname \
|
||||
test_devno \
|
||||
test_evaluate
|
||||
test_read \
|
||||
test_resolve \
|
||||
test_save \
|
||||
test_tag \
|
||||
test_verify
|
||||
|
||||
EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
|
||||
CLEANFILES = $(tests)
|
||||
|
|
|
@ -4,19 +4,20 @@ AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
|
|||
libblkid_partitions_la_LIBADD =
|
||||
|
||||
noinst_LTLIBRARIES = libblkid_partitions.la
|
||||
libblkid_partitions_la_SOURCES = partitions.c \
|
||||
partitions.h \
|
||||
blkid_parttypes.h \
|
||||
libblkid_partitions_la_SOURCES = \
|
||||
aix.c \
|
||||
aix.h \
|
||||
blkid_parttypes.h \
|
||||
bsd.c \
|
||||
unixware.c \
|
||||
solaris_x86.c \
|
||||
sun.c \
|
||||
sgi.c \
|
||||
mac.c \
|
||||
dos.c \
|
||||
dos.h \
|
||||
gpt.c \
|
||||
mac.c \
|
||||
minix.c \
|
||||
partitions.c \
|
||||
partitions.h \
|
||||
sgi.c \
|
||||
solaris_x86.c \
|
||||
sun.c \
|
||||
ultrix.c \
|
||||
gpt.c
|
||||
unixware.c
|
||||
|
|
|
@ -4,49 +4,49 @@ AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
|
|||
|
||||
noinst_LTLIBRARIES = libblkid_superblocks.la
|
||||
libblkid_superblocks_la_SOURCES = \
|
||||
superblocks.h \
|
||||
superblocks.c \
|
||||
cramfs.c \
|
||||
swap.c \
|
||||
adaptec_raid.c \
|
||||
ddf_raid.c \
|
||||
isw_raid.c \
|
||||
jmicron_raid.c \
|
||||
lsi_raid.c \
|
||||
nvidia_raid.c \
|
||||
promise_raid.c \
|
||||
silicon_raid.c \
|
||||
via_raid.c \
|
||||
linux_raid.c \
|
||||
jfs.c \
|
||||
xfs.c \
|
||||
ext.c \
|
||||
gfs.c \
|
||||
ocfs.c \
|
||||
reiserfs.c \
|
||||
romfs.c \
|
||||
ntfs.c \
|
||||
hfs.c \
|
||||
iso9660.c \
|
||||
udf.c \
|
||||
vfat.c \
|
||||
luks.c \
|
||||
highpoint_raid.c \
|
||||
vxfs.c \
|
||||
minix.c \
|
||||
ufs.c \
|
||||
hpfs.c \
|
||||
squashfs.c \
|
||||
netware.c \
|
||||
sysv.c \
|
||||
btrfs.c \
|
||||
lvm.c \
|
||||
zfs.c \
|
||||
ubifs.c \
|
||||
befs.c \
|
||||
bfs.c \
|
||||
btrfs.c \
|
||||
cramfs.c \
|
||||
ddf_raid.c \
|
||||
drbd.c \
|
||||
drbdproxy_datalog.c \
|
||||
vmfs.c \
|
||||
befs.c \
|
||||
exfat.c \
|
||||
ext.c \
|
||||
gfs.c \
|
||||
hfs.c \
|
||||
highpoint_raid.c \
|
||||
hpfs.c \
|
||||
iso9660.c \
|
||||
isw_raid.c \
|
||||
jfs.c \
|
||||
jmicron_raid.c \
|
||||
linux_raid.c \
|
||||
lsi_raid.c \
|
||||
luks.c \
|
||||
lvm.c \
|
||||
minix.c \
|
||||
netware.c \
|
||||
nilfs.c \
|
||||
exfat.c
|
||||
ntfs.c \
|
||||
nvidia_raid.c \
|
||||
ocfs.c \
|
||||
promise_raid.c \
|
||||
reiserfs.c \
|
||||
romfs.c \
|
||||
silicon_raid.c \
|
||||
squashfs.c \
|
||||
superblocks.c \
|
||||
superblocks.h \
|
||||
swap.c \
|
||||
sysv.c \
|
||||
ubifs.c \
|
||||
udf.c \
|
||||
ufs.c \
|
||||
vfat.c \
|
||||
via_raid.c \
|
||||
vmfs.c \
|
||||
vxfs.c \
|
||||
xfs.c \
|
||||
zfs.c
|
||||
|
|
|
@ -4,14 +4,16 @@ AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
|
|||
libblkid_topology_la_LIBADD =
|
||||
|
||||
noinst_LTLIBRARIES = libblkid_topology.la
|
||||
libblkid_topology_la_SOURCES = topology.c \
|
||||
libblkid_topology_la_SOURCES = \
|
||||
topology.c \
|
||||
topology.h
|
||||
|
||||
if LINUX
|
||||
libblkid_topology_la_SOURCES += sysfs.c \
|
||||
libblkid_topology_la_SOURCES += \
|
||||
dm.c \
|
||||
lvm.c \
|
||||
evms.c \
|
||||
ioctl.c \
|
||||
lvm.c \
|
||||
md.c \
|
||||
evms.c
|
||||
sysfs.c
|
||||
endif
|
||||
|
|
|
@ -1,38 +1,58 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
AM_CPPFLAGS += -I$(ul_libmount_incdir) \
|
||||
-I$(ul_libmount_srcdir) \
|
||||
-I$(ul_libblkid_incdir)
|
||||
AM_CPPFLAGS += \
|
||||
-I$(ul_libblkid_incdir) \
|
||||
-I$(ul_libmount_incdir) \
|
||||
-I$(ul_libmount_srcdir)
|
||||
|
||||
# includes
|
||||
mountincdir = $(includedir)/libmount
|
||||
nodist_mountinc_HEADERS = libmount.h
|
||||
|
||||
usrlib_exec_LTLIBRARIES = libmount.la
|
||||
libmount_la_SOURCES = mountP.h version.c utils.c test.c init.c cache.c \
|
||||
optstr.c optmap.c iter.c lock.c \
|
||||
fs.c tab.c tab_parse.c tab_update.c tab_diff.c \
|
||||
context.c context_mount.c context_umount.c \
|
||||
libmount_la_SOURCES = \
|
||||
cache.c \
|
||||
context.c \
|
||||
context_loopdev.c \
|
||||
context_mount.c \
|
||||
context_umount.c \
|
||||
fs.c \
|
||||
init.c \
|
||||
iter.c \
|
||||
lock.c \
|
||||
mountP.h \
|
||||
optmap.c \
|
||||
optstr.c \
|
||||
tab.c \
|
||||
tab_diff.c \
|
||||
tab_parse.c \
|
||||
tab_update.c \
|
||||
test.c \
|
||||
utils.c \
|
||||
version.c \
|
||||
$(mountinc_HEADERS) \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/match.c \
|
||||
$(top_srcdir)/include/list.h \
|
||||
$(top_srcdir)/lib/mangle.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/linux_version.c
|
||||
$(top_srcdir)/lib/mangle.c \
|
||||
$(top_srcdir)/lib/match.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/sysfs.c
|
||||
|
||||
nodist_libmount_la_SOURCES = mountP.h
|
||||
|
||||
libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS)
|
||||
|
||||
libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) libmount.sym libmount.h.in
|
||||
libmount_la_DEPENDENCIES = \
|
||||
$(libmount_la_LIBADD) \
|
||||
libmount.sym \
|
||||
libmount.h.in
|
||||
|
||||
libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \
|
||||
libmount_la_LDFLAGS = \
|
||||
-Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \
|
||||
-version-info $(LIBMOUNT_VERSION_INFO)
|
||||
|
||||
TESTS_LIBS = -luuid
|
||||
|
@ -60,13 +80,19 @@ uninstall-hook:
|
|||
rm -f $(DESTDIR)$(libdir)/libmount.so*
|
||||
|
||||
|
||||
tests = test_version test_cache test_optstr test_lock \
|
||||
test_tab test_utils test_tab_update test_context \
|
||||
test_tab_diff
|
||||
tests = \
|
||||
test_cache \
|
||||
test_context \
|
||||
test_lock \
|
||||
test_optstr \
|
||||
test_tab \
|
||||
test_tab_diff \
|
||||
test_tab_update \
|
||||
test_utils \
|
||||
test_version
|
||||
|
||||
tests: all $(tests)
|
||||
test_%: %.c
|
||||
$(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libmount.a \
|
||||
$(ul_libblkid_builddir)/.libs/libblkid.a -o $@ \
|
||||
$(TESTS_LIBS)
|
||||
|
||||
|
|
|
@ -7,4 +7,3 @@ pkgconfigdir = $(usrlib_execdir)/pkgconfig
|
|||
pkgconfig_DATA = uuid.pc
|
||||
|
||||
EXTRA_DIST = uuid.pc.in
|
||||
|
||||
|
|
|
@ -1,9 +1,20 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
dist_man_MANS = uuid.3 uuid_clear.3 uuid_compare.3 uuid_copy.3 uuid_generate.3 \
|
||||
uuid_is_null.3 uuid_parse.3 uuid_time.3 uuid_unparse.3
|
||||
dist_man_MANS = \
|
||||
uuid.3 \
|
||||
uuid_clear.3 \
|
||||
uuid_compare.3 \
|
||||
uuid_copy.3 \
|
||||
uuid_generate.3 \
|
||||
uuid_is_null.3 \
|
||||
uuid_parse.3 \
|
||||
uuid_time.3 \
|
||||
uuid_unparse.3
|
||||
|
||||
UUID_GENERATE_LINKS = uuid_generate_random.3 uuid_generate_time.3 uuid_generate_time_safe.3
|
||||
UUID_GENERATE_LINKS = \
|
||||
uuid_generate_random.3 \
|
||||
uuid_generate_time.3 \
|
||||
uuid_generate_time_safe.3
|
||||
|
||||
man_MANS = $(UUID_GENERATE_LINKS)
|
||||
CLEANFILES = $(man_MANS)
|
||||
|
|
|
@ -10,9 +10,22 @@ uuidincdir = $(includedir)/uuid
|
|||
uuidinc_HEADERS = uuid.h
|
||||
|
||||
usrlib_exec_LTLIBRARIES = libuuid.la
|
||||
libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
|
||||
isnull.c pack.c parse.c unpack.c unparse.c uuidd.h \
|
||||
uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
|
||||
|
||||
libuuid_la_SOURCES = \
|
||||
clear.c \
|
||||
compare.c \
|
||||
copy.c \
|
||||
gen_uuid.c \
|
||||
isnull.c \
|
||||
pack.c \
|
||||
parse.c \
|
||||
unpack.c \
|
||||
unparse.c \
|
||||
uuidd.h \
|
||||
uuidd.h \
|
||||
uuidP.h \
|
||||
uuid_time.c \
|
||||
$(uuidinc_HEADERS)
|
||||
|
||||
libuuid_la_DEPENDENCIES = uuid.sym
|
||||
|
||||
|
@ -37,4 +50,3 @@ install-exec-hook:
|
|||
|
||||
uninstall-hook:
|
||||
rm -f $(DESTDIR)$(libdir)/libuuid.so*
|
||||
|
||||
|
|
|
@ -14,20 +14,43 @@ endif
|
|||
if BUILD_LOGIN_UTILS
|
||||
|
||||
bin_PROGRAMS += login
|
||||
usrbin_exec_PROGRAMS += chfn chsh newgrp
|
||||
usrsbin_exec_PROGRAMS += vipw
|
||||
dist_man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
|
||||
usrbin_exec_PROGRAMS += \
|
||||
chfn \
|
||||
chsh \
|
||||
newgrp
|
||||
usrsbin_exec_PROGRAMS += \
|
||||
vipw
|
||||
dist_man_MANS += \
|
||||
chfn.1 \
|
||||
chsh.1 \
|
||||
login.1 \
|
||||
newgrp.1 \
|
||||
vigr.8 \
|
||||
vipw.8
|
||||
|
||||
# login, chfn and chsh libs
|
||||
login_ldadd_common =
|
||||
|
||||
chfn_SOURCES = chfn.c $(chfn_chsh_common)
|
||||
chsh_SOURCES = chsh.c $(chfn_chsh_common)
|
||||
chfn_chsh_common = islocal.c setpwnam.c islocal.h setpwnam.h \
|
||||
chfn_SOURCES = \
|
||||
chfn.c \
|
||||
$(chfn_chsh_common)
|
||||
chsh_SOURCES = \
|
||||
chsh.c \
|
||||
$(chfn_chsh_common)
|
||||
chfn_chsh_common = \
|
||||
islocal.c \
|
||||
islocal.h \
|
||||
setpwnam.c \
|
||||
setpwnam.h \
|
||||
$(top_srcdir)/lib/env.c
|
||||
login_SOURCES = login.c logindefs.c logindefs.h \
|
||||
login_SOURCES = \
|
||||
login.c \
|
||||
logindefs.c \
|
||||
logindefs.h \
|
||||
$(top_srcdir)/lib/setproctitle.c
|
||||
vipw_SOURCES = vipw.c setpwnam.h
|
||||
vipw_SOURCES = \
|
||||
vipw.c \
|
||||
setpwnam.h
|
||||
|
||||
chfn_LDADD = $(login_ldadd_common)
|
||||
chsh_LDADD = $(login_ldadd_common)
|
||||
|
|
|
@ -6,7 +6,13 @@ bin_PROGRAMS =
|
|||
sbin_PROGRAMS =
|
||||
usrsbin_exec_PROGRAMS =
|
||||
|
||||
usrbin_exec_PROGRAMS = cal logger look mcookie namei whereis
|
||||
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
|
||||
|
@ -15,8 +21,14 @@ usrbin_exec_SCRIPTS = chkdupexe
|
|||
|
||||
CLEANFILES = chkdupexe
|
||||
|
||||
dist_man_MANS = cal.1 chkdupexe.1 logger.1 look.1 mcookie.1 \
|
||||
namei.1 whereis.1
|
||||
dist_man_MANS = \
|
||||
cal.1 \
|
||||
chkdupexe.1 \
|
||||
logger.1 \
|
||||
look.1 \
|
||||
mcookie.1 \
|
||||
namei.1 \
|
||||
whereis.1
|
||||
|
||||
namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
|
||||
|
||||
|
@ -28,14 +40,15 @@ endif
|
|||
if BUILD_LSBLK
|
||||
bin_PROGRAMS += lsblk
|
||||
dist_man_MANS += lsblk.8
|
||||
lsblk_SOURCES = lsblk.c \
|
||||
lsblk_SOURCES = \
|
||||
lsblk.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/ismounted.c \
|
||||
$(top_srcdir)/lib/tt.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/at.c
|
||||
$(top_srcdir)/lib/tt.c
|
||||
lsblk_LDADD = $(ul_libblkid_la)
|
||||
lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
if HAVE_UDEV
|
||||
|
@ -60,7 +73,9 @@ 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 \
|
||||
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)
|
||||
|
@ -68,9 +83,10 @@ 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/strutils.c \
|
||||
$(top_srcdir)/lib/match.c
|
||||
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)
|
||||
|
||||
|
@ -88,17 +104,21 @@ 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 \
|
||||
findmnt_SOURCES = \
|
||||
findmnt.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.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
|
||||
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
|
||||
|
@ -116,7 +136,11 @@ endif
|
|||
|
||||
if BUILD_KILL
|
||||
bin_PROGRAMS += kill
|
||||
kill_SOURCES = kill.c procs.c kill.h $(top_srcdir)/lib/strutils.c
|
||||
kill_SOURCES = \
|
||||
kill.c \
|
||||
kill.h \
|
||||
procs.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
dist_man_MANS += kill.1
|
||||
endif
|
||||
|
||||
|
|
|
@ -4,26 +4,32 @@ bin_PROGRAMS = mount umount
|
|||
dist_man_MANS = fstab.5 mount.8 umount.8
|
||||
|
||||
# generic sources for all programs (mount, umount)
|
||||
srcs_common = sundries.c $(top_srcdir)/lib/canonicalize.c sundries.h
|
||||
srcs_common = \
|
||||
sundries.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
sundries.h
|
||||
|
||||
# generic header for mount and umount
|
||||
hdrs_mount = fstab.h mount_mntent.h mount_constants.h getusername.h
|
||||
|
||||
# generic sources for mount and umount
|
||||
srcs_mount = $(srcs_common) $(hdrs_mount) \
|
||||
srcs_mount = \
|
||||
$(srcs_common) \
|
||||
$(hdrs_mount) \
|
||||
devname.c \
|
||||
devname.h \
|
||||
fstab.c \
|
||||
mount_mntent.c \
|
||||
getusername.c \
|
||||
devname.c devname.h \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/fsprobe.c \
|
||||
$(top_srcdir)/lib/mangle.c \
|
||||
mount_mntent.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/fsprobe.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
$(top_srcdir)/lib/mangle.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/sysfs.c
|
||||
|
||||
# generic flags for all programs
|
||||
# -- note that pkg-config autoconf macros (pkg.m4) does not differentiate
|
||||
|
@ -33,7 +39,10 @@ ldadd_static = $(ul_libblkid_la)
|
|||
cflags_common = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
ldflags_static = -all-static
|
||||
|
||||
mount_SOURCES = mount.c $(srcs_mount) $(top_srcdir)/lib/setproctitle.c
|
||||
mount_SOURCES = \
|
||||
mount.c \
|
||||
$(srcs_mount) \
|
||||
$(top_srcdir)/lib/setproctitle.c
|
||||
mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
|
||||
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||
mount_LDADD = $(ldadd_common)
|
||||
|
@ -83,7 +92,11 @@ endif
|
|||
|
||||
if !BUILD_LIBMOUNT_MOUNT
|
||||
noinst_PROGRAMS = mtab_lock_test
|
||||
mtab_lock_test_SOURCES = fstab.c $(srcs_common) $(top_srcdir)/lib/strutils.c $(hdrs_mount)
|
||||
mtab_lock_test_SOURCES = \
|
||||
fstab.c \
|
||||
$(hdrs_mount) \
|
||||
$(srcs_common) \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
mtab_lock_test_CPPFLAGS = -DMAIN_TEST_MTABLOCK $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
|
@ -92,4 +105,3 @@ if MAKEINSTALL_DO_SETUID
|
|||
chmod 4755 $(DESTDIR)$(bindir)/mount
|
||||
chmod 4755 $(DESTDIR)$(bindir)/umount
|
||||
endif
|
||||
|
||||
|
|
|
@ -4,18 +4,19 @@ usrsbin_exec_PROGRAMS = addpart delpart
|
|||
dist_man_MANS = addpart.8 delpart.8
|
||||
|
||||
usrsbin_exec_PROGRAMS += partx
|
||||
partx_SOURCES = partx.c partx.h \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/tt.c \
|
||||
partx_SOURCES = \
|
||||
partx.c \
|
||||
partx.h \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/linux_version.c
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/tt.c
|
||||
|
||||
partx_CFLAGS = -I$(ul_libblkid_incdir)
|
||||
partx_LDADD = $(ul_libblkid_la)
|
||||
dist_man_MANS += partx.8
|
||||
|
||||
|
|
|
@ -15,6 +15,9 @@ endif
|
|||
|
||||
if BUILD_TASKSET
|
||||
usrbin_exec_PROGRAMS += taskset
|
||||
taskset_SOURCES = taskset.c $(top_srcdir)/lib/cpuset.c $(srcs_common)
|
||||
taskset_SOURCES = \
|
||||
taskset.c \
|
||||
$(top_srcdir)/lib/cpuset.c \
|
||||
$(srcs_common)
|
||||
dist_man_MANS += taskset.1
|
||||
endif
|
||||
|
|
|
@ -2,11 +2,23 @@ include $(top_srcdir)/config/include-Makefile.am
|
|||
|
||||
bin_PROGRAMS =
|
||||
sbin_PROGRAMS =
|
||||
usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid
|
||||
usrbin_exec_PROGRAMS = \
|
||||
flock \
|
||||
ipcmk \
|
||||
ipcrm \
|
||||
ipcs \
|
||||
renice \
|
||||
setsid
|
||||
usrsbin_exec_PROGRAMS = readprofile
|
||||
|
||||
dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
|
||||
readprofile.8
|
||||
dist_man_MANS = \
|
||||
flock.1 \
|
||||
ipcmk.1 \
|
||||
ipcrm.1 \
|
||||
ipcs.1 \
|
||||
readprofile.8 \
|
||||
renice.1 \
|
||||
setsid.1
|
||||
|
||||
if LINUX
|
||||
#
|
||||
|
@ -18,8 +30,16 @@ sbin_PROGRAMS += ctrlaltdel fsfreeze fstrim
|
|||
usrbin_exec_PROGRAMS += cytune setarch
|
||||
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
|
||||
dist_man_MANS += \
|
||||
ctrlaltdel.8 \
|
||||
cytune.8 \
|
||||
dmesg.1 \
|
||||
fsfreeze.8 \
|
||||
fstrim.8 \
|
||||
ldattach.8 \
|
||||
rtcwake.8 \
|
||||
setarch.8 \
|
||||
tunelp.8
|
||||
endif # LINUX
|
||||
|
||||
|
||||
|
@ -27,14 +47,15 @@ if BUILD_LOSETUP
|
|||
sbin_PROGRAMS += losetup
|
||||
dist_man_MANS += losetup.8
|
||||
|
||||
losetup_SOURCES = losetup.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
losetup_SOURCES = \
|
||||
losetup.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/xgetpass.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/sysfs.c \
|
||||
$(top_srcdir)/lib/xgetpass.c
|
||||
|
||||
if HAVE_STATIC_LOSETUP
|
||||
bin_PROGRAMS += losetup.static
|
||||
|
@ -47,8 +68,10 @@ endif # BUILD_LOSETUP
|
|||
if BUILD_PRLIMIT
|
||||
usrbin_exec_PROGRAMS += prlimit
|
||||
dist_man_MANS += prlimit.1
|
||||
prlimit_SOURCES = prlimit.c $(top_srcdir)/lib/strutils.c \
|
||||
prlimit_SOURCES = \
|
||||
prlimit.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/tt.c
|
||||
endif
|
||||
|
||||
|
@ -61,10 +84,11 @@ if BUILD_NEW_MOUNT
|
|||
bin_PROGRAMS += mount umount
|
||||
dist_man_MANS += mount.8 ../mount/fstab.5 ../mount/umount.8
|
||||
|
||||
mount_SOURCES = mount.c \
|
||||
mount_SOURCES = \
|
||||
mount.c \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/xgetpass.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/xgetpass.c
|
||||
|
||||
mount_LDADD = $(ul_libmount_la) $(SELINUX_LIBS)
|
||||
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||
|
@ -97,11 +121,12 @@ if BUILD_SWAPON
|
|||
sbin_PROGRAMS += swapon
|
||||
dist_man_MANS += swapoff.8 swapon.8
|
||||
|
||||
swapon_SOURCES = swapon.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
swapon_SOURCES = \
|
||||
swapon.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/fsprobe.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
$(top_srcdir)/lib/fsprobe.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/mangle.c
|
||||
|
||||
swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
|
@ -110,22 +135,30 @@ endif
|
|||
|
||||
if BUILD_LSCPU
|
||||
usrbin_exec_PROGRAMS += lscpu
|
||||
lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
lscpu_SOURCES = \
|
||||
lscpu.c \
|
||||
$(top_srcdir)/lib/cpuset.c \
|
||||
$(top_srcdir)/lib/mbsalign.c \
|
||||
$(top_srcdir)/lib/tt.c \
|
||||
$(top_srcdir)/lib/path.c
|
||||
$(top_srcdir)/lib/path.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/tt.c
|
||||
dist_man_MANS += lscpu.1
|
||||
endif
|
||||
|
||||
if BUILD_CHCPU
|
||||
sbin_PROGRAMS += chcpu
|
||||
chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \
|
||||
chcpu_SOURCES = \
|
||||
chcpu.c \
|
||||
$(top_srcdir)/lib/cpuset.c \
|
||||
$(top_srcdir)/lib/path.c
|
||||
dist_man_MANS += chcpu.8
|
||||
endif
|
||||
|
||||
cytune_SOURCES = cytune.c cyclades.h $(top_srcdir)/lib/strutils.c
|
||||
cytune_SOURCES = \
|
||||
cytune.c \
|
||||
cyclades.h \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
|
||||
tunelp_SOURCES = tunelp.c lp.h
|
||||
fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
|
||||
rtcwake_SOURCES = rtcwake.c $(top_srcdir)/lib/strutils.c
|
||||
|
@ -223,4 +256,3 @@ uninstall-hook:
|
|||
for I in $(SETARCH_LINKS); do \
|
||||
rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
|
||||
done
|
||||
|
||||
|
|
|
@ -2,10 +2,11 @@ include $(top_srcdir)/config/include-Makefile.am
|
|||
|
||||
SUBDIRS = helpers
|
||||
|
||||
EXTRA_DIST = expected \
|
||||
ts \
|
||||
EXTRA_DIST = \
|
||||
expected \
|
||||
functions.sh \
|
||||
run.sh
|
||||
run.sh \
|
||||
ts
|
||||
|
||||
distclean-local:
|
||||
rm -rf output diff
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
noinst_PROGRAMS = test_sysinfo test_pathnames test_byteswap \
|
||||
test_md5
|
||||
noinst_PROGRAMS = \
|
||||
test_byteswap \
|
||||
test_md5 \
|
||||
test_pathnames \
|
||||
test_sysinfo
|
||||
|
||||
test_md5_SOURCES = test_md5.c $(top_srcdir)/lib/md5.c
|
||||
|
||||
|
|
|
@ -1,6 +1,13 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev tailf
|
||||
usrbin_exec_PROGRAMS = \
|
||||
col \
|
||||
colcrt \
|
||||
colrm \
|
||||
column \
|
||||
hexdump \
|
||||
rev \
|
||||
tailf
|
||||
|
||||
column_SOURCES = column.c $(top_srcdir)/lib/strutils.c
|
||||
|
||||
|
@ -8,12 +15,25 @@ col_SOURCES = col.c $(top_srcdir)/lib/strutils.c
|
|||
|
||||
colrm_SOURCES = colrm.c $(top_srcdir)/lib/strutils.c
|
||||
|
||||
hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c parse.c \
|
||||
hexdump.h $(top_srcdir)/lib/strutils.c
|
||||
hexdump_SOURCES = \
|
||||
conv.c \
|
||||
display.c \
|
||||
hexdump.c \
|
||||
hexdump.h \
|
||||
hexsyntax.c \
|
||||
parse.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
|
||||
tailf_SOURCES = tailf.c $(top_srcdir)/lib/strutils.c
|
||||
|
||||
dist_man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 tailf.1
|
||||
dist_man_MANS = \
|
||||
col.1 \
|
||||
colcrt.1 \
|
||||
colrm.1 \
|
||||
column.1 \
|
||||
hexdump.1 \
|
||||
rev.1 \
|
||||
tailf.1
|
||||
|
||||
if BUILD_LINE
|
||||
usrbin_exec_PROGRAMS += line
|
||||
|
|
Loading…
Reference in New Issue