Skip to content

Commit b40b1f5

Browse files
ptesariksdimitro
authored andcommitted
tests: Remove superfluous automake _SOURCES and reflow Makefile.am
This should make the file easier to read. Signed-off-by: Petr Tesarik <ptesarik@suse.com>
1 parent 605fe33 commit b40b1f5

File tree

1 file changed

+32
-37
lines changed

1 file changed

+32
-37
lines changed

tests/Makefile.am

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,26 @@ check_HEADERS = \
3535
lkcd.h \
3636
testutil.h
3737

38-
addrmap_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
39-
addrxlat_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
40-
41-
attriter_SOURCES = attriter.c
38+
addrmap_LDADD = \
39+
$(top_builddir)/src/addrxlat/libaddrxlat.la
40+
addrxlat_LDADD = \
41+
$(top_builddir)/src/addrxlat/libaddrxlat.la
4242
attriter_LDADD = \
4343
$(LDADD) \
4444
$(top_builddir)/src/kdumpfile/libkdumpfile.la
45-
46-
checkattr_SOURCES = checkattr.c
4745
checkattr_LDADD = \
4846
$(LDADD) \
4947
$(top_builddir)/src/kdumpfile/libkdumpfile.la
50-
51-
clearattr_SOURCES = clearattr.c
5248
clearattr_LDADD = \
5349
$(LDADD) \
5450
$(top_builddir)/src/kdumpfile/libkdumpfile.la
51+
custom_meth_LDADD = \
52+
$(top_builddir)/src/addrxlat/libaddrxlat.la
53+
elf_prstatus_mod_x86_64_LDADD = \
54+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
55+
err_addrxlat_LDADD = \
56+
$(top_builddir)/src/addrxlat/libaddrxlat.la
5557

56-
custom_meth_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
57-
elf_prstatus_mod_x86_64_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
58-
err_addrxlat_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
59-
60-
mkdiskdump_SOURCES = mkdiskdump.c
6158
mkdiskdump_CFLAGS = \
6259
$(ZLIB_CFLAGS) \
6360
$(LZO_CFLAGS) \
@@ -68,45 +65,43 @@ mkdiskdump_LDADD = \
6865
$(LZO_LIBS) \
6966
$(SNAPPY_LIBS)
7067

71-
mkelf_SOURCES = mkelf.c
72-
73-
mklkcd_SOURCES = mklkcd.c
7468
mklkcd_CFLAGS = \
7569
$(ZLIB_CFLAGS)
7670
mklkcd_LDADD = \
7771
$(LDADD) \
7872
$(ZLIB_LIBS)
7973

80-
dumpdata_SOURCES = dumpdata.c
81-
dumpdata_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
82-
83-
multiread_SOURCES = multiread.c
84-
multiread_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
85-
86-
multixlat_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
87-
nometh_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
88-
89-
subattr_SOURCES = subattr.c
90-
subattr_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
91-
74+
dumpdata_LDADD = \
75+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
76+
multiread_LDADD = \
77+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
78+
multixlat_LDADD = \
79+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
80+
nometh_LDADD = \
81+
$(top_builddir)/src/addrxlat/libaddrxlat.la
82+
subattr_LDADD = \
83+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
9284
sys_xlat_LDADD = \
9385
$(LDADD) \
9486
$(top_builddir)/src/addrxlat/libaddrxlat.la
95-
96-
thread_errstr_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
97-
typed_attr_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
98-
vmci_cleanup_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
99-
vmci_lines_post_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
100-
vmci_post_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
87+
thread_errstr_LDADD = \
88+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
89+
typed_attr_LDADD = \
90+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
91+
vmci_cleanup_LDADD = \
92+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
93+
vmci_lines_post_LDADD = \
94+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
95+
vmci_post_LDADD = \
96+
$(top_builddir)/src/kdumpfile/libkdumpfile.la
10197
vtop_LDADD = \
10298
$(top_builddir)/src/kdumpfile/libkdumpfile.la \
10399
$(top_builddir)/src/addrxlat/libaddrxlat.la
104100
xlatmap_LDADD = \
105101
$(top_builddir)/src/addrxlat/libaddrxlat.la \
106102
-ldl
107-
xlatop_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
108-
109-
xlat_os_SOURCES = xlat-os.c
103+
xlatop_LDADD = \
104+
$(top_builddir)/src/addrxlat/libaddrxlat.la
110105
xlat_os_LDADD = \
111106
$(LDADD) \
112107
$(top_builddir)/src/addrxlat/libaddrxlat.la

0 commit comments

Comments
 (0)