diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-08-07 14:58:13 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-08-07 16:45:51 -0500 |
| commit | 8f956f737622626965ca03c889a65c25b3f8ee37 (patch) | |
| tree | dca0312602cc0004bcf8ca21778c98f956dabc8c /tests | |
| parent | 2fe0a712ddf2706ceb9b4776d5a2e8b0fca2d716 (diff) | |
| download | epiphany-8f956f737622626965ca03c889a65c25b3f8ee37.tar.gz | |
build: Handle dependencies more explicitly
Also, to make this commit more confusing, make several style adjustments
in the Automake files.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6de4240c5..d581b1f94 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -89,33 +89,35 @@ test-report perf-report full-report: ${TEST_PROGS} check-local: test-nonrecursive AM_CPPFLAGS = \ - -I$(top_srcdir)/embed \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/history \ - -I$(top_srcdir)/lib/widgets \ - -I$(top_builddir)/lib/widgets \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/bookmarks + -I$(top_srcdir)/embed \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/lib/history \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_builddir)/lib/widgets \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/bookmarks \ + -DTEST_DIR=\"$(srcdir)\" AM_CFLAGS = \ - -DTEST_DIR=\"$(srcdir)\"\ - $(DEPENDENCIES_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ - $(WARN_CFLAGS) - -AM_LDFLAGS = $(WARN_LDFLAGS) + $(GDK_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(WARN_CFLAGS) \ + $(WEBKIT2GTK_CFLAGS) + +AM_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(WARN_LDFLAGS) LDADD = \ $(top_builddir)/src/libephymain.la \ - $(top_builddir)/src/bookmarks/libephybookmarks.la \ - $(top_builddir)/embed/libephyembed.la \ - $(top_builddir)/lib/widgets/libephywidgets.la \ - $(top_builddir)/lib/history/libephyhistory.la \ - $(top_builddir)/lib/libephymisc.la \ - $(top_builddir)/lib/egg/libegg.la \ - $(DBUS_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(DEPENDENCIES_LIBS) + $(GDK_LIBS) \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ + $(LIBSOUP_LIBS) \ + $(WEBKIT2GTK_LIBS) test_ephy_bookmarks_SOURCES = \ ephy-bookmarks-test.c |