Add subdir-objects automake option where it is needed

* src/Makefile.am: Add the subdir-object automake option here.
	Do not specify absolute paths for the input files as Automake now
	takes care of that just fine.
	* tests/Makefile.am: Likewise.
	* tools/Makefile.am: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Signed-off-by: Dodji Seketeli <dodji@seketeli.org>
This commit is contained in:
Dodji Seketeli 2014-06-23 14:23:04 +02:00
parent e4ad1ea740
commit a8285b1f9c
3 changed files with 41 additions and 37 deletions

View File

@ -1,24 +1,26 @@
AUTOMAKE_OPTIONS=subdir-objects
h=$(abs_srcdir)
lib_LTLIBRARIES=libabigail.la
libabigaildir=$(libdir)
libabigail_la_SOURCES = $(headers) \
$(h)/abg-traverse.cc \
$(h)/abg-ir.cc \
$(h)/abg-corpus.cc \
$(h)/abg-diff-utils.cc \
$(h)/abg-comparison.cc \
$(h)/abg-comp-filter.cc \
$(h)/abg-reader.cc \
$(h)/abg-dwarf-reader.cc \
$(h)/abg-libxml-utils.cc \
$(h)/abg-libzip-utils.cc \
$(h)/abg-hash.cc \
$(h)/abg-writer.cc \
$(h)/abg-config.cc \
$(h)/abg-viz-common.cc \
$(h)/abg-viz-dot.cc \
$(h)/abg-viz-svg.cc
abg-traverse.cc \
abg-ir.cc \
abg-corpus.cc \
abg-diff-utils.cc \
abg-comparison.cc \
abg-comp-filter.cc \
abg-reader.cc \
abg-dwarf-reader.cc \
abg-libxml-utils.cc \
abg-libzip-utils.cc \
abg-hash.cc \
abg-writer.cc \
abg-config.cc \
abg-viz-common.cc \
abg-viz-dot.cc \
abg-viz-svg.cc
libabigail_la_LDFLAGS=@DEPS_LIBS@ -Wl,--as-needed

View File

@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS=subdir-objects
h=$(abs_srcdir)
TESTS= \
@ -27,40 +29,40 @@ libtestutils_la_CXXFLAGS= \
-DABIGAIL_SRC_DIR=\"${abs_top_srcdir}\" \
-DABIGAIL_BUILD_DIR=\"${abs_top_builddir}\"
runtestreadwrite_SOURCES=$(h)/test-read-write.cc
runtestreadwrite_SOURCES=test-read-write.cc
runtestreadwrite_LDADD=libtestutils.la $(top_builddir)/src/libabigail.la
runtestwritereadarchive_SOURCES=$(h)/test-write-read-archive.cc
runtestwritereadarchive_SOURCES=test-write-read-archive.cc
runtestwritereadarchive_LDADD= libtestutils.la $(top_builddir)/src/libabigail.la $(top_builddir)/tools/libtoolsutils.la
runtestreaddwarf_SOURCES=$(h)/test-read-dwarf.cc
runtestreaddwarf_SOURCES=test-read-dwarf.cc
runtestreaddwarf_LDADD=libtestutils.la $(top_builddir)/src/libabigail.la
runtestlookupsyms_SOURCES=$(h)/test-lookup-syms.cc
runtestlookupsyms_SOURCES=test-lookup-syms.cc
runtestlookupsyms_LDADD=libtestutils.la $(top_builddir)/src/libabigail.la
runtestcorediff_SOURCES=$(h)/test-core-diff.cc
runtestcorediff_SOURCES=test-core-diff.cc
runtestcorediff_LDADD=libtestutils.la $(top_builddir)/src/libabigail.la
runtestbidiff_SOURCES = $(h)/test-bidiff.cc
runtestbidiff_SOURCES = test-bidiff.cc
runtestbidiff_LDADD = libtestutils.la $(top_builddir)/src/libabigail.la
runtestdiffdwarf_SOURCES = $(h)/test-diff-dwarf.cc
runtestdiffdwarf_SOURCES = test-diff-dwarf.cc
runtestdiffdwarf_LDADD = libtestutils.la $(top_builddir)/src/libabigail.la
runtestdifffilter_SOURCES = $(h)/test-diff-filter.cc
runtestdifffilter_SOURCES = test-diff-filter.cc
runtestdifffilter_LDADD = libtestutils.la $(top_builddir)/src/libabigail.la
runtestsvg_SOURCES=$(h)/test-svg.cc
runtestsvg_SOURCES=test-svg.cc
runtestsvg_LDADD=$(top_builddir)/src/libabigail.la
runtestdot_SOURCES=$(h)/test-dot.cc
runtestdot_SOURCES=test-dot.cc
runtestdot_LDADD=$(top_builddir)/src/libabigail.la
testirwalker_SOURCES=$(h)/test-ir-walker.cc
testirwalker_SOURCES=test-ir-walker.cc
testirwalker_LDADD=$(top_builddir)/src/libabigail.la
testdiff2_SOURCES=$(h)/test-diff2.cc
testdiff2_SOURCES=test-diff2.cc
testdiff2_LDADD=$(top_builddir)/src/libabigail.la
AM_CPPFLAGS=-I${abs_top_srcdir}/include \

View File

@ -1,35 +1,35 @@
AUTOMAKE_OPTIONS=subdir-objects
h=$(abs_srcdir)
noinst_LTLIBRARIES = libtoolsutils.la
libtoolsutils_la_SOURCES= \
$(h)/abg-tools-utils.h \
$(h)/abg-tools-utils.cc
abg-tools-utils.h \
abg-tools-utils.cc
bin_PROGRAMS = biar bidiff bilint bidw bisym
biar_SOURCES = $(h)/biar.cc
biar_SOURCES = biar.cc
biardir = $(bindir)
biar_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
biar_DEPENDENCIES = libtoolsutils.la
bidiff_SOURCES = $(h)/bidiff.cc
bidiff_SOURCES = bidiff.cc
bidiffdir = $(bindir)
bidiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
bidiff_DEPENDENCIES = libtoolsutils.la
bilint_SOURCES = $(h)/bilint.cc
bilint_SOURCES = bilint.cc
bilintdir = $(bindir)
bilint_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
bilint_DEPENDENCIES = libtoolsutils.la
bidw_SOURCES = $(h)/bidw.cc
bidw_SOURCES = bidw.cc
bidwdir = $(bindir)
bidw_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
bidw_DEPENDENCIES = libtoolsutils.la
bisym_SOURCES = $(h)/bisym.cc
bisym_SOURCES = bisym.cc
bisymdir = $(bindir)
bisym_LDFLAGS = $(abs_top_builddir)/src/libabigail.la