[gegl/soc-2011-seamless-clone: 3/23] Add the necessary automake files and modiy configure.ac. Still needs work



commit f7c5202c9909f3b184ff1baff296af9740c7c37f
Author: Barak Itkin <lightningismyname gmail com>
Date:   Tue Aug 2 16:09:24 2011 +0300

    Add the necessary automake files and modiy configure.ac. Still needs work

 configure.ac                                       |    6 ++++++
 operations/common/Makefile.am                      |    3 ++-
 operations/common/seamless-clone/Makefile.am       |   19 +++++++++++++++----
 operations/common/seamless-clone/make-mesh.h       |    7 -------
 .../common/seamless-clone/poly2tri-c/Makefile.am   |   15 +++++++++++++++
 .../seamless-clone/poly2tri-c/common/Makefile.am   |    9 +++++++++
 .../seamless-clone/poly2tri-c/refine/Makefile.am   |    8 ++++++++
 .../seamless-clone/poly2tri-c/render/Makefile.am   |    5 +++++
 .../seamless-clone/poly2tri-c/sweep/Makefile.am    |   11 +++++++++++
 9 files changed, 71 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f00eaa6..8508fba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1091,6 +1091,12 @@ operations/Makefile
 operations/core/Makefile
 operations/common/Makefile
 operations/common/perlin/Makefile
+operations/common/seamless-clone/Makefile
+operations/common/seamless-clone/poly2tri-c/Makefile
+operations/common/seamless-clone/poly2tri-c/common/Makefile
+operations/common/seamless-clone/poly2tri-c/refine/Makefile
+operations/common/seamless-clone/poly2tri-c/render/Makefile
+operations/common/seamless-clone/poly2tri-c/sweep/Makefile
 operations/external/Makefile
 operations/generated/Makefile
 operations/transform/Makefile
diff --git a/operations/common/Makefile.am b/operations/common/Makefile.am
index 1f07f66..9120947 100644
--- a/operations/common/Makefile.am
+++ b/operations/common/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS = perlin
+SUBDIRS = perlin seamless-clone
+
 include $(top_srcdir)/operations/Makefile-operations.am
 
 AM_CPPFLAGS += \
diff --git a/operations/common/seamless-clone/Makefile.am b/operations/common/seamless-clone/Makefile.am
index 6abd459..5d6cf97 100644
--- a/operations/common/seamless-clone/Makefile.am
+++ b/operations/common/seamless-clone/Makefile.am
@@ -1,9 +1,20 @@
-SUBDIRS = poly2tri-c
+include $(top_srcdir)/operations/Makefile-operations.am
 
-EXTRA_DIST = \
-	find-outline.c		\
-	find-outline.h		\
+ops = seamless-clone.la
+
+seamless_clone_la_SOURCES = \
 	make-mesh.c			\
 	make-mesh.h			\
+	find-outline.c		\
+	find-outline.h		\
 	seamless-clone.c	\
 	seamless-clone.h
+
+seamless_clone_la_LIBADD = $(op_libs) poly2tri-c/poly2tri-c.la
+seamless_clone_CFLAGS = $(AM_CFLAGS)
+
+opdir = $(libdir)/gegl- GEGL_API_VERSION@
+op_LTLIBRARIES = $(ops)
+
+AM_CPPFLAGS += \
+	-I$(top_srcdir)/operations/common
diff --git a/operations/common/seamless-clone/make-mesh.h b/operations/common/seamless-clone/make-mesh.h
index 79eaf9a..98abf8e 100644
--- a/operations/common/seamless-clone/make-mesh.h
+++ b/operations/common/seamless-clone/make-mesh.h
@@ -34,11 +34,4 @@ void          sc_sample_list_free    (ScSampleList *self);
 ScMeshSampling* sc_mesh_sampling_compute (ScOutline *outline, P2tRTriangulation *mesh);
 void            sc_mesh_sampling_free    (ScMeshSampling *self);
 
-void
-ComputeInnerSample (P2tRPoint  *X,
-                    gpointer   *sampleData, /* the value of the key X in sampling */
-                    GeglBuffer *input,
-                    GeglBuffer *aux,
-                    gfloat      dest[3]);
-
 #endif
diff --git a/operations/common/seamless-clone/poly2tri-c/Makefile.am b/operations/common/seamless-clone/poly2tri-c/Makefile.am
new file mode 100644
index 0000000..eeb159f
--- /dev/null
+++ b/operations/common/seamless-clone/poly2tri-c/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = \
+	common		\
+	sweep		\
+	refine		\
+	render
+
+noinst_LTLIBRARIES = libpoly2tri-c.la
+
+libpoly2tri_c_la_SOURCES = poly2tri.h
+libpoly2tri_c_la_LIBADD  = \
+	common/libpoly2tri-c-common.la	\
+	sweep/libpoly2tri-c-sweep.la	\
+	refine/libpoly2tri-c-refine.la	\
+	render/libpoly2tri-c-render.la
+libpoly2tri_c_la_CFLAGS  = $(DEP_CFLAGS) -fPIC
diff --git a/operations/common/seamless-clone/poly2tri-c/common/Makefile.am b/operations/common/seamless-clone/poly2tri-c/common/Makefile.am
new file mode 100644
index 0000000..691e54c
--- /dev/null
+++ b/operations/common/seamless-clone/poly2tri-c/common/Makefile.am
@@ -0,0 +1,9 @@
+noinst_LTLIBRARIES = libpoly2tri-c-common.la
+
+libpoly2tri_c_common_la_SOURCES =	\
+	cutils.h						\
+	poly2tri-private.h				\
+	shapes.c						\
+	shapes.h						\
+	utils.c							\
+	utils.h
diff --git a/operations/common/seamless-clone/poly2tri-c/refine/Makefile.am b/operations/common/seamless-clone/poly2tri-c/refine/Makefile.am
new file mode 100644
index 0000000..415726d
--- /dev/null
+++ b/operations/common/seamless-clone/poly2tri-c/refine/Makefile.am
@@ -0,0 +1,8 @@
+noinst_LTLIBRARIES = libpoly2tri-c-refine.la
+
+libpoly2tri_c_refine_la_SOURCES =	\
+	refine.c						\
+	refine.h						\
+	triangulation.c					\
+	triangulation.h					\
+	utils.h
diff --git a/operations/common/seamless-clone/poly2tri-c/render/Makefile.am b/operations/common/seamless-clone/poly2tri-c/render/Makefile.am
new file mode 100644
index 0000000..da2a6d2
--- /dev/null
+++ b/operations/common/seamless-clone/poly2tri-c/render/Makefile.am
@@ -0,0 +1,5 @@
+noinst_LTLIBRARIES = libpoly2tri-c-render.la
+
+libpoly2tri_c_render_la_SOURCES =	\
+	mesh-render.c					\
+	mesh-render.h					\
diff --git a/operations/common/seamless-clone/poly2tri-c/sweep/Makefile.am b/operations/common/seamless-clone/poly2tri-c/sweep/Makefile.am
new file mode 100644
index 0000000..0df052c
--- /dev/null
+++ b/operations/common/seamless-clone/poly2tri-c/sweep/Makefile.am
@@ -0,0 +1,11 @@
+noinst_LTLIBRARIES = libpoly2tri-c-sweep.la
+
+libpoly2tri_c_sweep_la_SOURCES =	\
+	advancing-front.c				\
+	advancing-front.h				\
+	cdt.c							\
+	cdt.h							\
+	sweep.c							\
+	sweep.h							\
+	sweep_context.c					\
+	sweep_context.h



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