diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-15 14:22:42 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:49:07 +0100 |
| commit | 4a7fe6ca53bb42cfd886b1a68b17120353aa7453 (patch) | |
| tree | e3c1e15f880774d5bcc4f960afd7282c8842f83c | |
| parent | 9875480ed476f3c8ff3c7bdc35430342c440633e (diff) | |
| download | dbus-4a7fe6ca53bb42cfd886b1a68b17120353aa7453.tar.gz | |
test: promote GLIB_CFLAGS, DBUS_GLIB_CFLAGS to top level and use AM_CPPFLAGS
INCLUDES is a deprecated way to get the same effect as AM_CPPFLAGS.
It's harmless to add extra -I directories to all the tests, even those
that use neither GLib nor dbus-glib, so we can simplify by setting these
AM_CPPFLAGS for the whole directory.
| -rw-r--r-- | test/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index fd687cd7..977ff663 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,11 @@ SUBDIRS= . name-test DIST_SUBDIRS=name-test -INCLUDES=-I$(top_srcdir) +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(NULL) # improve backtraces from test stuff AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ @@ -135,25 +139,21 @@ TESTS_ENVIRONMENT = \ $(NULL) test_corrupt_SOURCES = corrupt.c -test_corrupt_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) test_corrupt_LDADD = $(top_builddir)/dbus/libdbus-1.la \ $(GLIB_LIBS) \ $(DBUS_GLIB_LIBS) test_loopback_SOURCES = loopback.c -test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \ $(GLIB_LIBS) \ $(DBUS_GLIB_LIBS) test_relay_SOURCES = relay.c -test_relay_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \ $(GLIB_LIBS) \ $(DBUS_GLIB_LIBS) test_dbus_daemon_SOURCES = dbus-daemon.c -test_dbus_daemon_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) test_dbus_daemon_LDADD = $(top_builddir)/dbus/libdbus-1.la \ $(GLIB_LIBS) \ $(DBUS_GLIB_LIBS) @@ -166,7 +166,6 @@ test_dbus_daemon_eavesdrop_LDADD = $(top_builddir)/dbus/libdbus-1.la \ $(DBUS_GLIB_LIBS) test_marshal_SOURCES = marshal.c -test_marshal_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) test_marshal_LDADD = $(top_builddir)/dbus/libdbus-1.la \ $(GLIB_LIBS) \ $(DBUS_GLIB_LIBS) |