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
21
Makefile.am
21
Makefile.am
|
@ -17,20 +17,20 @@ endif
|
||||||
MAN_DIRS = man/ru
|
MAN_DIRS = man/ru
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
include \
|
$(MAN_DIRS) \
|
||||||
|
$(SHLIBS_DIRS) \
|
||||||
disk-utils \
|
disk-utils \
|
||||||
fdisk \
|
fdisk \
|
||||||
getopt \
|
getopt \
|
||||||
|
include \
|
||||||
lib \
|
lib \
|
||||||
$(SHLIBS_DIRS) \
|
|
||||||
$(MAN_DIRS) \
|
|
||||||
login-utils \
|
login-utils \
|
||||||
misc-utils \
|
misc-utils \
|
||||||
po \
|
po \
|
||||||
sys-utils \
|
sys-utils \
|
||||||
term-utils \
|
term-utils \
|
||||||
text-utils \
|
tests \
|
||||||
tests
|
text-utils
|
||||||
|
|
||||||
|
|
||||||
RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
|
RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
|
||||||
|
@ -60,12 +60,11 @@ AUTOMAKE_OPTIONS = gnu
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
.version \
|
.version \
|
||||||
autogen.sh \
|
autogen.sh \
|
||||||
README.licensing \
|
Documentation \
|
||||||
po/update-potfiles \
|
po/update-potfiles \
|
||||||
tools \
|
README.licensing
|
||||||
Documentation
|
|
||||||
|
|
||||||
# Arrange so that .tarball-version appears only in the distribution
|
# Arrange so that .tarball-version appears only in the distribution
|
||||||
# tarball, and never in a checked-out repository.
|
# 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)\"
|
-DLOCALEDIR=\"$(localedir)\"
|
||||||
AM_CFLAGS = -fsigned-char
|
AM_CFLAGS = -fsigned-char
|
||||||
AM_LDFLAGS =
|
AM_LDFLAGS =
|
||||||
|
|
204
configure.ac
204
configure.ac
|
@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
|
||||||
AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability])
|
AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability])
|
||||||
|
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
||||||
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR(mount/mount.c)
|
AC_CONFIG_SRCDIR(mount/mount.c)
|
||||||
AC_PREFIX_DEFAULT([/usr])
|
AC_PREFIX_DEFAULT([/usr])
|
||||||
|
@ -17,7 +17,7 @@ AC_PREFIX_DEFAULT([/usr])
|
||||||
dnl version details from <major>.<minor>[-<suffix>]
|
dnl version details from <major>.<minor>[-<suffix>]
|
||||||
PACKAGE_VERSION_MAJOR=$(echo $PACKAGE_VERSION | awk -F. '{print $1}')
|
PACKAGE_VERSION_MAJOR=$(echo $PACKAGE_VERSION | awk -F. '{print $1}')
|
||||||
PACKAGE_VERSION_MINOR=$(echo $PACKAGE_VERSION | awk -F. '{print $2}' \
|
PACKAGE_VERSION_MINOR=$(echo $PACKAGE_VERSION | awk -F. '{print $2}' \
|
||||||
| awk -F- '{print $1}')
|
| awk -F- '{print $1}')
|
||||||
PACKAGE_VERSION_RELEASE=0
|
PACKAGE_VERSION_RELEASE=0
|
||||||
|
|
||||||
dnl libblkid version
|
dnl libblkid version
|
||||||
|
@ -130,49 +130,49 @@ AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
#endif
|
#endif
|
||||||
])
|
])
|
||||||
AC_CHECK_HEADERS(
|
AC_CHECK_HEADERS([ \
|
||||||
[err.h \
|
asm/io.h \
|
||||||
|
err.h \
|
||||||
errno.h \
|
errno.h \
|
||||||
|
fcntl.h \
|
||||||
getopt.h \
|
getopt.h \
|
||||||
|
inttypes.h \
|
||||||
|
linux/cdrom.h \
|
||||||
|
linux/falloc.h \
|
||||||
linux/fd.h \
|
linux/fd.h \
|
||||||
|
linux/raw.h \
|
||||||
linux/tiocl.h \
|
linux/tiocl.h \
|
||||||
linux/version.h \
|
linux/version.h \
|
||||||
linux/falloc.h \
|
|
||||||
linux/cdrom.h \
|
|
||||||
fcntl.h \
|
|
||||||
locale.h \
|
locale.h \
|
||||||
stdint.h \
|
mntent.h \
|
||||||
inttypes.h \
|
net/if.h \
|
||||||
|
net/if_dl.h \
|
||||||
|
netinet/in.h \
|
||||||
paths.h \
|
paths.h \
|
||||||
pty.h \
|
pty.h \
|
||||||
mntent.h \
|
security/pam_misc.h \
|
||||||
net/if.h \
|
stdint.h \
|
||||||
net/if_dl.h \
|
|
||||||
netinet/in.h \
|
|
||||||
stdlib.h \
|
stdlib.h \
|
||||||
asm/io.h \
|
|
||||||
sys/disk.h \
|
sys/disk.h \
|
||||||
sys/disklabel.h \
|
sys/disklabel.h \
|
||||||
sys/ioctl.h \
|
sys/file.h \
|
||||||
sys/ioccom.h \
|
|
||||||
sys/io.h \
|
sys/io.h \
|
||||||
sys/time.h \
|
sys/ioccom.h \
|
||||||
|
sys/ioctl.h \
|
||||||
sys/mkdev.h \
|
sys/mkdev.h \
|
||||||
sys/prctl.h \
|
sys/prctl.h \
|
||||||
sys/queue.h \
|
sys/queue.h \
|
||||||
sys/sockio.h \
|
sys/resource.h \
|
||||||
sys/socket.h \
|
sys/socket.h \
|
||||||
sys/syscall.h \
|
sys/sockio.h \
|
||||||
sys/file.h \
|
|
||||||
sys/ioctl.h \
|
|
||||||
sys/stat.h \
|
sys/stat.h \
|
||||||
|
sys/swap.h \
|
||||||
|
sys/syscall.h \
|
||||||
|
sys/time.h \
|
||||||
sys/types.h \
|
sys/types.h \
|
||||||
sys/un.h \
|
sys/un.h \
|
||||||
sys/swap.h \
|
unistd.h \
|
||||||
sys/resource.h \
|
])
|
||||||
security/pam_misc.h \
|
|
||||||
linux/raw.h \
|
|
||||||
unistd.h ])
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS([langinfo.h],
|
AC_CHECK_HEADERS([langinfo.h],
|
||||||
[AM_CONDITIONAL([HAVE_LANGINFO], [true])],
|
[AM_CONDITIONAL([HAVE_LANGINFO], [true])],
|
||||||
|
@ -191,7 +191,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
int a = 0;
|
int a = 0;
|
||||||
struct tm *tm = localtime(0);
|
struct tm *tm = localtime(0);
|
||||||
if (a == -1) /* false */
|
if (a == -1) /* false */
|
||||||
sleep(tm->tm_gmtoff);
|
sleep(tm->tm_gmtoff);
|
||||||
]])],
|
]])],
|
||||||
[AC_DEFINE(HAVE_TM_GMTOFF,1,[Does struct tm have a field tm_gmtoff?])
|
[AC_DEFINE(HAVE_TM_GMTOFF,1,[Does struct tm have a field tm_gmtoff?])
|
||||||
])
|
])
|
||||||
|
@ -244,42 +244,42 @@ AC_CHECK_DECL([lseek64],
|
||||||
#define _LARGEFILE64_SOURCE
|
#define _LARGEFILE64_SOURCE
|
||||||
#include <unistd.h>])
|
#include <unistd.h>])
|
||||||
|
|
||||||
AC_CHECK_FUNCS(
|
AC_CHECK_FUNCS([ \
|
||||||
[\
|
__secure_getenv \
|
||||||
err \
|
err \
|
||||||
errx \
|
errx \
|
||||||
futimens \
|
|
||||||
fsync \
|
fsync \
|
||||||
|
futimens \
|
||||||
getdomainname \
|
getdomainname \
|
||||||
usleep \
|
getdtablesize \
|
||||||
nanosleep \
|
getexecname \
|
||||||
personality \
|
getmntinfo \
|
||||||
updwtmp \
|
getrlimit \
|
||||||
|
inotify_init \
|
||||||
jrand48 \
|
jrand48 \
|
||||||
lchown \
|
lchown \
|
||||||
llseek \
|
llseek \
|
||||||
lseek64 \
|
lseek64 \
|
||||||
|
nanosleep \
|
||||||
|
personality \
|
||||||
|
posix_fadvise \
|
||||||
|
prctl \
|
||||||
|
rpmatch \
|
||||||
scandirat \
|
scandirat \
|
||||||
strtoull \
|
|
||||||
sysconf \
|
|
||||||
getdtablesize \
|
|
||||||
getexecname \
|
|
||||||
getrlimit \
|
|
||||||
sigqueue \
|
|
||||||
srandom \
|
|
||||||
setresgid \
|
setresgid \
|
||||||
setresuid \
|
setresuid \
|
||||||
|
sigqueue \
|
||||||
|
srandom \
|
||||||
|
strnchr \
|
||||||
strndup \
|
strndup \
|
||||||
strnlen \
|
strnlen \
|
||||||
strnchr \
|
strtoull \
|
||||||
inotify_init \
|
sysconf \
|
||||||
prctl \
|
updwtmp \
|
||||||
posix_fadvise \
|
usleep \
|
||||||
getmntinfo \
|
|
||||||
__secure_getenv \
|
|
||||||
warn \
|
warn \
|
||||||
warnx \
|
warnx \
|
||||||
rpmatch])
|
])
|
||||||
AC_FUNC_FSEEKO
|
AC_FUNC_FSEEKO
|
||||||
|
|
||||||
AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no])
|
AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no])
|
||||||
|
@ -327,18 +327,18 @@ esac
|
||||||
|
|
||||||
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
|
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
|
||||||
AC_TRY_COMPILE([#include <argp.h>],
|
AC_TRY_COMPILE([#include <argp.h>],
|
||||||
[program_invocation_short_name = "test";],
|
[program_invocation_short_name = "test";],
|
||||||
AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
|
AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
|
||||||
[Define if program_invocation_short_name is defined])
|
[Define if program_invocation_short_name is defined])
|
||||||
AC_MSG_RESULT(yes),
|
AC_MSG_RESULT(yes),
|
||||||
AC_MSG_RESULT(no))
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether __progname is defined])
|
AC_MSG_CHECKING([whether __progname is defined])
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([extern char *__progname;],
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([extern char *__progname;],
|
||||||
[if (*__progname == 0) return;])],
|
[if (*__progname == 0) return;])],
|
||||||
AC_DEFINE(HAVE___PROGNAME, 1, [Define if __progname is defined])
|
AC_DEFINE(HAVE___PROGNAME, 1, [Define if __progname is defined])
|
||||||
AC_MSG_RESULT(yes),
|
AC_MSG_RESULT(yes),
|
||||||
AC_MSG_RESULT(no))
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
dnl Static compilation
|
dnl Static compilation
|
||||||
m4_define([UL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid])
|
m4_define([UL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid])
|
||||||
|
@ -530,7 +530,7 @@ fi
|
||||||
|
|
||||||
AC_ARG_WITH([ncurses],
|
AC_ARG_WITH([ncurses],
|
||||||
AS_HELP_STRING([--with-ncurses], [build with non-wide ncurses, default is wide version
|
AS_HELP_STRING([--with-ncurses], [build with non-wide ncurses, default is wide version
|
||||||
(--without-ncurses disables all ncurses(w) support)]),
|
(--without-ncurses disables all ncurses(w) support)]),
|
||||||
[], with_ncurses=auto
|
[], with_ncurses=auto
|
||||||
)
|
)
|
||||||
AM_CONDITIONAL(HAVE_NCURSES, false)
|
AM_CONDITIONAL(HAVE_NCURSES, false)
|
||||||
|
@ -541,14 +541,14 @@ if test "x$with_ncurses" != xno; then
|
||||||
if test "x$with_ncurses" = xauto; then
|
if test "x$with_ncurses" = xauto; then
|
||||||
UL_CHECK_LIB(ncursesw, initscr, ncurses)
|
UL_CHECK_LIB(ncursesw, initscr, ncurses)
|
||||||
if test "x$have_ncurses" = xyes; then
|
if test "x$have_ncurses" = xyes; then
|
||||||
AC_CHECK_HEADERS([ncursesw/ncurses.h])
|
AC_CHECK_HEADERS([ncursesw/ncurses.h])
|
||||||
NCURSES_LIBS="-lncursesw"
|
NCURSES_LIBS="-lncursesw"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "x$have_ncurses" = xno; then
|
if test "x$have_ncurses" = xno; then
|
||||||
UL_CHECK_LIB(ncurses, initscr)
|
UL_CHECK_LIB(ncurses, initscr)
|
||||||
if test "x$have_ncurses" = xyes; then
|
if test "x$have_ncurses" = xyes; then
|
||||||
NCURSES_LIBS="-lncurses"
|
NCURSES_LIBS="-lncurses"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
@ -572,7 +572,7 @@ use_slang=no
|
||||||
if test "x$with_slang" = xyes; then
|
if test "x$with_slang" = xyes; then
|
||||||
AC_CHECK_HEADERS([slang.h slang/slang.h])
|
AC_CHECK_HEADERS([slang.h slang/slang.h])
|
||||||
AC_CHECK_HEADERS([slcurses.h slang/slcurses.h],
|
AC_CHECK_HEADERS([slcurses.h slang/slcurses.h],
|
||||||
[use_slang=yes], [], [
|
[use_slang=yes], [], [
|
||||||
#ifdef HAVE_SLANG_H
|
#ifdef HAVE_SLANG_H
|
||||||
#include <slang.h>
|
#include <slang.h>
|
||||||
#elif defined(HAVE_SLANG_SLANG_H)
|
#elif defined(HAVE_SLANG_SLANG_H)
|
||||||
|
@ -997,26 +997,26 @@ UL_BUILD_INIT([ionice], [check])
|
||||||
UL_REQUIRES_BUILD([ionice], [schedutils])
|
UL_REQUIRES_BUILD([ionice], [schedutils])
|
||||||
UL_REQUIRES_SYSCALL_CHECK([ionice],
|
UL_REQUIRES_SYSCALL_CHECK([ionice],
|
||||||
[UL_CHECK_SYSCALL([ioprio_set],
|
[UL_CHECK_SYSCALL([ioprio_set],
|
||||||
[alpha], [442],
|
[alpha], [442],
|
||||||
[i*86], [289],
|
[i*86], [289],
|
||||||
[ia64*], [1274],
|
[ia64*], [1274],
|
||||||
[powerpc*], [273],
|
[powerpc*], [273],
|
||||||
[s390*], [282],
|
[s390*], [282],
|
||||||
[sparc*], [196],
|
[sparc*], [196],
|
||||||
[sh*], [288],
|
[sh*], [288],
|
||||||
[x86_64*], [251])],
|
[x86_64*], [251])],
|
||||||
[ioprio_set])
|
[ioprio_set])
|
||||||
|
|
||||||
UL_REQUIRES_SYSCALL_CHECK([ionice],
|
UL_REQUIRES_SYSCALL_CHECK([ionice],
|
||||||
[UL_CHECK_SYSCALL([ioprio_get],
|
[UL_CHECK_SYSCALL([ioprio_get],
|
||||||
[alpha], [443],
|
[alpha], [443],
|
||||||
[i*86], [290],
|
[i*86], [290],
|
||||||
[ia64*], [1275],
|
[ia64*], [1275],
|
||||||
[powerpc*], [274],
|
[powerpc*], [274],
|
||||||
[s390*], [283],
|
[s390*], [283],
|
||||||
[sparc*], [218],
|
[sparc*], [218],
|
||||||
[sh*], [289],
|
[sh*], [289],
|
||||||
[x86_64*], [252])],
|
[x86_64*], [252])],
|
||||||
[ioprio_get])
|
[ioprio_get])
|
||||||
|
|
||||||
AM_CONDITIONAL(BUILD_IONICE, test "x$build_ionice" = xyes)
|
AM_CONDITIONAL(BUILD_IONICE, test "x$build_ionice" = xyes)
|
||||||
|
@ -1109,7 +1109,7 @@ AC_ARG_ENABLE([fs-paths-extra],
|
||||||
AS_HELP_STRING([--enable-fs-paths-extra=paths], [additional search paths for fs helpers]),
|
AS_HELP_STRING([--enable-fs-paths-extra=paths], [additional search paths for fs helpers]),
|
||||||
[case "$enableval" in
|
[case "$enableval" in
|
||||||
yes|no) fs_paths_extra="" ;;
|
yes|no) fs_paths_extra="" ;;
|
||||||
*) fs_paths_extra="$enableval" ;;
|
*) fs_paths_extra="$enableval" ;;
|
||||||
esac],
|
esac],
|
||||||
[fs_paths_extra=""]
|
[fs_paths_extra=""]
|
||||||
)
|
)
|
||||||
|
@ -1157,6 +1157,7 @@ LIBS=""
|
||||||
AC_CONFIG_HEADERS(config.h)
|
AC_CONFIG_HEADERS(config.h)
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
|
Makefile
|
||||||
disk-utils/Makefile
|
disk-utils/Makefile
|
||||||
fdisk/Makefile
|
fdisk/Makefile
|
||||||
fsck/Makefile
|
fsck/Makefile
|
||||||
|
@ -1164,40 +1165,39 @@ getopt/Makefile
|
||||||
hwclock/Makefile
|
hwclock/Makefile
|
||||||
include/Makefile
|
include/Makefile
|
||||||
lib/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
|
login-utils/Makefile
|
||||||
Makefile
|
|
||||||
man/ru/Makefile
|
man/ru/Makefile
|
||||||
misc-utils/chkdupexe:misc-utils/chkdupexe.pl
|
|
||||||
misc-utils/Makefile
|
misc-utils/Makefile
|
||||||
|
misc-utils/chkdupexe:misc-utils/chkdupexe.pl
|
||||||
mount/Makefile
|
mount/Makefile
|
||||||
partx/Makefile
|
partx/Makefile
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
schedutils/Makefile
|
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
|
sys-utils/Makefile
|
||||||
term-utils/Makefile
|
term-utils/Makefile
|
||||||
|
tests/Makefile
|
||||||
tests/commands.sh
|
tests/commands.sh
|
||||||
tests/helpers/Makefile
|
tests/helpers/Makefile
|
||||||
tests/Makefile
|
|
||||||
text-utils/Makefile
|
text-utils/Makefile
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
@ -10,21 +10,46 @@ uuid_cflags = -I$(ul_libuuid_srcdir)
|
||||||
uuid_ldadd = $(ul_libuuid_la)
|
uuid_ldadd = $(ul_libuuid_la)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
|
dist_man_MANS = \
|
||||||
fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
|
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
|
fsck_minix_SOURCES = \
|
||||||
mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h $(utils_common) \
|
fsck.minix.c \
|
||||||
$(top_srcdir)/lib/strutils.c
|
minix_programs.h \
|
||||||
mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) $(top_srcdir)/lib/strutils.c
|
$(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_SOURCES = swaplabel.c $(utils_common)
|
||||||
swaplabel_LDADD = $(uuid_ldadd)
|
swaplabel_LDADD = $(uuid_ldadd)
|
||||||
swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
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_LDADD = $(uuid_ldadd)
|
||||||
mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
||||||
|
|
||||||
|
@ -60,11 +85,17 @@ dist_man_MANS += raw.8
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_CRAMFS
|
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
|
sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
|
||||||
fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
|
fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
|
||||||
mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c \
|
mkfs_cramfs_SOURCES = \
|
||||||
$(top_srcdir)/lib/strutils.c
|
mkfs.cramfs.c \
|
||||||
|
$(cramfs_common) \
|
||||||
|
$(top_srcdir)/lib/md5.c \
|
||||||
|
$(top_srcdir)/lib/strutils.c
|
||||||
fsck_cramfs_LDADD = -lz
|
fsck_cramfs_LDADD = -lz
|
||||||
mkfs_cramfs_LDADD = -lz
|
mkfs_cramfs_LDADD = -lz
|
||||||
endif
|
endif
|
||||||
|
@ -72,4 +103,3 @@ endif
|
||||||
if HAVE_SELINUX
|
if HAVE_SELINUX
|
||||||
mkswap_LDADD += -lselinux
|
mkswap_LDADD += -lselinux
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,15 @@ include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
EXTRA_DIST = partitiontype.c
|
EXTRA_DIST = partitiontype.c
|
||||||
|
|
||||||
fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
|
fdisk_common = \
|
||||||
$(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \
|
common.h \
|
||||||
$(top_srcdir)/lib/mbsalign.c $(top_srcdir)/lib/strutils.c
|
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
|
if LINUX
|
||||||
fdisk_common += $(top_srcdir)/lib/linux_version.c
|
fdisk_common += $(top_srcdir)/lib/linux_version.c
|
||||||
|
@ -14,10 +20,21 @@ if !ARCH_M68K
|
||||||
|
|
||||||
sbin_PROGRAMS = fdisk
|
sbin_PROGRAMS = fdisk
|
||||||
dist_man_MANS = fdisk.8
|
dist_man_MANS = fdisk.8
|
||||||
fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \
|
fdisk_SOURCES = \
|
||||||
fdisksunlabel.c fdiskaixlabel.c fdiskmaclabel.c partname.c \
|
fdisk.c \
|
||||||
fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h \
|
fdisk.h \
|
||||||
fdiskbsdlabel.h fdiskmaclabel.h $(fdisk_common) \
|
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
|
$(top_srcdir)/lib/canonicalize.c
|
||||||
|
|
||||||
cflags_blkid = $(AM_CFLAGS)
|
cflags_blkid = $(AM_CFLAGS)
|
||||||
|
@ -43,7 +60,10 @@ if !ARCH_SPARC
|
||||||
|
|
||||||
sbin_PROGRAMS += sfdisk
|
sbin_PROGRAMS += sfdisk
|
||||||
dist_man_MANS += sfdisk.8
|
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
|
$(top_srcdir)/lib/canonicalize.c
|
||||||
|
|
||||||
if HAVE_STATIC_SFDISK
|
if HAVE_STATIC_SFDISK
|
||||||
|
@ -70,4 +90,3 @@ endif
|
||||||
|
|
||||||
endif # !ARCH_SPARC
|
endif # !ARCH_SPARC
|
||||||
endif # !ARCH_M68K
|
endif # !ARCH_M68K
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,12 @@ dist_man_MANS = hwclock.8
|
||||||
|
|
||||||
sbin_PROGRAMS = hwclock
|
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 =
|
hwclock_LDADD =
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
|
|
|
@ -4,9 +4,9 @@ dist_noinst_HEADERS = \
|
||||||
at.h \
|
at.h \
|
||||||
bitops.h \
|
bitops.h \
|
||||||
blkdev.h \
|
blkdev.h \
|
||||||
|
c.h \
|
||||||
canonicalize.h \
|
canonicalize.h \
|
||||||
carefulputc.h \
|
carefulputc.h \
|
||||||
c.h \
|
|
||||||
cpuset.h \
|
cpuset.h \
|
||||||
crc32.h \
|
crc32.h \
|
||||||
env.h \
|
env.h \
|
||||||
|
@ -28,6 +28,7 @@ dist_noinst_HEADERS = \
|
||||||
path.h \
|
path.h \
|
||||||
pathnames.h \
|
pathnames.h \
|
||||||
procutils.h \
|
procutils.h \
|
||||||
|
rpmatch.h \
|
||||||
setproctitle.h \
|
setproctitle.h \
|
||||||
strutils.h \
|
strutils.h \
|
||||||
swapheader.h \
|
swapheader.h \
|
||||||
|
@ -37,6 +38,5 @@ dist_noinst_HEADERS = \
|
||||||
wholedisk.h \
|
wholedisk.h \
|
||||||
widechar.h \
|
widechar.h \
|
||||||
writeall.h \
|
writeall.h \
|
||||||
rpmatch.h \
|
|
||||||
xgetpass.h \
|
xgetpass.h \
|
||||||
xalloc.h
|
xalloc.h
|
||||||
|
|
|
@ -2,9 +2,17 @@ include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
AM_CPPFLAGS += -DTEST_PROGRAM
|
AM_CPPFLAGS += -DTEST_PROGRAM
|
||||||
|
|
||||||
noinst_PROGRAMS = test_blkdev test_ismounted test_wholedisk test_mangle \
|
noinst_PROGRAMS = \
|
||||||
test_tt test_canonicalize test_strutils test_procutils \
|
test_at \
|
||||||
test_at
|
test_blkdev \
|
||||||
|
test_canonicalize \
|
||||||
|
test_ismounted \
|
||||||
|
test_mangle \
|
||||||
|
test_procutils \
|
||||||
|
test_strutils \
|
||||||
|
test_tt \
|
||||||
|
test_wholedisk
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
if HAVE_CPU_SET_T
|
if HAVE_CPU_SET_T
|
||||||
noinst_PROGRAMS += test_cpuset
|
noinst_PROGRAMS += test_cpuset
|
||||||
|
@ -28,10 +36,11 @@ test_cpuset_SOURCES = cpuset.c
|
||||||
test_sysfs_SOURCES = sysfs.c at.c
|
test_sysfs_SOURCES = sysfs.c at.c
|
||||||
test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
|
test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
|
||||||
|
|
||||||
test_loopdev_SOURCES = loopdev.c \
|
test_loopdev_SOURCES = \
|
||||||
$(test_sysfs_SOURCES) \
|
loopdev.c \
|
||||||
$(top_srcdir)/lib/linux_version.c \
|
$(test_sysfs_SOURCES) \
|
||||||
$(top_srcdir)/lib/canonicalize.c
|
$(top_srcdir)/lib/canonicalize.c \
|
||||||
|
$(top_srcdir)/lib/linux_version.c
|
||||||
|
|
||||||
test_loopdev_CFLAGS = -DTEST_PROGRAM_LOOPDEV
|
test_loopdev_CFLAGS = -DTEST_PROGRAM_LOOPDEV
|
||||||
endif
|
endif
|
||||||
|
@ -44,4 +53,3 @@ test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE
|
||||||
if LINUX
|
if LINUX
|
||||||
test_blkdev_SOURCES += linux_version.c
|
test_blkdev_SOURCES += linux_version.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -13,4 +13,3 @@ pkgconfig_DATA = blkid.pc
|
||||||
dist_man_MANS = libblkid.3
|
dist_man_MANS = libblkid.3
|
||||||
|
|
||||||
EXTRA_DIST = blkid.pc.in 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_CPPFLAGS += -I$(ul_libblkid_incdir)
|
||||||
AM_LDFLAGS += $(ul_libblkid_la)
|
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
|
include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
SUBDIRS = superblocks topology partitions .
|
SUBDIRS = \
|
||||||
|
partitions \
|
||||||
|
superblocks \
|
||||||
|
topology \
|
||||||
|
.
|
||||||
|
|
||||||
common_ldadd =
|
common_ldadd =
|
||||||
common_cflags =
|
common_cflags =
|
||||||
|
@ -10,43 +14,73 @@ common_ldadd += $(ul_libuuid_la)
|
||||||
common_cflags += -I$(ul_libuuid_srcdir)
|
common_cflags += -I$(ul_libuuid_srcdir)
|
||||||
endif
|
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
|
# includes
|
||||||
blkidincdir = $(includedir)/blkid
|
blkidincdir = $(includedir)/blkid
|
||||||
nodist_blkidinc_HEADERS = blkid.h
|
nodist_blkidinc_HEADERS = blkid.h
|
||||||
|
|
||||||
usrlib_exec_LTLIBRARIES = libblkid.la
|
usrlib_exec_LTLIBRARIES = libblkid.la
|
||||||
libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \
|
libblkid_la_SOURCES = \
|
||||||
probe.c read.c resolve.c save.c tag.c version.c verify.c \
|
blkidP.h \
|
||||||
encode.c blkidP.h superblocks/superblocks.h \
|
cache.c \
|
||||||
config.c evaluate.c \
|
config.c \
|
||||||
$(blkidinc_HEADERS) \
|
dev.c \
|
||||||
$(top_srcdir)/lib/blkdev.c \
|
devname.c \
|
||||||
$(top_srcdir)/lib/linux_version.c \
|
devno.c \
|
||||||
$(top_srcdir)/lib/canonicalize.c \
|
encode.c \
|
||||||
$(top_srcdir)/lib/md5.c \
|
evaluate.c \
|
||||||
$(top_srcdir)/lib/crc32.c \
|
getsize.c \
|
||||||
$(top_srcdir)/include/list.h \
|
llseek.c \
|
||||||
$(top_srcdir)/lib/env.c \
|
probe.c \
|
||||||
$(top_srcdir)/lib/strutils.c \
|
read.c \
|
||||||
$(top_srcdir)/lib/at.c \
|
resolve.c \
|
||||||
$(top_srcdir)/lib/sysfs.c
|
save.c \
|
||||||
|
superblocks/superblocks.h \
|
||||||
|
tag.c \
|
||||||
|
verify.c \
|
||||||
|
version.c \
|
||||||
|
$(blkidinc_HEADERS) \
|
||||||
|
$(top_srcdir)/include/list.h \
|
||||||
|
$(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
|
nodist_libblkid_la_SOURCES = blkid.h
|
||||||
|
|
||||||
libblkid_la_LIBADD = superblocks/libblkid_superblocks.la \
|
libblkid_la_LIBADD = \
|
||||||
topology/libblkid_topology.la \
|
partitions/libblkid_partitions.la \
|
||||||
partitions/libblkid_partitions.la \
|
superblocks/libblkid_superblocks.la \
|
||||||
$(common_ldadd)
|
topology/libblkid_topology.la \
|
||||||
|
$(common_ldadd)
|
||||||
|
|
||||||
libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym blkid.h.in
|
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 = \
|
||||||
-version-info $(LIBBLKID_VERSION_INFO)
|
-Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
|
||||||
|
-version-info $(LIBBLKID_VERSION_INFO)
|
||||||
|
|
||||||
tests = test_cache test_config test_dev test_devname test_devno \
|
tests = \
|
||||||
test_read test_resolve test_save test_tag test_verify test_evaluate
|
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
|
EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
|
||||||
CLEANFILES = $(tests)
|
CLEANFILES = $(tests)
|
||||||
|
|
|
@ -4,19 +4,20 @@ AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
|
||||||
libblkid_partitions_la_LIBADD =
|
libblkid_partitions_la_LIBADD =
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libblkid_partitions.la
|
noinst_LTLIBRARIES = libblkid_partitions.la
|
||||||
libblkid_partitions_la_SOURCES = partitions.c \
|
libblkid_partitions_la_SOURCES = \
|
||||||
partitions.h \
|
aix.c \
|
||||||
blkid_parttypes.h \
|
aix.h \
|
||||||
aix.c \
|
blkid_parttypes.h \
|
||||||
aix.h \
|
bsd.c \
|
||||||
bsd.c \
|
dos.c \
|
||||||
unixware.c \
|
dos.h \
|
||||||
solaris_x86.c \
|
gpt.c \
|
||||||
sun.c \
|
mac.c \
|
||||||
sgi.c \
|
minix.c \
|
||||||
mac.c \
|
partitions.c \
|
||||||
dos.c \
|
partitions.h \
|
||||||
dos.h \
|
sgi.c \
|
||||||
minix.c \
|
solaris_x86.c \
|
||||||
ultrix.c \
|
sun.c \
|
||||||
gpt.c
|
ultrix.c \
|
||||||
|
unixware.c
|
||||||
|
|
|
@ -4,49 +4,49 @@ AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libblkid_superblocks.la
|
noinst_LTLIBRARIES = libblkid_superblocks.la
|
||||||
libblkid_superblocks_la_SOURCES = \
|
libblkid_superblocks_la_SOURCES = \
|
||||||
superblocks.h \
|
adaptec_raid.c \
|
||||||
superblocks.c \
|
befs.c \
|
||||||
cramfs.c \
|
bfs.c \
|
||||||
swap.c \
|
btrfs.c \
|
||||||
adaptec_raid.c \
|
cramfs.c \
|
||||||
ddf_raid.c \
|
ddf_raid.c \
|
||||||
isw_raid.c \
|
drbd.c \
|
||||||
jmicron_raid.c \
|
drbdproxy_datalog.c \
|
||||||
lsi_raid.c \
|
exfat.c \
|
||||||
nvidia_raid.c \
|
ext.c \
|
||||||
promise_raid.c \
|
gfs.c \
|
||||||
silicon_raid.c \
|
hfs.c \
|
||||||
via_raid.c \
|
highpoint_raid.c \
|
||||||
linux_raid.c \
|
hpfs.c \
|
||||||
jfs.c \
|
iso9660.c \
|
||||||
xfs.c \
|
isw_raid.c \
|
||||||
ext.c \
|
jfs.c \
|
||||||
gfs.c \
|
jmicron_raid.c \
|
||||||
ocfs.c \
|
linux_raid.c \
|
||||||
reiserfs.c \
|
lsi_raid.c \
|
||||||
romfs.c \
|
luks.c \
|
||||||
ntfs.c \
|
lvm.c \
|
||||||
hfs.c \
|
minix.c \
|
||||||
iso9660.c \
|
netware.c \
|
||||||
udf.c \
|
nilfs.c \
|
||||||
vfat.c \
|
ntfs.c \
|
||||||
luks.c \
|
nvidia_raid.c \
|
||||||
highpoint_raid.c \
|
ocfs.c \
|
||||||
vxfs.c \
|
promise_raid.c \
|
||||||
minix.c \
|
reiserfs.c \
|
||||||
ufs.c \
|
romfs.c \
|
||||||
hpfs.c \
|
silicon_raid.c \
|
||||||
squashfs.c \
|
squashfs.c \
|
||||||
netware.c \
|
superblocks.c \
|
||||||
sysv.c \
|
superblocks.h \
|
||||||
btrfs.c \
|
swap.c \
|
||||||
lvm.c \
|
sysv.c \
|
||||||
zfs.c \
|
ubifs.c \
|
||||||
ubifs.c \
|
udf.c \
|
||||||
bfs.c \
|
ufs.c \
|
||||||
drbd.c \
|
vfat.c \
|
||||||
drbdproxy_datalog.c \
|
via_raid.c \
|
||||||
vmfs.c \
|
vmfs.c \
|
||||||
befs.c \
|
vxfs.c \
|
||||||
nilfs.c \
|
xfs.c \
|
||||||
exfat.c
|
zfs.c
|
||||||
|
|
|
@ -4,14 +4,16 @@ AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
|
||||||
libblkid_topology_la_LIBADD =
|
libblkid_topology_la_LIBADD =
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libblkid_topology.la
|
noinst_LTLIBRARIES = libblkid_topology.la
|
||||||
libblkid_topology_la_SOURCES = topology.c \
|
libblkid_topology_la_SOURCES = \
|
||||||
topology.h
|
topology.c \
|
||||||
|
topology.h
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
libblkid_topology_la_SOURCES += sysfs.c \
|
libblkid_topology_la_SOURCES += \
|
||||||
dm.c \
|
dm.c \
|
||||||
lvm.c \
|
evms.c \
|
||||||
ioctl.c \
|
ioctl.c \
|
||||||
md.c \
|
lvm.c \
|
||||||
evms.c
|
md.c \
|
||||||
|
sysfs.c
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,39 +1,59 @@
|
||||||
include $(top_srcdir)/config/include-Makefile.am
|
include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
AM_CPPFLAGS += -I$(ul_libmount_incdir) \
|
AM_CPPFLAGS += \
|
||||||
-I$(ul_libmount_srcdir) \
|
-I$(ul_libblkid_incdir) \
|
||||||
-I$(ul_libblkid_incdir)
|
-I$(ul_libmount_incdir) \
|
||||||
|
-I$(ul_libmount_srcdir)
|
||||||
|
|
||||||
# includes
|
# includes
|
||||||
mountincdir = $(includedir)/libmount
|
mountincdir = $(includedir)/libmount
|
||||||
nodist_mountinc_HEADERS = libmount.h
|
nodist_mountinc_HEADERS = libmount.h
|
||||||
|
|
||||||
usrlib_exec_LTLIBRARIES = libmount.la
|
usrlib_exec_LTLIBRARIES = libmount.la
|
||||||
libmount_la_SOURCES = mountP.h version.c utils.c test.c init.c cache.c \
|
libmount_la_SOURCES = \
|
||||||
optstr.c optmap.c iter.c lock.c \
|
cache.c \
|
||||||
fs.c tab.c tab_parse.c tab_update.c tab_diff.c \
|
context.c \
|
||||||
context.c context_mount.c context_umount.c \
|
context_loopdev.c \
|
||||||
context_loopdev.c \
|
context_mount.c \
|
||||||
$(mountinc_HEADERS) \
|
context_umount.c \
|
||||||
$(top_srcdir)/lib/at.c \
|
fs.c \
|
||||||
$(top_srcdir)/lib/match.c \
|
init.c \
|
||||||
$(top_srcdir)/include/list.h \
|
iter.c \
|
||||||
$(top_srcdir)/lib/mangle.c \
|
lock.c \
|
||||||
$(top_srcdir)/lib/canonicalize.c \
|
mountP.h \
|
||||||
$(top_srcdir)/lib/strutils.c \
|
optmap.c \
|
||||||
$(top_srcdir)/lib/env.c \
|
optstr.c \
|
||||||
$(top_srcdir)/lib/loopdev.c \
|
tab.c \
|
||||||
$(top_srcdir)/lib/sysfs.c \
|
tab_diff.c \
|
||||||
$(top_srcdir)/lib/linux_version.c
|
tab_parse.c \
|
||||||
|
tab_update.c \
|
||||||
|
test.c \
|
||||||
|
utils.c \
|
||||||
|
version.c \
|
||||||
|
$(mountinc_HEADERS) \
|
||||||
|
$(top_srcdir)/include/list.h \
|
||||||
|
$(top_srcdir)/lib/at.c \
|
||||||
|
$(top_srcdir)/lib/canonicalize.c \
|
||||||
|
$(top_srcdir)/lib/env.c \
|
||||||
|
$(top_srcdir)/lib/linux_version.c \
|
||||||
|
$(top_srcdir)/lib/loopdev.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
|
nodist_libmount_la_SOURCES = mountP.h
|
||||||
|
|
||||||
libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS)
|
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 = \
|
||||||
-version-info $(LIBMOUNT_VERSION_INFO)
|
-Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \
|
||||||
|
-version-info $(LIBMOUNT_VERSION_INFO)
|
||||||
|
|
||||||
TESTS_LIBS = -luuid
|
TESTS_LIBS = -luuid
|
||||||
|
|
||||||
|
@ -60,13 +80,19 @@ uninstall-hook:
|
||||||
rm -f $(DESTDIR)$(libdir)/libmount.so*
|
rm -f $(DESTDIR)$(libdir)/libmount.so*
|
||||||
|
|
||||||
|
|
||||||
tests = test_version test_cache test_optstr test_lock \
|
tests = \
|
||||||
test_tab test_utils test_tab_update test_context \
|
test_cache \
|
||||||
test_tab_diff
|
test_context \
|
||||||
|
test_lock \
|
||||||
|
test_optstr \
|
||||||
|
test_tab \
|
||||||
|
test_tab_diff \
|
||||||
|
test_tab_update \
|
||||||
|
test_utils \
|
||||||
|
test_version
|
||||||
|
|
||||||
tests: all $(tests)
|
tests: all $(tests)
|
||||||
test_%: %.c
|
test_%: %.c
|
||||||
$(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libmount.a \
|
$(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libmount.a \
|
||||||
$(ul_libblkid_builddir)/.libs/libblkid.a -o $@ \
|
$(ul_libblkid_builddir)/.libs/libblkid.a -o $@ \
|
||||||
$(TESTS_LIBS)
|
$(TESTS_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -7,4 +7,3 @@ pkgconfigdir = $(usrlib_execdir)/pkgconfig
|
||||||
pkgconfig_DATA = uuid.pc
|
pkgconfig_DATA = uuid.pc
|
||||||
|
|
||||||
EXTRA_DIST = uuid.pc.in
|
EXTRA_DIST = uuid.pc.in
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,20 @@
|
||||||
include $(top_srcdir)/config/include-Makefile.am
|
include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
dist_man_MANS = uuid.3 uuid_clear.3 uuid_compare.3 uuid_copy.3 uuid_generate.3 \
|
dist_man_MANS = \
|
||||||
uuid_is_null.3 uuid_parse.3 uuid_time.3 uuid_unparse.3
|
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)
|
man_MANS = $(UUID_GENERATE_LINKS)
|
||||||
CLEANFILES = $(man_MANS)
|
CLEANFILES = $(man_MANS)
|
||||||
|
|
|
@ -10,16 +10,29 @@ uuidincdir = $(includedir)/uuid
|
||||||
uuidinc_HEADERS = uuid.h
|
uuidinc_HEADERS = uuid.h
|
||||||
|
|
||||||
usrlib_exec_LTLIBRARIES = libuuid.la
|
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 \
|
libuuid_la_SOURCES = \
|
||||||
uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
|
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
|
libuuid_la_DEPENDENCIES = uuid.sym
|
||||||
|
|
||||||
libuuid_la_LIBADD = $(SOCKET_LIBS)
|
libuuid_la_LIBADD = $(SOCKET_LIBS)
|
||||||
|
|
||||||
libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
|
libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
|
||||||
-version-info $(LIBUUID_VERSION_INFO)
|
-version-info $(LIBUUID_VERSION_INFO)
|
||||||
|
|
||||||
EXTRA_DIST = uuid.sym gen_uuid_nt.c
|
EXTRA_DIST = uuid.sym gen_uuid_nt.c
|
||||||
|
|
||||||
|
@ -37,4 +50,3 @@ install-exec-hook:
|
||||||
|
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -f $(DESTDIR)$(libdir)/libuuid.so*
|
rm -f $(DESTDIR)$(libdir)/libuuid.so*
|
||||||
|
|
||||||
|
|
|
@ -14,20 +14,43 @@ endif
|
||||||
if BUILD_LOGIN_UTILS
|
if BUILD_LOGIN_UTILS
|
||||||
|
|
||||||
bin_PROGRAMS += login
|
bin_PROGRAMS += login
|
||||||
usrbin_exec_PROGRAMS += chfn chsh newgrp
|
usrbin_exec_PROGRAMS += \
|
||||||
usrsbin_exec_PROGRAMS += vipw
|
chfn \
|
||||||
dist_man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
|
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, chfn and chsh libs
|
||||||
login_ldadd_common =
|
login_ldadd_common =
|
||||||
|
|
||||||
chfn_SOURCES = chfn.c $(chfn_chsh_common)
|
chfn_SOURCES = \
|
||||||
chsh_SOURCES = chsh.c $(chfn_chsh_common)
|
chfn.c \
|
||||||
chfn_chsh_common = islocal.c setpwnam.c islocal.h setpwnam.h \
|
$(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
|
$(top_srcdir)/lib/env.c
|
||||||
login_SOURCES = login.c logindefs.c logindefs.h \
|
login_SOURCES = \
|
||||||
$(top_srcdir)/lib/setproctitle.c
|
login.c \
|
||||||
vipw_SOURCES = vipw.c setpwnam.h
|
logindefs.c \
|
||||||
|
logindefs.h \
|
||||||
|
$(top_srcdir)/lib/setproctitle.c
|
||||||
|
vipw_SOURCES = \
|
||||||
|
vipw.c \
|
||||||
|
setpwnam.h
|
||||||
|
|
||||||
chfn_LDADD = $(login_ldadd_common)
|
chfn_LDADD = $(login_ldadd_common)
|
||||||
chsh_LDADD = $(login_ldadd_common)
|
chsh_LDADD = $(login_ldadd_common)
|
||||||
|
|
|
@ -6,7 +6,13 @@ bin_PROGRAMS =
|
||||||
sbin_PROGRAMS =
|
sbin_PROGRAMS =
|
||||||
usrsbin_exec_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
|
logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c
|
||||||
mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
|
mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
|
||||||
|
@ -15,8 +21,14 @@ usrbin_exec_SCRIPTS = chkdupexe
|
||||||
|
|
||||||
CLEANFILES = chkdupexe
|
CLEANFILES = chkdupexe
|
||||||
|
|
||||||
dist_man_MANS = cal.1 chkdupexe.1 logger.1 look.1 mcookie.1 \
|
dist_man_MANS = \
|
||||||
namei.1 whereis.1
|
cal.1 \
|
||||||
|
chkdupexe.1 \
|
||||||
|
logger.1 \
|
||||||
|
look.1 \
|
||||||
|
mcookie.1 \
|
||||||
|
namei.1 \
|
||||||
|
whereis.1
|
||||||
|
|
||||||
namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
|
namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
|
||||||
|
|
||||||
|
@ -28,14 +40,15 @@ endif
|
||||||
if BUILD_LSBLK
|
if BUILD_LSBLK
|
||||||
bin_PROGRAMS += lsblk
|
bin_PROGRAMS += lsblk
|
||||||
dist_man_MANS += lsblk.8
|
dist_man_MANS += lsblk.8
|
||||||
lsblk_SOURCES = lsblk.c \
|
lsblk_SOURCES = \
|
||||||
$(top_srcdir)/lib/canonicalize.c \
|
lsblk.c \
|
||||||
$(top_srcdir)/lib/ismounted.c \
|
$(top_srcdir)/lib/at.c \
|
||||||
$(top_srcdir)/lib/tt.c \
|
$(top_srcdir)/lib/canonicalize.c \
|
||||||
$(top_srcdir)/lib/mbsalign.c \
|
$(top_srcdir)/lib/ismounted.c \
|
||||||
$(top_srcdir)/lib/strutils.c \
|
$(top_srcdir)/lib/mbsalign.c \
|
||||||
$(top_srcdir)/lib/sysfs.c \
|
$(top_srcdir)/lib/strutils.c \
|
||||||
$(top_srcdir)/lib/at.c
|
$(top_srcdir)/lib/sysfs.c \
|
||||||
|
$(top_srcdir)/lib/tt.c
|
||||||
lsblk_LDADD = $(ul_libblkid_la)
|
lsblk_LDADD = $(ul_libblkid_la)
|
||||||
lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||||
if HAVE_UDEV
|
if HAVE_UDEV
|
||||||
|
@ -60,17 +73,20 @@ endif
|
||||||
if BUILD_LIBBLKID
|
if BUILD_LIBBLKID
|
||||||
sbin_PROGRAMS += blkid findfs wipefs
|
sbin_PROGRAMS += blkid findfs wipefs
|
||||||
dist_man_MANS += blkid.8 findfs.8 wipefs.8
|
dist_man_MANS += blkid.8 findfs.8 wipefs.8
|
||||||
blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \
|
blkid_SOURCES = \
|
||||||
$(top_srcdir)/lib/strutils.c
|
blkid.c \
|
||||||
|
$(top_srcdir)/lib/ismounted.c \
|
||||||
|
$(top_srcdir)/lib/strutils.c
|
||||||
blkid_LDADD = $(ul_libblkid_la)
|
blkid_LDADD = $(ul_libblkid_la)
|
||||||
blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||||
|
|
||||||
findfs_LDADD = $(ul_libblkid_la)
|
findfs_LDADD = $(ul_libblkid_la)
|
||||||
findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||||
|
|
||||||
wipefs_SOURCES = wipefs.c \
|
wipefs_SOURCES = \
|
||||||
$(top_srcdir)/lib/strutils.c \
|
wipefs.c \
|
||||||
$(top_srcdir)/lib/match.c
|
$(top_srcdir)/lib/match.c \
|
||||||
|
$(top_srcdir)/lib/strutils.c
|
||||||
wipefs_LDADD = $(ul_libblkid_la)
|
wipefs_LDADD = $(ul_libblkid_la)
|
||||||
wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||||
|
|
||||||
|
@ -88,17 +104,21 @@ bin_PROGRAMS += findmnt
|
||||||
dist_man_MANS += findmnt.8
|
dist_man_MANS += findmnt.8
|
||||||
findmnt_LDADD = $(ul_libmount_la)
|
findmnt_LDADD = $(ul_libmount_la)
|
||||||
findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||||
findmnt_SOURCES = findmnt.c \
|
findmnt_SOURCES = \
|
||||||
$(top_srcdir)/lib/tt.c \
|
findmnt.c \
|
||||||
$(top_srcdir)/lib/mbsalign.c \
|
$(top_srcdir)/lib/mbsalign.c \
|
||||||
$(top_srcdir)/lib/strutils.c
|
$(top_srcdir)/lib/strutils.c \
|
||||||
|
$(top_srcdir)/lib/tt.c
|
||||||
|
|
||||||
if !HAVE_LANGINFO
|
if !HAVE_LANGINFO
|
||||||
findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c
|
findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c
|
||||||
endif
|
endif
|
||||||
endif # BUILD_LIBMOUNT
|
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
|
if !HAVE_LANGINFO
|
||||||
cal_SOURCES += $(top_srcdir)/lib/langinfo.c
|
cal_SOURCES += $(top_srcdir)/lib/langinfo.c
|
||||||
endif
|
endif
|
||||||
|
@ -116,7 +136,11 @@ endif
|
||||||
|
|
||||||
if BUILD_KILL
|
if BUILD_KILL
|
||||||
bin_PROGRAMS += 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
|
dist_man_MANS += kill.1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -4,26 +4,32 @@ bin_PROGRAMS = mount umount
|
||||||
dist_man_MANS = fstab.5 mount.8 umount.8
|
dist_man_MANS = fstab.5 mount.8 umount.8
|
||||||
|
|
||||||
# generic sources for all programs (mount, umount)
|
# 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
|
# generic header for mount and umount
|
||||||
hdrs_mount = fstab.h mount_mntent.h mount_constants.h getusername.h
|
hdrs_mount = fstab.h mount_mntent.h mount_constants.h getusername.h
|
||||||
|
|
||||||
# generic sources for mount and umount
|
# generic sources for mount and umount
|
||||||
srcs_mount = $(srcs_common) $(hdrs_mount) \
|
srcs_mount = \
|
||||||
fstab.c \
|
$(srcs_common) \
|
||||||
mount_mntent.c \
|
$(hdrs_mount) \
|
||||||
getusername.c \
|
devname.c \
|
||||||
devname.c devname.h \
|
devname.h \
|
||||||
$(top_srcdir)/lib/env.c \
|
fstab.c \
|
||||||
$(top_srcdir)/lib/linux_version.c \
|
getusername.c \
|
||||||
$(top_srcdir)/lib/blkdev.c \
|
mount_mntent.c \
|
||||||
$(top_srcdir)/lib/fsprobe.c \
|
$(top_srcdir)/lib/at.c \
|
||||||
$(top_srcdir)/lib/mangle.c \
|
$(top_srcdir)/lib/blkdev.c \
|
||||||
$(top_srcdir)/lib/at.c \
|
$(top_srcdir)/lib/env.c \
|
||||||
$(top_srcdir)/lib/sysfs.c \
|
$(top_srcdir)/lib/fsprobe.c \
|
||||||
$(top_srcdir)/lib/loopdev.c \
|
$(top_srcdir)/lib/linux_version.c \
|
||||||
$(top_srcdir)/lib/strutils.c
|
$(top_srcdir)/lib/loopdev.c \
|
||||||
|
$(top_srcdir)/lib/mangle.c \
|
||||||
|
$(top_srcdir)/lib/strutils.c \
|
||||||
|
$(top_srcdir)/lib/sysfs.c
|
||||||
|
|
||||||
# generic flags for all programs
|
# generic flags for all programs
|
||||||
# -- note that pkg-config autoconf macros (pkg.m4) does not differentiate
|
# -- 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)
|
cflags_common = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||||
ldflags_static = -all-static
|
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_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
|
||||||
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||||
mount_LDADD = $(ldadd_common)
|
mount_LDADD = $(ldadd_common)
|
||||||
|
@ -83,7 +92,11 @@ endif
|
||||||
|
|
||||||
if !BUILD_LIBMOUNT_MOUNT
|
if !BUILD_LIBMOUNT_MOUNT
|
||||||
noinst_PROGRAMS = mtab_lock_test
|
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)
|
mtab_lock_test_CPPFLAGS = -DMAIN_TEST_MTABLOCK $(AM_CPPFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -92,4 +105,3 @@ if MAKEINSTALL_DO_SETUID
|
||||||
chmod 4755 $(DESTDIR)$(bindir)/mount
|
chmod 4755 $(DESTDIR)$(bindir)/mount
|
||||||
chmod 4755 $(DESTDIR)$(bindir)/umount
|
chmod 4755 $(DESTDIR)$(bindir)/umount
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -4,18 +4,19 @@ usrsbin_exec_PROGRAMS = addpart delpart
|
||||||
dist_man_MANS = addpart.8 delpart.8
|
dist_man_MANS = addpart.8 delpart.8
|
||||||
|
|
||||||
usrsbin_exec_PROGRAMS += partx
|
usrsbin_exec_PROGRAMS += partx
|
||||||
partx_SOURCES = partx.c partx.h \
|
partx_SOURCES = \
|
||||||
$(top_srcdir)/lib/blkdev.c \
|
partx.c \
|
||||||
$(top_srcdir)/lib/sysfs.c \
|
partx.h \
|
||||||
$(top_srcdir)/lib/tt.c \
|
$(top_srcdir)/lib/at.c \
|
||||||
$(top_srcdir)/lib/at.c \
|
$(top_srcdir)/lib/blkdev.c \
|
||||||
$(top_srcdir)/lib/mbsalign.c \
|
$(top_srcdir)/lib/canonicalize.c \
|
||||||
$(top_srcdir)/lib/strutils.c \
|
$(top_srcdir)/lib/linux_version.c \
|
||||||
$(top_srcdir)/lib/canonicalize.c \
|
$(top_srcdir)/lib/loopdev.c \
|
||||||
$(top_srcdir)/lib/loopdev.c \
|
$(top_srcdir)/lib/mbsalign.c \
|
||||||
$(top_srcdir)/lib/linux_version.c
|
$(top_srcdir)/lib/strutils.c \
|
||||||
|
$(top_srcdir)/lib/sysfs.c \
|
||||||
|
$(top_srcdir)/lib/tt.c
|
||||||
|
|
||||||
partx_CFLAGS = -I$(ul_libblkid_incdir)
|
partx_CFLAGS = -I$(ul_libblkid_incdir)
|
||||||
partx_LDADD = $(ul_libblkid_la)
|
partx_LDADD = $(ul_libblkid_la)
|
||||||
dist_man_MANS += partx.8
|
dist_man_MANS += partx.8
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,9 @@ endif
|
||||||
|
|
||||||
if BUILD_TASKSET
|
if BUILD_TASKSET
|
||||||
usrbin_exec_PROGRAMS += 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
|
dist_man_MANS += taskset.1
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -2,11 +2,23 @@ include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
bin_PROGRAMS =
|
bin_PROGRAMS =
|
||||||
sbin_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
|
usrsbin_exec_PROGRAMS = readprofile
|
||||||
|
|
||||||
dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
|
dist_man_MANS = \
|
||||||
readprofile.8
|
flock.1 \
|
||||||
|
ipcmk.1 \
|
||||||
|
ipcrm.1 \
|
||||||
|
ipcs.1 \
|
||||||
|
readprofile.8 \
|
||||||
|
renice.1 \
|
||||||
|
setsid.1
|
||||||
|
|
||||||
if LINUX
|
if LINUX
|
||||||
#
|
#
|
||||||
|
@ -18,8 +30,16 @@ sbin_PROGRAMS += ctrlaltdel fsfreeze fstrim
|
||||||
usrbin_exec_PROGRAMS += cytune setarch
|
usrbin_exec_PROGRAMS += cytune setarch
|
||||||
usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake
|
usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake
|
||||||
|
|
||||||
dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
|
dist_man_MANS += \
|
||||||
ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
|
ctrlaltdel.8 \
|
||||||
|
cytune.8 \
|
||||||
|
dmesg.1 \
|
||||||
|
fsfreeze.8 \
|
||||||
|
fstrim.8 \
|
||||||
|
ldattach.8 \
|
||||||
|
rtcwake.8 \
|
||||||
|
setarch.8 \
|
||||||
|
tunelp.8
|
||||||
endif # LINUX
|
endif # LINUX
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,14 +47,15 @@ if BUILD_LOSETUP
|
||||||
sbin_PROGRAMS += losetup
|
sbin_PROGRAMS += losetup
|
||||||
dist_man_MANS += losetup.8
|
dist_man_MANS += losetup.8
|
||||||
|
|
||||||
losetup_SOURCES = losetup.c \
|
losetup_SOURCES = \
|
||||||
$(top_srcdir)/lib/linux_version.c \
|
losetup.c \
|
||||||
$(top_srcdir)/lib/at.c \
|
$(top_srcdir)/lib/at.c \
|
||||||
$(top_srcdir)/lib/sysfs.c \
|
$(top_srcdir)/lib/canonicalize.c \
|
||||||
$(top_srcdir)/lib/loopdev.c \
|
$(top_srcdir)/lib/linux_version.c \
|
||||||
$(top_srcdir)/lib/canonicalize.c \
|
$(top_srcdir)/lib/loopdev.c \
|
||||||
$(top_srcdir)/lib/xgetpass.c \
|
$(top_srcdir)/lib/strutils.c \
|
||||||
$(top_srcdir)/lib/strutils.c
|
$(top_srcdir)/lib/sysfs.c \
|
||||||
|
$(top_srcdir)/lib/xgetpass.c
|
||||||
|
|
||||||
if HAVE_STATIC_LOSETUP
|
if HAVE_STATIC_LOSETUP
|
||||||
bin_PROGRAMS += losetup.static
|
bin_PROGRAMS += losetup.static
|
||||||
|
@ -47,9 +68,11 @@ endif # BUILD_LOSETUP
|
||||||
if BUILD_PRLIMIT
|
if BUILD_PRLIMIT
|
||||||
usrbin_exec_PROGRAMS += prlimit
|
usrbin_exec_PROGRAMS += prlimit
|
||||||
dist_man_MANS += prlimit.1
|
dist_man_MANS += prlimit.1
|
||||||
prlimit_SOURCES = prlimit.c $(top_srcdir)/lib/strutils.c \
|
prlimit_SOURCES = \
|
||||||
$(top_srcdir)/lib/mbsalign.c \
|
prlimit.c \
|
||||||
$(top_srcdir)/lib/tt.c
|
$(top_srcdir)/lib/mbsalign.c \
|
||||||
|
$(top_srcdir)/lib/strutils.c \
|
||||||
|
$(top_srcdir)/lib/tt.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -61,10 +84,11 @@ if BUILD_NEW_MOUNT
|
||||||
bin_PROGRAMS += mount umount
|
bin_PROGRAMS += mount umount
|
||||||
dist_man_MANS += mount.8 ../mount/fstab.5 ../mount/umount.8
|
dist_man_MANS += mount.8 ../mount/fstab.5 ../mount/umount.8
|
||||||
|
|
||||||
mount_SOURCES = mount.c \
|
mount_SOURCES = \
|
||||||
$(top_srcdir)/lib/env.c \
|
mount.c \
|
||||||
$(top_srcdir)/lib/xgetpass.c \
|
$(top_srcdir)/lib/env.c \
|
||||||
$(top_srcdir)/lib/strutils.c
|
$(top_srcdir)/lib/strutils.c \
|
||||||
|
$(top_srcdir)/lib/xgetpass.c
|
||||||
|
|
||||||
mount_LDADD = $(ul_libmount_la) $(SELINUX_LIBS)
|
mount_LDADD = $(ul_libmount_la) $(SELINUX_LIBS)
|
||||||
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||||
|
@ -97,12 +121,13 @@ if BUILD_SWAPON
|
||||||
sbin_PROGRAMS += swapon
|
sbin_PROGRAMS += swapon
|
||||||
dist_man_MANS += swapoff.8 swapon.8
|
dist_man_MANS += swapoff.8 swapon.8
|
||||||
|
|
||||||
swapon_SOURCES = swapon.c \
|
swapon_SOURCES = \
|
||||||
$(top_srcdir)/lib/linux_version.c \
|
swapon.c \
|
||||||
$(top_srcdir)/lib/blkdev.c \
|
$(top_srcdir)/lib/blkdev.c \
|
||||||
$(top_srcdir)/lib/fsprobe.c \
|
$(top_srcdir)/lib/canonicalize.c \
|
||||||
$(top_srcdir)/lib/canonicalize.c \
|
$(top_srcdir)/lib/fsprobe.c \
|
||||||
$(top_srcdir)/lib/mangle.c
|
$(top_srcdir)/lib/linux_version.c \
|
||||||
|
$(top_srcdir)/lib/mangle.c
|
||||||
|
|
||||||
swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||||
swapon_LDADD = $(ul_libblkid_la)
|
swapon_LDADD = $(ul_libblkid_la)
|
||||||
|
@ -110,22 +135,30 @@ endif
|
||||||
|
|
||||||
if BUILD_LSCPU
|
if BUILD_LSCPU
|
||||||
usrbin_exec_PROGRAMS += lscpu
|
usrbin_exec_PROGRAMS += lscpu
|
||||||
lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \
|
lscpu_SOURCES = \
|
||||||
$(top_srcdir)/lib/strutils.c \
|
lscpu.c \
|
||||||
$(top_srcdir)/lib/mbsalign.c \
|
$(top_srcdir)/lib/cpuset.c \
|
||||||
$(top_srcdir)/lib/tt.c \
|
$(top_srcdir)/lib/mbsalign.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
|
dist_man_MANS += lscpu.1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_CHCPU
|
if BUILD_CHCPU
|
||||||
sbin_PROGRAMS += chcpu
|
sbin_PROGRAMS += chcpu
|
||||||
chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \
|
chcpu_SOURCES = \
|
||||||
$(top_srcdir)/lib/path.c
|
chcpu.c \
|
||||||
|
$(top_srcdir)/lib/cpuset.c \
|
||||||
|
$(top_srcdir)/lib/path.c
|
||||||
dist_man_MANS += chcpu.8
|
dist_man_MANS += chcpu.8
|
||||||
endif
|
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
|
tunelp_SOURCES = tunelp.c lp.h
|
||||||
fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
|
fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
|
||||||
rtcwake_SOURCES = rtcwake.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 \
|
for I in $(SETARCH_LINKS); do \
|
||||||
rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
|
rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,11 @@ include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
SUBDIRS = helpers
|
SUBDIRS = helpers
|
||||||
|
|
||||||
EXTRA_DIST = expected \
|
EXTRA_DIST = \
|
||||||
ts \
|
expected \
|
||||||
functions.sh \
|
functions.sh \
|
||||||
run.sh
|
run.sh \
|
||||||
|
ts
|
||||||
|
|
||||||
distclean-local:
|
distclean-local:
|
||||||
rm -rf output diff
|
rm -rf output diff
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
include $(top_srcdir)/config/include-Makefile.am
|
include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
noinst_PROGRAMS = test_sysinfo test_pathnames test_byteswap \
|
noinst_PROGRAMS = \
|
||||||
test_md5
|
test_byteswap \
|
||||||
|
test_md5 \
|
||||||
|
test_pathnames \
|
||||||
|
test_sysinfo
|
||||||
|
|
||||||
test_md5_SOURCES = test_md5.c $(top_srcdir)/lib/md5.c
|
test_md5_SOURCES = test_md5.c $(top_srcdir)/lib/md5.c
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
include $(top_srcdir)/config/include-Makefile.am
|
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
|
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
|
colrm_SOURCES = colrm.c $(top_srcdir)/lib/strutils.c
|
||||||
|
|
||||||
hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c parse.c \
|
hexdump_SOURCES = \
|
||||||
hexdump.h $(top_srcdir)/lib/strutils.c
|
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
|
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
|
if BUILD_LINE
|
||||||
usrbin_exec_PROGRAMS += line
|
usrbin_exec_PROGRAMS += line
|
||||||
|
|
Loading…
Reference in New Issue