From add0b02ee08a069b0d41d49d440ee1cee8161719 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 15 Jun 2011 14:25:43 +0100 Subject: [PATCH] test/name-test: use AM_CPPFLAGS instead of INCLUDES --- test/name-test/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index f4754f393..574879f1d 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -1,4 +1,9 @@ -INCLUDES=-I$(top_srcdir) -DDBUS_COMPILATION +# Everything in this directory is statically-linked to libdbus-internal +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DDBUS_COMPILATION \ + -DDBUS_STATIC_BUILD \ + $(NULL) # if assertions are enabled, improve backtraces AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ @@ -21,7 +26,6 @@ if DBUS_BUILD_TESTS ## build even when not doing "make check" noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-threads-init test-ids test-shutdown test-privserver test-privserver-client test-autolaunch -AM_CPPFLAGS = -DDBUS_STATIC_BUILD test_pending_call_dispatch_SOURCES = \ test-pending-call-dispatch.c -- 2.47.3