DEFAULT_INCLUDES is computed by Automake and should not be
overwritten.

-I. is the same as -I$(srcdir)
The generated DEFAULT_INCLUDES = -I. -I$(top_builddir)

Signed-off-by: Gaetan Nadon <[email protected]>
---
 src/Makefile.am |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a162d26..6817ea4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,9 +23,12 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) \
-  -I$(top_srcdir)/src/cim -I$(top_srcdir)/src/gfx \
-  -I$(top_srcdir)/src/panel -I$(top_srcdir)/linux_v26
+
+AM_CPPFLAGS =                  \
+       -I$(top_srcdir)/src/cim \
+       -I$(top_srcdir)/src/gfx \
+       -I$(top_srcdir)/src/panel \
+       -I$(top_srcdir)/linux_v26
 
 # -DPNL_SUP is now provided by AMD_CFLAGS
 #
-- 
1.6.0.4

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to