Don't include $(includedir) in searchpath, find headers in this source

and in the provided package CFLAGS.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/emotion@16470 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 652395a..30c067f 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS     = 1.4 foreign
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES            = -I$(includedir) \
-                      -I$(top_srcdir) \
+INCLUDES            = -I$(top_srcdir) \
                       -I$(top_srcdir)/src/lib \
                       @my_cflags@
 

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index bba080a..d135bd9 100644 (file)
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -6,8 +6,7 @@ SUBDIRS = xine
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES            = -I$(includedir) \
-                      -I$(top_srcdir) \
+INCLUDES            = -I$(top_srcdir) \
                       -I$(top_srcdir)/src/lib \
                       -I$(top_srcdir)/src/modules \
                       @my_cflags@ @xine_cflags@

diff --git a/src/modules/xine/Makefile.am b/src/modules/xine/Makefile.am
index 561768d..5973490 100644 (file)
--- a/src/modules/xine/Makefile.am
+++ b/src/modules/xine/Makefile.am
@@ -4,8 +4,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES            = -I$(includedir) \
-                      -I$(top_srcdir) \
+INCLUDES            = -I$(top_srcdir) \
                       -I$(top_srcdir)/src/lib \
                       -I$(top_srcdir)/src/modules \
                       -I$(top_srcdir)/src/modules/xine \