Commit ba8277ad authored by Victor Oliveira's avatar Victor Oliveira Committed by Øyvind "pippin" Kolås

All makefiles include opencl [except docs]

parent 5baf8bf1
......@@ -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)
......
......@@ -1016,7 +1016,6 @@ AM_CONDITIONAL(HAVE_UMFPACK, test "x$have_umfpack" = "xyes")
AC_SUBST(UMFPACK_CFLAGS)
AC_SUBST(UMFPACK_LIBS)
#######################
# Check for other items
#######################
......@@ -1071,6 +1070,7 @@ gegl/module/Makefile
gegl/operation/Makefile
gegl/process/Makefile
gegl/property-types/Makefile
gegl/opencl/Makefile
libs/Makefile
libs/rgbe/Makefile
operations/Makefile
......@@ -1100,6 +1100,7 @@ tests/python/Makefile
tests/simple/Makefile
tests/xml/Makefile
tests/xml/data/Makefile
tests/opencl/Makefile
gegl.pc
gegl-uninstalled.pc
])
......
......@@ -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)
......
......@@ -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)"\"
......@@ -103,7 +105,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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
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)
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -4,4 +4,5 @@ SUBDIRS = \
compositions \
simple \
xml \
python
python \
opencl
......@@ -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 = \
......
......@@ -28,7 +28,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)
......
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment