[gegl/gsoc2011-opencl: 38/46] Changes in Makefiles

[Victor Matheus de Araujo Oliveira <vmaolive src gnome org>]

commit b9a6ba21f88605f51d65555b1f9785a8814c641e
Author: Victor Oliveira <victormatheus gmail com>
Date:   Mon Jun 13 13:53:53 2011 -0300

    Changes in Makefiles
    
    All main makefile.am's include opencl folder
    OPENCL_CFLAGS is not needed

 configure.ac                    |    9 ---------
 gegl/Makefile.am                |    2 +-
 gegl/buffer/Makefile.am         |    2 +-
 gegl/graph/Makefile.am          |    3 ++-
 gegl/module/Makefile.am         |    3 ++-
 gegl/opencl/Makefile.am         |    5 +++--
 gegl/operation/Makefile.am      |    3 ++-
 gegl/process/Makefile.am        |    3 ++-
 gegl/property-types/Makefile.am |    3 ++-
 9 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 82325ce..127e7e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1022,15 +1022,6 @@ AC_SUBST(UMFPACK_CFLAGS)
 AC_SUBST(UMFPACK_LIBS)
 
 #######################
-# OPENCL
-#######################
-
-OPENCL_CFLAGS="$OPENCL_CFLAGS"
-OPENCL_LIBS="$OPENCL_LIBS"
-AC_SUBST(OPENCL_CFLAGS)
-AC_SUBST(OPENCL_LIBS)
-
-#######################
 # Check for other items
 #######################
 
diff --git a/gegl/Makefile.am b/gegl/Makefile.am
index c1ae67e..094307c 100644
--- a/gegl/Makefile.am
+++ b/gegl/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\""$(libdir)"\" \
 	-DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\"
 
-AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) $(OPENCL_CFLAGS)
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 AM_LDFLAGS = \
 	$(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index 6a7b0be..b49a435 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gegl/buffer \
 	-I$(top_srcdir)/gegl/opencl
 
-AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) $(OPENCL_FLAGS)
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 noinst_LTLIBRARIES = libbuffer.la
 
diff --git a/gegl/graph/Makefile.am b/gegl/graph/Makefile.am
index 66cdf66..3948d4d 100644
--- a/gegl/graph/Makefile.am
+++ b/gegl/graph/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/module/Makefile.am b/gegl/module/Makefile.am
index b975094..5281968 100644
--- a/gegl/module/Makefile.am
+++ b/gegl/module/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/buffer \
 	-I$(top_srcdir)/gegl/buffer \
 	-I$(top_builddir)/gegl/property-types \
-	-I$(top_srcdir)/gegl/property-types
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/opencl/Makefile.am b/gegl/opencl/Makefile.am
index 53454d6..b880dcf 100644
--- a/gegl/opencl/Makefile.am
+++ b/gegl/opencl/Makefile.am
@@ -5,9 +5,10 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/opencl
 
-AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) $(OPENCL_CFLAGS)
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 LIBS = $(OPENCL_LIBS)
 
diff --git a/gegl/operation/Makefile.am b/gegl/operation/Makefile.am
index 3c7af66..8dcfebf 100644
--- a/gegl/operation/Makefile.am
+++ b/gegl/operation/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/process/Makefile.am b/gegl/process/Makefile.am
index 8ad6f91..3001eba 100644
--- a/gegl/process/Makefile.am
+++ b/gegl/process/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/property-types/Makefile.am b/gegl/property-types/Makefile.am
index 4d71c4a..d9cba17 100644
--- a/gegl/property-types/Makefile.am
+++ b/gegl/property-types/Makefile.am
@@ -3,7 +3,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl \
 	-I$(top_srcdir)/gegl \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)