Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kjartan Maraas <kmaraas@gnome.org> |
| 3 | Date: Tue, 14 May 2013 13:29:53 +0200 |
| 4 | Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Upstream-Status: Backport [1] |
| 10 | |
| 11 | [1] https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75 |
| 12 | |
| 13 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 14 | --- |
| 15 | test/everything/Makefile.am | 4 ++-- |
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am |
| 19 | index 32beb36..cb4b1d6 100644 |
| 20 | --- a/test/everything/Makefile.am |
| 21 | +++ b/test/everything/Makefile.am |
| 22 | @@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \ |
| 23 | $(EVERYTHING_BUILT) \ |
| 24 | everything-imodule.c |
| 25 | |
| 26 | -INCLUDES = \ |
| 27 | +AM_CPPFLAGS = \ |
| 28 | -I$(top_srcdir)/include \ |
| 29 | -I$(top_builddir)/include \ |
| 30 | -I$(top_builddir)/src \ |
| 31 | @@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared |
| 32 | BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c |
| 33 | CLEANFILES = ${BUILT_SOURCES} iorfile |
| 34 | |
| 35 | -TESTS = $(srcdir)/test.sh |
| 36 | +TESTS = $(top_builddir)/test/everything/test.sh |
| 37 | |
| 38 | EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) |
| 39 | |
| 40 | -- |
| 41 | 1.8.3.1 |
| 42 | |