summaryrefslogtreecommitdiffstats
path: root/libblkid
diff options
context:
space:
mode:
authorSami Kerola2012-02-08 09:51:34 +0100
committerKarel Zak2012-02-28 13:29:35 +0100
commitf06b43285da105a1c0634b3ff0158fc93067c8f1 (patch)
tree25cf9e60253c10ec905e27b24a54108074835637 /libblkid
parentbuild-sys: remove unused function and header checks (diff)
downloadkernel-qcow2-util-linux-f06b43285da105a1c0634b3ff0158fc93067c8f1.tar.gz
kernel-qcow2-util-linux-f06b43285da105a1c0634b3ff0158fc93067c8f1.tar.xz
kernel-qcow2-util-linux-f06b43285da105a1c0634b3ff0158fc93067c8f1.zip
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>
Diffstat (limited to 'libblkid')
-rw-r--r--libblkid/Makefile.am1
-rw-r--r--libblkid/samples/Makefile.am7
-rw-r--r--libblkid/src/Makefile.am86
-rw-r--r--libblkid/src/partitions/Makefile.am33
-rw-r--r--libblkid/src/superblocks/Makefile.am92
-rw-r--r--libblkid/src/topology/Makefile.am18
6 files changed, 138 insertions, 99 deletions
diff --git a/libblkid/Makefile.am b/libblkid/Makefile.am
index 27f1033f8..1fcd5bfae 100644
--- a/libblkid/Makefile.am
+++ b/libblkid/Makefile.am
@@ -13,4 +13,3 @@ pkgconfig_DATA = blkid.pc
dist_man_MANS = libblkid.3
EXTRA_DIST = blkid.pc.in libblkid.3
-
diff --git a/libblkid/samples/Makefile.am b/libblkid/samples/Makefile.am
index 93588d57d..c6314a7db 100644
--- a/libblkid/samples/Makefile.am
+++ b/libblkid/samples/Makefile.am
@@ -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
diff --git a/libblkid/src/Makefile.am b/libblkid/src/Makefile.am
index 543f2f629..478625029 100644
--- a/libblkid/src/Makefile.am
+++ b/libblkid/src/Makefile.am
@@ -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 \
- $(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/sysfs.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)/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
-libblkid_la_LIBADD = superblocks/libblkid_superblocks.la \
- topology/libblkid_topology.la \
- partitions/libblkid_partitions.la \
- $(common_ldadd)
+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 \
- -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
+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_evaluate
+ test_read \
+ test_resolve \
+ test_save \
+ test_tag \
+ test_verify
EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
CLEANFILES = $(tests)
diff --git a/libblkid/src/partitions/Makefile.am b/libblkid/src/partitions/Makefile.am
index f617389d8..300bf32e0 100644
--- a/libblkid/src/partitions/Makefile.am
+++ b/libblkid/src/partitions/Makefile.am
@@ -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 \
- aix.c \
- aix.h \
- bsd.c \
- unixware.c \
- solaris_x86.c \
- sun.c \
- sgi.c \
- mac.c \
- dos.c \
- dos.h \
- minix.c \
- ultrix.c \
- gpt.c
+libblkid_partitions_la_SOURCES = \
+ aix.c \
+ aix.h \
+ blkid_parttypes.h \
+ bsd.c \
+ dos.c \
+ dos.h \
+ gpt.c \
+ mac.c \
+ minix.c \
+ partitions.c \
+ partitions.h \
+ sgi.c \
+ solaris_x86.c \
+ sun.c \
+ ultrix.c \
+ unixware.c
diff --git a/libblkid/src/superblocks/Makefile.am b/libblkid/src/superblocks/Makefile.am
index 73a9b287f..e2867a7c1 100644
--- a/libblkid/src/superblocks/Makefile.am
+++ b/libblkid/src/superblocks/Makefile.am
@@ -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 \
- bfs.c \
- drbd.c \
- drbdproxy_datalog.c \
- vmfs.c \
- befs.c \
- nilfs.c \
- exfat.c
+ adaptec_raid.c \
+ befs.c \
+ bfs.c \
+ btrfs.c \
+ cramfs.c \
+ ddf_raid.c \
+ drbd.c \
+ drbdproxy_datalog.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 \
+ 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
diff --git a/libblkid/src/topology/Makefile.am b/libblkid/src/topology/Makefile.am
index 775fea3e0..91959d44a 100644
--- a/libblkid/src/topology/Makefile.am
+++ b/libblkid/src/topology/Makefile.am
@@ -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 \
- topology.h
+libblkid_topology_la_SOURCES = \
+ topology.c \
+ topology.h
if LINUX
-libblkid_topology_la_SOURCES += sysfs.c \
- dm.c \
- lvm.c \
- ioctl.c \
- md.c \
- evms.c
+libblkid_topology_la_SOURCES += \
+ dm.c \
+ evms.c \
+ ioctl.c \
+ lvm.c \
+ md.c \
+ sysfs.c
endif