From aca46d3f3910bc6ea31f711e46cb4379460cf25a Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Thu, 25 May 2006 19:55:11 +0000
Subject: [PATCH]   * Added -I${top_srcdir} to the compilation flags to fix
 builds configured     from an alternate directory (they failed to find
 common.h).

---
 caca/Makefile.am   | 2 +-
 cucul/Makefile.am  | 1 +
 cxx/Makefile.am    | 2 +-
 kernel/Makefile.am | 1 +
 test/Makefile.am   | 2 +-
 tools/Makefile.am  | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/caca/Makefile.am b/caca/Makefile.am
index 6f6f3d9..d4311a2 100644
--- a/caca/Makefile.am
+++ b/caca/Makefile.am
@@ -26,7 +26,7 @@ libcaca_la_SOURCES = \
 	driver_win32.c \
 	driver_x11.c \
 	$(NULL)
-AM_CPPFLAGS = -I$(top_srcdir)/cucul
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
 libcaca_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@
 libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
 
diff --git a/cucul/Makefile.am b/cucul/Makefile.am
index 1caf70a..27ad318 100644
--- a/cucul/Makefile.am
+++ b/cucul/Makefile.am
@@ -31,6 +31,7 @@ libcucul_la_SOURCES = \
 	import.c \
 	export.c \
 	$(NULL)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
 libcucul_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@
 libcucul_la_LIBADD = 
 
diff --git a/cxx/Makefile.am b/cxx/Makefile.am
index f4bc097..9b60ff7 100644
--- a/cxx/Makefile.am
+++ b/cxx/Makefile.am
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
 
-AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 if USE_CXX
 include_HEADERS = cucul++.h caca++.h
diff --git a/kernel/Makefile.am b/kernel/Makefile.am
index a440373..9b7cc1b 100644
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -13,4 +13,5 @@ libkernel_la_SOURCES = \
 	multiboot.h \
 	$(NULL)
 libkernel_la_LDFLAGS = -no-undefined
+AM_CPPFLAGS = -I$(top_srcdir)
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 47a5388..6593cb2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 noinst_PROGRAMS = colors demo dithering event export font frames gamma hsv input spritedit font2tga text transform truecolor unicode import
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c56603c..d69c378 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 noinst_PROGRAMS = optipal $(pango_programs)