[gegl] operations: Move "gegl:jp2-load" out of the workshop



commit 5ac9d3a7b07ed90ce9c5530deea04f9ac915586f
Author: Martin Nordholts <martinn src gnome org>
Date:   Thu Jul 8 15:52:51 2010 +0200

    operations: Move "gegl:jp2-load" out of the workshop
    
    Move "gegl:jp2-load" out of the workshop, We don't want to require
    workshop to be enabled for make check to pass.

 operations/external/Makefile.am               |    7 +++++++
 operations/{workshop => }/external/jp2-load.c |    0
 operations/workshop/external/Makefile.am      |    7 -------
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/operations/external/Makefile.am b/operations/external/Makefile.am
index f0a3b4b..b33746e 100644
--- a/operations/external/Makefile.am
+++ b/operations/external/Makefile.am
@@ -83,6 +83,13 @@ endif
 
 EXTRA_DIST=v4lutils/v4lutils.c v4lutils/v4lutils.h
 
+if HAVE_JASPER
+ops += jp2-load.la
+jp2_load_la_SOURCES = jp2-load.c
+jp2_load_la_LIBADD  = $(op_libs) $(JASPER_LIBS)
+jp2_load_la_CFLAGS  = $(AM_CFLAGS) $(JASPER_CFLAGS)
+endif
+
 if HAVE_AVFORMAT
 ops += ff-load.la
 ff_load_la_SOURCES = ff-load.c
diff --git a/operations/workshop/external/jp2-load.c b/operations/external/jp2-load.c
similarity index 100%
rename from operations/workshop/external/jp2-load.c
rename to operations/external/jp2-load.c
diff --git a/operations/workshop/external/Makefile.am b/operations/workshop/external/Makefile.am
index d9a1713..6496ab5 100644
--- a/operations/workshop/external/Makefile.am
+++ b/operations/workshop/external/Makefile.am
@@ -32,12 +32,5 @@ gluas_la_LIBADD  = $(op_libs) $(LUA_LIBS)
 gluas_la_CFLAGS  = $(LUA_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
 endif
 
-if HAVE_JASPER
-ops += jp2-load.la
-jp2_load_la_SOURCES = jp2-load.c
-jp2_load_la_LIBADD  = $(op_libs) $(JASPER_LIBS)
-jp2_load_la_CFLAGS  = $(AM_CFLAGS) $(JASPER_CFLAGS)
-endif
-
 opdir = $(libdir)/gegl- GEGL_API_VERSION@
 op_LTLIBRARIES = $(ops)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]