[gegl] seamless-clone: maybe fix distcheck

[Daniel Sabo <daniels src gnome org>]

commit 1a02cfddb9f9405e5f4b8f328e69cd035f9f533e
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Thu May 16 02:30:27 2013 -0700

    seamless-clone: maybe fix distcheck

 configure.ac                                      |    5 ++---
 libs/poly2tri-c/Makefile.am                       |    4 ----
 libs/poly2tri-c/poly2tri-c/Makefile.am            |    5 +++++
 libs/poly2tri-c/poly2tri-c/p2t/Makefile.am        |    5 ++++-
 libs/poly2tri-c/poly2tri-c/p2t/common/Makefile.am |    4 ++++
 libs/poly2tri-c/poly2tri-c/p2t/sweep/Makefile.am  |    4 ++++
 libs/poly2tri-c/poly2tri-c/refine/Makefile.am     |    3 +++
 libs/poly2tri-c/poly2tri-c/render/Makefile.am     |    3 +++
 operations/seamless-clone/Makefile.am             |    4 ++--
 9 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4b28857..6037a18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1032,9 +1032,8 @@ AC_SUBST(P2TC_LIBS)
 # If no poly2tri-c version is installed, we should use the local version
 # we have cached in the libs directory
 if test "x$have_p2tc" != "xyes"; then
-  AC_SUBST(P2TC_SRC_DIR, "`cd $srcdir; pwd`/libs/poly2tri-c")
-  AC_SUBST(P2TC_CFLAGS, "-I\"$P2TC_SRC_DIR\"")
-  AC_SUBST(P2TC_LIBS, "-L\"$P2TC_SRC_DIR/poly2tri-c\" -lpoly2tri-c")
+  AC_SUBST(P2TC_CFLAGS, "-I\$(top_srcdir)/libs/poly2tri-c")
+  AC_SUBST(P2TC_LIBS, "-L\$(top_builddir)/libs/poly2tri-c/poly2tri-c -lpoly2tri-c")
 fi
 
 #######################
diff --git a/libs/poly2tri-c/Makefile.am b/libs/poly2tri-c/Makefile.am
index 75990ee..ceef1b5 100644
--- a/libs/poly2tri-c/Makefile.am
+++ b/libs/poly2tri-c/Makefile.am
@@ -2,8 +2,4 @@ if HAVE_P2TC
     SUBDIRS =
 else
     SUBDIRS = poly2tri-c
-    AM_CFLAGS = -I $(CURDIR) $(GLIB_CFLAGS)
-    export AM_CFLAGS
-    AM_LIBS = $(GLIB_LIBS)
-    export AM_LIBS
 endif
diff --git a/libs/poly2tri-c/poly2tri-c/Makefile.am b/libs/poly2tri-c/poly2tri-c/Makefile.am
index 7c67fed..7a567f9 100644
--- a/libs/poly2tri-c/poly2tri-c/Makefile.am
+++ b/libs/poly2tri-c/poly2tri-c/Makefile.am
@@ -1,4 +1,9 @@
 SUBDIRS = p2t refine render
+
 noinst_LTLIBRARIES = libpoly2tri-c.la
+
+AM_CFLAGS = $(GLIB_CFLAGS) $(P2TC_CFLAGS)
+AM_LDFLAGS = $(GLIB_LIBS)
+
 libpoly2tri_c_la_LIBADD = p2t/libp2tc.la refine/libp2tc-refine.la render/libp2tc-render.la
 libpoly2tri_c_la_SOURCES =
diff --git a/libs/poly2tri-c/poly2tri-c/p2t/Makefile.am b/libs/poly2tri-c/poly2tri-c/p2t/Makefile.am
index c635a68..eb6a3cf 100644
--- a/libs/poly2tri-c/poly2tri-c/p2t/Makefile.am
+++ b/libs/poly2tri-c/poly2tri-c/p2t/Makefile.am
@@ -2,5 +2,8 @@ SUBDIRS = sweep common
 
 noinst_LTLIBRARIES = libp2tc.la
 
+AM_CFLAGS = $(GLIB_CFLAGS) $(P2TC_CFLAGS)
+AM_LDFLAGS = $(GLIB_LIBS)
+
 libp2tc_la_LIBADD = common/libp2tc-common.la sweep/libp2tc-sweep.la
-libp2tc_la_SOURCES =
+libp2tc_la_SOURCES = poly2tri.h
diff --git a/libs/poly2tri-c/poly2tri-c/p2t/common/Makefile.am 
b/libs/poly2tri-c/poly2tri-c/p2t/common/Makefile.am
index 1b629ea..712ec8c 100644
--- a/libs/poly2tri-c/poly2tri-c/p2t/common/Makefile.am
+++ b/libs/poly2tri-c/poly2tri-c/p2t/common/Makefile.am
@@ -1,2 +1,6 @@
 noinst_LTLIBRARIES = libp2tc-common.la
+
+AM_CFLAGS = $(GLIB_CFLAGS) $(P2TC_CFLAGS)
+AM_LDFLAGS = $(GLIB_LIBS)
+
 libp2tc_common_la_SOURCES = cutils.h poly2tri-private.h shapes.c shapes.h utils.c utils.h
diff --git a/libs/poly2tri-c/poly2tri-c/p2t/sweep/Makefile.am 
b/libs/poly2tri-c/poly2tri-c/p2t/sweep/Makefile.am
index 7fb581e..e02e324 100644
--- a/libs/poly2tri-c/poly2tri-c/p2t/sweep/Makefile.am
+++ b/libs/poly2tri-c/poly2tri-c/p2t/sweep/Makefile.am
@@ -1,2 +1,6 @@
 noinst_LTLIBRARIES = libp2tc-sweep.la
+
+AM_CFLAGS = $(GLIB_CFLAGS) $(P2TC_CFLAGS)
+AM_LDFLAGS = $(GLIB_LIBS)
+
 libp2tc_sweep_la_SOURCES = advancing_front.c advancing_front.h cdt.c cdt.h sweep.c sweep_context.c 
sweep_context.h sweep.h
diff --git a/libs/poly2tri-c/poly2tri-c/refine/Makefile.am b/libs/poly2tri-c/poly2tri-c/refine/Makefile.am
index f67bdc7..686e281 100644
--- a/libs/poly2tri-c/poly2tri-c/refine/Makefile.am
+++ b/libs/poly2tri-c/poly2tri-c/refine/Makefile.am
@@ -1,3 +1,6 @@
 noinst_LTLIBRARIES = libp2tc-refine.la
 
+AM_CFLAGS = $(GLIB_CFLAGS) $(P2TC_CFLAGS)
+AM_LDFLAGS = $(GLIB_LIBS)
+
 libp2tc_refine_la_SOURCES = bounded-line.c bounded-line.h cdt.c cdt.h cdt-flipfix.c cdt-flipfix.h circle.c 
circle.h cluster.c cluster.h delaunay-terminator.c delaunay-terminator.h edge.c edge.h line.c line.h rmath.c 
rmath.h mesh.c mesh.h mesh-action.c mesh-action.h point.c point.h pslg.c pslg.h refine.h refiner.c refiner.h 
triangle.c triangle.h triangulation.h utils.c utils.h vector2.c vector2.h vedge.c vedge.h vtriangle.c 
vtriangle.h visibility.c visibility.h
diff --git a/libs/poly2tri-c/poly2tri-c/render/Makefile.am b/libs/poly2tri-c/poly2tri-c/render/Makefile.am
index 6aa8fa2..4d23b6d 100644
--- a/libs/poly2tri-c/poly2tri-c/render/Makefile.am
+++ b/libs/poly2tri-c/poly2tri-c/render/Makefile.am
@@ -1,3 +1,6 @@
 noinst_LTLIBRARIES = libp2tc-render.la
 
+AM_CFLAGS = $(GLIB_CFLAGS) $(P2TC_CFLAGS)
+AM_LDFLAGS = $(GLIB_LIBS)
+
 libp2tc_render_la_SOURCES = mesh-render.c mesh-render.h svg-plot.c svg-plot.h
diff --git a/operations/seamless-clone/Makefile.am b/operations/seamless-clone/Makefile.am
index 0758286..e1dfc91 100644
--- a/operations/seamless-clone/Makefile.am
+++ b/operations/seamless-clone/Makefile.am
@@ -11,11 +11,11 @@ LIBS = $(op_libs)
 
 # A simple seamless cloning operation
 seamless_clone_la_SOURCES = seamless-clone.c
-seamless_clone_la_LIBADD = $(top_srcdir)/seamless-clone/libgegl-sc- GEGL_API_VERSION@.la
+seamless_clone_la_LIBADD = $(top_builddir)/seamless-clone/libgegl-sc- GEGL_API_VERSION@.la
 
 # A composing operation for using the seamless cloning
 seamless_clone_compose_la_SOURCES = seamless-clone-compose.c
-seamless_clone_compose_la_LIBADD = $(top_srcdir)/seamless-clone/libgegl-sc- GEGL_API_VERSION@.la
+seamless_clone_compose_la_LIBADD = $(top_builddir)/seamless-clone/libgegl-sc- GEGL_API_VERSION@.la
 
 # Install both the operations in the op dir
 #