[gegl] lens-correct: Move op to operations/workshop/external and fix build
- From: Mukund Sivaraman <muks src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] lens-correct: Move op to operations/workshop/external and fix build
- Date: Fri, 2 Sep 2011 02:51:20 +0000 (UTC)
commit bbb5c908ac66d7e40ef12e4a80b0a45ddcc16958
Author: Mukund Sivaraman <muks banu com>
Date: Fri Sep 2 08:17:33 2011 +0530
lens-correct: Move op to operations/workshop/external and fix build
operations/workshop/Makefile.am | 10 ----------
operations/workshop/external/Makefile.am | 7 +++++++
operations/workshop/{ => external}/lens-correct.c | 0
3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/operations/workshop/Makefile.am b/operations/workshop/Makefile.am
index 42e548a..fbb2982 100644
--- a/operations/workshop/Makefile.am
+++ b/operations/workshop/Makefile.am
@@ -1,12 +1,2 @@
SUBDIRS = generated external
include $(top_srcdir)/operations/Makefile-operations.am
-
-# Add to Makefile.am when you move lens-correct out of the workshop, or
-# figure out how the current system works.
-
-#if HAVE_LENSFUN
-#ops += lens-correct.la
-#lens_correct_la_SOURCES = lens-correct.c lens-correct.h
-#lens_correct_la_LIBADD = $(op_libs) $(LENSFUN_LIBS)
-#lens_correct_la_CFLAGS = $(AM_CFLAGS) $(LENSFUN_CFLAGS)
-#endif
diff --git a/operations/workshop/external/Makefile.am b/operations/workshop/external/Makefile.am
index 888b5c1..647da27 100644
--- a/operations/workshop/external/Makefile.am
+++ b/operations/workshop/external/Makefile.am
@@ -31,5 +31,12 @@ jpg_save_la_SOURCES = jpg-save.c
jpg_save_la_LIBADD = $(op_libs) $(LIBJPEG)
endif
+if HAVE_LENSFUN
+ops += lens-correct.la
+lens_correct_la_SOURCES = lens-correct.c lens-correct.h
+lens_correct_la_LIBADD = $(op_libs) $(LENSFUN_LIBS)
+lens_correct_la_CFLAGS = $(AM_CFLAGS) $(LENSFUN_CFLAGS)
+endif
+
opdir = $(libdir)/gegl- GEGL_API_VERSION@
op_LTLIBRARIES = $(ops)
diff --git a/operations/workshop/lens-correct.c b/operations/workshop/external/lens-correct.c
similarity index 100%
rename from operations/workshop/lens-correct.c
rename to operations/workshop/external/lens-correct.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]