[gegl/gsoc2011-opencl: 3/10] All makefiles include opencl [except docs]

From: Victor Matheus de Araujo Oliveira <vmaolive src gnome org>
To: commits-list gnome org
Cc:
Subject: [gegl/gsoc2011-opencl: 3/10] All makefiles include opencl [except docs]
Date: Sun, 17 Jul 2011 20:07:11 +0000 (UTC)
commit a1a4090d7911491424c01db8249ac5a9330d2c41
Author: Victor Oliveira <victormatheus gmail com>
Date:   Sat Jul 2 00:39:41 2011 -0300

    All makefiles include opencl [except docs]

 bin/Makefile.am                 |    4 +++-
 configure.ac                    |    2 +-
 examples/Makefile.am            |    4 +++-
 gegl/Makefile.am                |    7 +++++--
 gegl/buffer/Makefile.am         |    4 +++-
 gegl/graph/Makefile.am          |    4 +++-
 gegl/module/Makefile.am         |    4 +++-
 gegl/opencl/Makefile.am         |   26 ++++++++++++++++++++++++++
 gegl/operation/Makefile.am      |    4 +++-
 gegl/process/Makefile.am        |    4 +++-
 gegl/property-types/Makefile.am |    4 +++-
 operations/Makefile-common.am   |    6 ++++--
 tests/Makefile.am               |    3 ++-
 tests/buffer/Makefile.am        |    5 ++++-
 tests/simple/Makefile.am        |    4 +++-
 tools/Makefile.am               |    4 +++-
 16 files changed, 72 insertions(+), 17 deletions(-)
---
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 22b972d..c85ecbd 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -13,7 +13,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/operation \
 	-I$(top_srcdir)/gegl/operation \
 	-I$(top_builddir)/gegl/module \
-	-I$(top_srcdir)/gegl/module
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = \
 	$(DEP_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 2f11ab1..5de301a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -964,7 +964,6 @@ AM_CONDITIONAL(HAVE_UMFPACK, test "x$have_umfpack" = "xyes")
 AC_SUBST(UMFPACK_CFLAGS)
 AC_SUBST(UMFPACK_LIBS)
 
-
 #######################
 # Check for other items
 #######################
@@ -1024,6 +1023,7 @@ gegl/module/Makefile
 gegl/operation/Makefile
 gegl/process/Makefile
 gegl/property-types/Makefile
+gegl/opencl/Makefile
 libs/Makefile
 libs/rgbe/Makefile
 operations/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a8e8dec..c29a1dd 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -34,7 +34,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/operation \
 	-I$(top_srcdir)/gegl/operation \
 	-I$(top_builddir)/gegl/module \
-	-I$(top_srcdir)/gegl/module
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
 
diff --git a/gegl/Makefile.am b/gegl/Makefile.am
index 23ef3c9..0b1d1f6 100644
--- a/gegl/Makefile.am
+++ b/gegl/Makefile.am
@@ -9,7 +9,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-SUBDIRS = buffer graph module operation process property-types
+SUBDIRS = buffer graph module operation process property-types opencl
 
 CLEANFILES =
 
@@ -22,6 +22,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/operation \
 	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl \
 	-DLIBDIR=\""$(libdir)"\" \
 	-DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\"
 
@@ -98,7 +100,8 @@ libgegl_ GEGL_API_VERSION@_la_LIBADD = \
 	$(top_builddir)/gegl/operation/liboperation.la		\
 	$(top_builddir)/gegl/graph/libgraph.la			\
 	$(top_builddir)/gegl/process/libprocess.la		\
-	$(top_builddir)/gegl/property-types/libpropertytypes.la
+	$(top_builddir)/gegl/property-types/libpropertytypes.la \
+	$(top_builddir)/gegl/opencl/libcl.la
 
 
 if HAVE_INTROSPECTION
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index 72f3e43..47189ad 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -5,7 +5,9 @@ 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_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/graph/Makefile.am b/gegl/graph/Makefile.am
index 66cdf66..a66702b 100644
--- a/gegl/graph/Makefile.am
+++ b/gegl/graph/Makefile.am
@@ -5,7 +5,9 @@ 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_builddir)/gegl/opencl \
+	-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..f88d8fe 100644
--- a/gegl/module/Makefile.am
+++ b/gegl/module/Makefile.am
@@ -5,7 +5,9 @@ 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_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/opencl/Makefile.am b/gegl/opencl/Makefile.am
new file mode 100644
index 0000000..fc122dc
--- /dev/null
+++ b/gegl/opencl/Makefile.am
@@ -0,0 +1,26 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
+
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
+LIBS = $(OPENCL_LIBS)
+
+noinst_LTLIBRARIES = libcl.la
+
+#libcl_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/cl
+#libcl_public_HEADERS = gegl-cl-init.h
+
+libcl_la_SOURCES = \
+	gegl-cl-init.c \
+	gegl-cl-init.h \
+	gegl-cl-types.h
+
+#libcl_la_SOURCES = $(libcl_sources) $(libcl_public_HEADERS)
diff --git a/gegl/operation/Makefile.am b/gegl/operation/Makefile.am
index 3c7af66..1571f8f 100644
--- a/gegl/operation/Makefile.am
+++ b/gegl/operation/Makefile.am
@@ -5,7 +5,9 @@ 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_builddir)/gegl/opencl \
+	-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..0f1a11c 100644
--- a/gegl/process/Makefile.am
+++ b/gegl/process/Makefile.am
@@ -5,7 +5,9 @@ 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_builddir)/gegl/opencl \
+	-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..1c55205 100644
--- a/gegl/property-types/Makefile.am
+++ b/gegl/property-types/Makefile.am
@@ -3,7 +3,9 @@ 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_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/operations/Makefile-common.am b/operations/Makefile-common.am
index 55bdc54..ab59841 100644
--- a/operations/Makefile-common.am
+++ b/operations/Makefile-common.am
@@ -3,7 +3,7 @@ no_undefined = -no-undefined
 libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la $(BABL_LIBS)
 endif
 
-op_libs = $(DEP_LIBS) $(libgegl)
+op_libs = $(DEP_LIBS) $(libgegl) $(OPENCL_LIBS)
 
 GEGLHEADERS     = $(wildcard $(top_srcdir)/gegl/*.h)\
                   $(wildcard $(top_srcdir)/gegl/buffer/*.h)
@@ -19,7 +19,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/module \
-	-I$(top_srcdir)/gegl/module
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 31eae20..8ac18c4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
 	buffer \
 	compositions \
-	simple
+	simple \
+	opencl
diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
index 857fd87..6964d9a 100644
--- a/tests/buffer/Makefile.am
+++ b/tests/buffer/Makefile.am
@@ -22,7 +22,10 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/operation \
-	-I$(top_srcdir)/gegl/operation
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
+
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 buffer_test_LDADD = 						\
diff --git a/tests/simple/Makefile.am b/tests/simple/Makefile.am
index eee5747..23e5410 100644
--- a/tests/simple/Makefile.am
+++ b/tests/simple/Makefile.am
@@ -27,7 +27,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/operation \
-	-I$(top_srcdir)/gegl/operation
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index db2ed66..8f1077d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -14,7 +14,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/module \
 	-I$(top_srcdir)/gegl/module \
 	-I$(top_builddir)/gegl/property-types \
-	-I$(top_srcdir)/gegl/property-types
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/opencl \
+	-I$(top_srcdir)/gegl/opencl
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]