Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=46ca47cf...
Commit: 46ca47cf35a03e1d9c57d89b67e84c25a8492a0e
Parent: d99e83f4f60c7e62df5ef6cea4fdc22c1e4bc074
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Sun Mar 29 07:41:14 2015 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Sun Mar 29 07:41:14 2015 +0100
gfs2-utils: Tidy up Makefile.am files
Reorganise the Makefile.am files for ease of maintenance.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
Makefile.am | 37 +++++++++++++++-----
doc/Makefile.am | 17 +++++----
gfs2/Makefile.am | 14 ++++++--
gfs2/convert/Makefile.am | 13 ++++---
gfs2/edit/Makefile.am | 34 +++++++++++++-----
gfs2/fsck/Makefile.am | 44 ++++++++++++++++++-------
gfs2/include/Makefile.am | 8 +++-
gfs2/libgfs2/Makefile.am | 83 +++++++++++++++++++++++++++++++--------------
gfs2/man/Makefile.am | 23 +++++++------
gfs2/mkfs/Makefile.am | 19 ++++++++--
gfs2/scripts/Makefile.am | 6 ++-
gfs2/tune/Makefile.am | 17 +++++----
tests/Makefile.am | 21 +++++++++--
13 files changed, 231 insertions(+), 105 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 963c060..1c4f8ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,35 @@
-EXTRA_DIST = autogen.sh README.build
+EXTRA_DIST = autogen.sh README.build
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
- config.guess config.sub missing install-sh \
- autoheader automake autoconf libtool libtoolize \
- ltmain.sh compile make/clusterautoconfig.h.in \
- make/clusterautoconfig.h.in~
+MAINTAINERCLEANFILES = \
+ Makefile.in \
+ aclocal.m4 \
+ configure \
+ depcomp \
+ config.guess \
+ config.sub \
+ missing \
+ install-sh \
+ autoheader \
+ automake \
+ autoconf \
+ libtool \
+ libtoolize \
+ ltmain.sh \
+ compile \
+ make/clusterautoconfig.h.in \
+ make/clusterautoconfig.h.in~
-noinst_HEADERS = make/copyright.cf
+noinst_HEADERS = make/copyright.cf
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = po gfs2 doc tests
+SUBDIRS = \
+ po \
+ gfs2 \
+ doc \
+ tests
maintainer-clean-local:
rm -rf m4
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 32987b2..cf671d5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,10 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-dist_doc_DATA = gfs2.txt \
- journaling.txt \
- COPYING.applications \
- COPYING.libraries \
- COPYRIGHT \
- README.contributing \
- README.licence
+dist_doc_DATA = \
+ gfs2.txt \
+ journaling.txt \
+ COPYING.applications \
+ COPYING.libraries \
+ COPYRIGHT \
+ README.contributing \
+ README.licence
diff --git a/gfs2/Makefile.am b/gfs2/Makefile.am
index 645119f..028e840 100644
--- a/gfs2/Makefile.am
+++ b/gfs2/Makefile.am
@@ -1,4 +1,12 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = libgfs2 convert edit fsck mkfs man \
- tune include scripts #init.d
+SUBDIRS = \
+ include \
+ libgfs2 \
+ convert \
+ edit \
+ fsck \
+ mkfs \
+ man \
+ tune \
+ scripts
diff --git a/gfs2/convert/Makefile.am b/gfs2/convert/Makefile.am
index eb3c330..30924d7 100644
--- a/gfs2/convert/Makefile.am
+++ b/gfs2/convert/Makefile.am
@@ -1,9 +1,10 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = gfs2_convert
+sbin_PROGRAMS = gfs2_convert
-gfs2_convert_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM \
- -I$(top_srcdir)/gfs2/include \
- -I$(top_srcdir)/gfs2/libgfs2
+gfs2_convert_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -I$(top_srcdir)/gfs2/include \
+ -I$(top_srcdir)/gfs2/libgfs2
-gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
+gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
diff --git a/gfs2/edit/Makefile.am b/gfs2/edit/Makefile.am
index 8b977ae..5d2942e 100644
--- a/gfs2/edit/Makefile.am
+++ b/gfs2/edit/Makefile.am
@@ -1,17 +1,31 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = gfs2_edit
+sbin_PROGRAMS = gfs2_edit
-noinst_HEADERS = gfs2hex.h hexedit.h extended.h journal.h
+noinst_HEADERS = \
+ gfs2hex.h \
+ hexedit.h \
+ extended.h \
+ journal.h
-gfs2_edit_SOURCES = gfs2hex.c hexedit.c savemeta.c extended.c journal.c
+gfs2_edit_SOURCES = \
+ gfs2hex.c \
+ hexedit.c \
+ savemeta.c \
+ extended.c \
+ journal.c
-gfs2_edit_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM \
- -I$(top_srcdir)/gfs2/include \
- -I$(top_srcdir)/gfs2/libgfs2
+gfs2_edit_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -I$(top_srcdir)/gfs2/include \
+ -I$(top_srcdir)/gfs2/libgfs2
-gfs2_edit_CFLAGS = $(ncurses_CFLAGS) $(zlib_CFLAGS)
+gfs2_edit_CFLAGS = \
+ $(ncurses_CFLAGS) \
+ $(zlib_CFLAGS)
-gfs2_edit_LDFLAGS = $(ncurses_LIBS) $(zlib_LIBS)
+gfs2_edit_LDFLAGS = \
+ $(ncurses_LIBS) \
+ $(zlib_LIBS)
-gfs2_edit_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
+gfs2_edit_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
index b34833b..fb93110 100644
--- a/gfs2/fsck/Makefile.am
+++ b/gfs2/fsck/Makefile.am
@@ -1,17 +1,37 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = fsck.gfs2
+sbin_PROGRAMS = fsck.gfs2
-noinst_HEADERS = fsck.h fs_recovery.h \
- inode_hash.h link.h lost_n_found.h metawalk.h util.h
+noinst_HEADERS = \
+ fsck.h \
+ fs_recovery.h \
+ inode_hash.h \
+ link.h \
+ lost_n_found.h \
+ metawalk.h \
+ util.h
-fsck_gfs2_SOURCES = fs_recovery.c initialize.c \
- inode_hash.c link.c lost_n_found.c main.c metawalk.c \
- pass1b.c pass1.c pass1c.c pass2.c pass3.c pass4.c \
- pass5.c rgrepair.c util.c
+fsck_gfs2_SOURCES = \
+ fs_recovery.c \
+ initialize.c \
+ inode_hash.c \
+ link.c \
+ lost_n_found.c \
+ main.c \
+ metawalk.c \
+ pass1b.c \
+ pass1.c \
+ pass1c.c \
+ pass2.c \
+ pass3.c \
+ pass4.c \
+ pass5.c \
+ rgrepair.c \
+ util.c
-fsck_gfs2_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM \
- -I$(top_srcdir)/gfs2/include \
- -I$(top_srcdir)/gfs2/libgfs2
+fsck_gfs2_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -I$(top_srcdir)/gfs2/include \
+ -I$(top_srcdir)/gfs2/libgfs2
-fsck_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
+fsck_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
diff --git a/gfs2/include/Makefile.am b/gfs2/include/Makefile.am
index c755181..fca6f6a 100644
--- a/gfs2/include/Makefile.am
+++ b/gfs2/include/Makefile.am
@@ -1,3 +1,7 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-noinst_HEADERS = osi_list.h osi_tree.h linux_endian.h logging.h
+noinst_HEADERS = \
+ osi_list.h \
+ osi_tree.h \
+ linux_endian.h \
+ logging.h
diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
index 1ce8c13..2b7aa16 100644
--- a/gfs2/libgfs2/Makefile.am
+++ b/gfs2/libgfs2/Makefile.am
@@ -1,29 +1,60 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-CLEANFILES = parser.h parser.c lexer.c lexer.h
-BUILT_SOURCES = parser.h lexer.h
-AM_LFLAGS = --header-file=lexer.h
-AM_YFLAGS = -d
-
-noinst_HEADERS = libgfs2.h lang.h config.h rgrp.h
-
-noinst_LTLIBRARIES = libgfs2.la
-
-noinst_PROGRAMS = gfs2l
-
-libgfs2_la_SOURCES = block_list.c fs_bits.c gfs1.c misc.c rgrp.c super.c \
- buf.c fs_geometry.c gfs2_disk_hash.c ondisk.c config.c \
- device_geometry.c fs_ops.c recovery.c \
- structures.c meta.c lang.c parser.y lexer.l
-
-libgfs2_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 \
- -D_LARGEFILE64_SOURCE \
- -D_GNU_SOURCE \
- -I$(top_srcdir)/gfs2/include
-
-gfs2l_SOURCES = gfs2l.c
-gfs2l_CPPFLAGS = -I$(top_srcdir)/gfs2/include -D_FILE_OFFSET_BITS=64
-gfs2l_LDADD = libgfs2.la
+MAINTAINERCLEANFILES = Makefile.in
+
+CLEANFILES = \
+ parser.h \
+ parser.c \
+ lexer.c \
+ lexer.h
+
+BUILT_SOURCES = \
+ parser.h \
+ lexer.h
+
+AM_LFLAGS = --header-file=lexer.h
+AM_YFLAGS = -d
+
+noinst_HEADERS = \
+ libgfs2.h \
+ lang.h \
+ config.h \
+ rgrp.h
+
+noinst_LTLIBRARIES = libgfs2.la
+
+noinst_PROGRAMS = gfs2l
+
+libgfs2_la_SOURCES = \
+ block_list.c \
+ fs_bits.c \
+ gfs1.c \
+ misc.c \
+ rgrp.c \
+ super.c \
+ buf.c \
+ fs_geometry.c \
+ gfs2_disk_hash.c \
+ ondisk.c \
+ config.c \
+ device_geometry.c \
+ fs_ops.c \
+ recovery.c \
+ structures.c \
+ meta.c \
+ lang.c \
+ parser.y \
+ lexer.l
+
+libgfs2_la_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -D_LARGEFILE64_SOURCE \
+ -D_GNU_SOURCE \
+ -I$(top_srcdir)/gfs2/include
+
+gfs2l_SOURCES = gfs2l.c
+gfs2l_LDADD = libgfs2.la
+gfs2l_CPPFLAGS = \
+ -I$(top_srcdir)/gfs2/include \
+ -D_FILE_OFFSET_BITS=64
# Autotools can't handle header files output by flex so we have to generate it
manually
lexer.h: lexer.l
diff --git a/gfs2/man/Makefile.am b/gfs2/man/Makefile.am
index 82eab9a..d73f1ed 100644
--- a/gfs2/man/Makefile.am
+++ b/gfs2/man/Makefile.am
@@ -1,12 +1,13 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-dist_man_MANS = fsck.gfs2.8 \
- gfs2.5 \
- gfs2_convert.8 \
- gfs2_edit.8 \
- gfs2_grow.8 \
- gfs2_jadd.8 \
- mkfs.gfs2.8 \
- tunegfs2.8 \
- gfs2_lockcapture.8 \
- gfs2_trace.8
+dist_man_MANS = \
+ fsck.gfs2.8 \
+ gfs2.5 \
+ gfs2_convert.8 \
+ gfs2_edit.8 \
+ gfs2_grow.8 \
+ gfs2_jadd.8 \
+ mkfs.gfs2.8 \
+ tunegfs2.8 \
+ gfs2_lockcapture.8 \
+ gfs2_trace.8
diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am
index 475f1a8..6c49d3b 100644
--- a/gfs2/mkfs/Makefile.am
+++ b/gfs2/mkfs/Makefile.am
@@ -7,9 +7,14 @@ COMMON_CPPFLAGS = \
-I$(top_srcdir)/gfs2/include \
-I$(top_srcdir)/gfs2/libgfs2
-sbin_PROGRAMS = mkfs.gfs2 gfs2_jadd gfs2_grow
+sbin_PROGRAMS = \
+ mkfs.gfs2 \
+ gfs2_jadd \
+ gfs2_grow
-noinst_HEADERS = gfs2_mkfs.h metafs.h
+noinst_HEADERS = \
+ gfs2_mkfs.h \
+ metafs.h
mkfs_gfs2_SOURCES = main_mkfs.c
mkfs_gfs2_CPPFLAGS = $(COMMON_CPPFLAGS)
@@ -17,13 +22,19 @@ mkfs_gfs2_CFLAGS = $(blkid_CFLAGS)
mkfs_gfs2_LDFLAGS = $(blkid_LIBS)
mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-gfs2_grow_SOURCES = main_grow.c metafs.c
+gfs2_grow_SOURCES = \
+ main_grow.c \
+ metafs.c
+
gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS)
gfs2_grow_CFLAGS = $(blkid_CFLAGS)
gfs2_grow_LDFLAGS = $(blkid_LIBS)
gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-gfs2_jadd_SOURCES = main_jadd.c metafs.c
+gfs2_jadd_SOURCES = \
+ main_jadd.c \
+ metafs.c
+
gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS)
gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
diff --git a/gfs2/scripts/Makefile.am b/gfs2/scripts/Makefile.am
index 1c98f95..62fb2fe 100644
--- a/gfs2/scripts/Makefile.am
+++ b/gfs2/scripts/Makefile.am
@@ -1,3 +1,5 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-dist_sbin_SCRIPTS = gfs2_lockcapture gfs2_trace
+dist_sbin_SCRIPTS = \
+ gfs2_lockcapture \
+ gfs2_trace
diff --git a/gfs2/tune/Makefile.am b/gfs2/tune/Makefile.am
index 41371bc..c060183 100644
--- a/gfs2/tune/Makefile.am
+++ b/gfs2/tune/Makefile.am
@@ -1,11 +1,14 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = tunegfs2
+sbin_PROGRAMS = tunegfs2
-noinst_HEADERS = tunegfs2.h
+noinst_HEADERS = tunegfs2.h
-tunegfs2_SOURCES = main.c super.c
+tunegfs2_SOURCES = \
+ main.c \
+ super.c
-tunegfs2_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM \
- -I$(top_srcdir)/gfs2/include \
- -I$(top_srcdir)/group/include
+tunegfs2_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -I$(top_srcdir)/gfs2/include \
+ -I$(top_srcdir)/group/include
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3abb640..5a37319 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,14 @@
-EXTRA_DIST = $(TESTSUITE_AT) package.m4 $(TESTSUITE) atlocal atconfig
-DISTCLEANFILES = atlocal atconfig
+EXTRA_DIST = \
+ $(TESTSUITE_AT) \
+ $(TESTSUITE) \
+ package.m4 \
+ atlocal \
+ atconfig
+
+DISTCLEANFILES = \
+ atlocal \
+ atconfig
+
CLEANFILES = testvol
if HAVE_CHECK
@@ -22,12 +31,16 @@ UNIT_CPPFLAGS = \
check_PROGRAMS = $(UNIT_TESTS)
-check_meta_SOURCES = $(UNIT_SOURCES) check_meta.c
+check_meta_SOURCES = \
+ $(UNIT_SOURCES) \
+ check_meta.c
check_meta_CFLAGS = $(UNIT_CFLAGS)
check_meta_LDADD = $(UNIT_LDADD)
check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
-check_rgrp_SOURCES = $(UNIT_SOURCES) check_rgrp.c
+check_rgrp_SOURCES = \
+ $(UNIT_SOURCES) \
+ check_rgrp.c
check_rgrp_CFLAGS = $(UNIT_CFLAGS)
check_rgrp_LDADD = $(UNIT_LDADD)
check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)