[PATCH XTS 4/7] Fix out-of-tree builds.

[Peter Hutterer]

Prefix relative paths in makefiles with $(srcdir).

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/tet3/apilib/Makefile.am   |    2 +-
 src/tet3/apishlib/Makefile.am |    2 +-
 src/tet3/dtet2lib/Makefile.am |    2 +-
 src/tet3/inetlib/Makefile.am  |    2 +-
 src/tet3/servlib/Makefile.am  |    2 +-
 src/tet3/tcc/Makefile.am      |    2 +-
 src/tet3/tcclib/Makefile.am   |    2 +-
 src/tet3/tcm/Makefile.am      |    2 +-
 xts5/Xlib14/Makefile.am       |    2 +-
 xts5/Xlib4/Makefile.am        |    2 +-
 xts5/Xlib9/Makefile.am        |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/tet3/apilib/Makefile.am b/src/tet3/apilib/Makefile.am
index bf5179e..4c38405 100644
--- a/src/tet3/apilib/Makefile.am
+++ b/src/tet3/apilib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 
 # libapi_s is the shared portion of the library
 xtslibdir = $(libexecdir)/xts5
diff --git a/src/tet3/apishlib/Makefile.am b/src/tet3/apishlib/Makefile.am
index 21a20c5..61ff6e6 100644
--- a/src/tet3/apishlib/Makefile.am
+++ b/src/tet3/apishlib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 noinst_LIBRARIES = libapi.a
 libapi_a_SOURCES = \
 		dcancel.c \
diff --git a/src/tet3/dtet2lib/Makefile.am b/src/tet3/dtet2lib/Makefile.am
index 594ed76..e937e18 100644
--- a/src/tet3/dtet2lib/Makefile.am
+++ b/src/tet3/dtet2lib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 noinst_LTLIBRARIES = libdtet2.la
 libdtet2_la_SOURCES = \
 		addarg.c \
diff --git a/src/tet3/inetlib/Makefile.am b/src/tet3/inetlib/Makefile.am
index 56bed72..5b72733 100644
--- a/src/tet3/inetlib/Makefile.am
+++ b/src/tet3/inetlib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 noinst_LIBRARIES = libapi.a
 libapi_a_SOURCES = \
 		accept.c \
diff --git a/src/tet3/servlib/Makefile.am b/src/tet3/servlib/Makefile.am
index 7c3f78a..8d7f47b 100644
--- a/src/tet3/servlib/Makefile.am
+++ b/src/tet3/servlib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 noinst_LIBRARIES = libapi.a
 libapi_a_SOURCES = \
 		cloop.c \
diff --git a/src/tet3/tcc/Makefile.am b/src/tet3/tcc/Makefile.am
index 2e5a263..e72ce9f 100644
--- a/src/tet3/tcc/Makefile.am
+++ b/src/tet3/tcc/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include \
 	-DDEFAULT_TET_ROOT='"$(DEFAULT_TET_ROOT)"' \
 	-DDEFAULT_TET_EXEC_ROOT='"$(DEFAULT_TET_EXEC_ROOT)"'
 bin_PROGRAMS = tcc
diff --git a/src/tet3/tcclib/Makefile.am b/src/tet3/tcclib/Makefile.am
index e256b99..9e3fec1 100644
--- a/src/tet3/tcclib/Makefile.am
+++ b/src/tet3/tcclib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 noinst_LTLIBRARIES = libtcc.la
 libtcc_la_LIBADD = ../apilib/libapi.la ../apilib/libapi_s.la
 libtcc_la_SOURCES = \
diff --git a/src/tet3/tcm/Makefile.am b/src/tet3/tcm/Makefile.am
index e68f156..df9d6ce 100644
--- a/src/tet3/tcm/Makefile.am
+++ b/src/tet3/tcm/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/../inc -I$(top_srcdir)/include
 
 # libtcm_s is the shared part of the library pulled into libapi_s.
 # libtcmmain and libtcmchild basically provide main() for tests or their
diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am
index c804d09..b61e5b5 100644
--- a/xts5/Xlib14/Makefile.am
+++ b/xts5/Xlib14/Makefile.am
@@ -65,4 +65,4 @@ tprogs = \
 	XwcTextExtents
 
 # Data files for test programs
-nobase_testprog_DATA = */*.dat
+nobase_testprog_DATA = $(srcdir)/*/*.dat
diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am
index c5d0b08..84f5171 100644
--- a/xts5/Xlib4/Makefile.am
+++ b/xts5/Xlib4/Makefile.am
@@ -48,4 +48,4 @@ tprogs = \
 	XVisualIDFromVisual
 
 # Data files for test programs
-nobase_testprog_DATA = */*.dat
+nobase_testprog_DATA = $(srcdir)/*/*.dat
diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am
index efdd92d..b2c9512 100644
--- a/xts5/Xlib9/Makefile.am
+++ b/xts5/Xlib9/Makefile.am
@@ -65,4 +65,4 @@ tprogs = \
 	XUnloadFont
 
 # Data files for test programs
-nobase_testprog_DATA = */*.dat
+nobase_testprog_DATA = $(srcdir)/*/*.dat
-- 
1.7.1