From: Barak Itkin Date: Sat, 2 Jun 2012 09:33:37 +0000 (+0300) Subject: Move the code of the library itself inside it's own folder (poly2tri-c) X-Git-Tag: p2tc-0.1.0~44 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c21d91439c99e2a12d172d513aaccd4efbe36e44;p=poly2tri-c Move the code of the library itself inside it's own folder (poly2tri-c) --- diff --git a/Makefile.am b/Makefile.am index 44f3a1e..c6f694e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,17 +1,6 @@ -SUBDIRS = p2t refine render bin +SUBDIRS = poly2tri-c bin ACLOCAL_AMFLAGS = -I m4 -AM_LDFLAGS = -version-info $(P2TC_LIBRARY_VERSION) - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = poly2tri-c.pc - -P2TC_publicdir = $(includedir)/poly2tri-c-$(P2TC_API_VERSION)/poly2tri-c -export P2TC_publicdir -P2TC_public_HEADERS = - -lib_LTLIBRARIES = libpoly2tri-c-@P2TC_API_VERSION@.la - -libpoly2tri_c_@P2TC_API_VERSION@_la_LIBADD = p2t/libp2tc.la refine/libp2tc-refine.la render/libp2tc-render.la -libpoly2tri_c_@P2TC_API_VERSION@_la_SOURCES = diff --git a/bin/Makefile.am b/bin/Makefile.am index e580fc6..a192cfb 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,3 +1,3 @@ bin_PROGRAMS = p2tc-test p2tc_test_SOURCES = main.c -p2tc_test_LDADD = ../p2t/libp2tc.la ../refine/libp2tc-refine.la ../render/libp2tc-render.la +p2tc_test_LDADD = ../poly2tri-c/libpoly2tri-c-$(P2TC_API_VERSION).la diff --git a/bin/main.c b/bin/main.c index 7b20cb8..ca02a3e 100644 --- a/bin/main.c +++ b/bin/main.c @@ -34,11 +34,11 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/configure.ac b/configure.ac index bb949c1..de82bee 100644 --- a/configure.ac +++ b/configure.ac @@ -104,14 +104,15 @@ AC_CONFIG_HEADERS([config.h]) # Output these files AC_CONFIG_FILES([ - poly2tri-c.pc \ - bin/Makefile \ - p2t/sweep/Makefile \ - p2t/common/Makefile \ - p2t/Makefile \ - render/Makefile \ - refine/Makefile \ - Makefile \ + poly2tri-c.pc \ + bin/Makefile \ + poly2tri-c/Makefile \ + poly2tri-c/p2t/sweep/Makefile \ + poly2tri-c/p2t/common/Makefile \ + poly2tri-c/p2t/Makefile \ + poly2tri-c/render/Makefile \ + poly2tri-c/refine/Makefile \ + Makefile \ ]) # Now really output diff --git a/poly2tri-c/Makefile.am b/poly2tri-c/Makefile.am new file mode 100644 index 0000000..cd4e4a0 --- /dev/null +++ b/poly2tri-c/Makefile.am @@ -0,0 +1,12 @@ +SUBDIRS = p2t refine render + +AM_LDFLAGS = -version-info $(P2TC_LIBRARY_VERSION) + +P2TC_publicdir = $(includedir)/poly2tri-c-$(P2TC_API_VERSION) +export P2TC_publicdir +P2TC_public_HEADERS = + +lib_LTLIBRARIES = libpoly2tri-c-@P2TC_API_VERSION@.la + +libpoly2tri_c_@P2TC_API_VERSION@_la_LIBADD = p2t/libp2tc.la refine/libp2tc-refine.la render/libp2tc-render.la +libpoly2tri_c_@P2TC_API_VERSION@_la_SOURCES = diff --git a/p2t/Makefile.am b/poly2tri-c/p2t/Makefile.am similarity index 100% rename from p2t/Makefile.am rename to poly2tri-c/p2t/Makefile.am diff --git a/p2t/common/Makefile.am b/poly2tri-c/p2t/common/Makefile.am similarity index 100% rename from p2t/common/Makefile.am rename to poly2tri-c/p2t/common/Makefile.am diff --git a/p2t/common/cutils.h b/poly2tri-c/p2t/common/cutils.h similarity index 100% rename from p2t/common/cutils.h rename to poly2tri-c/p2t/common/cutils.h diff --git a/p2t/common/poly2tri-private.h b/poly2tri-c/p2t/common/poly2tri-private.h similarity index 100% rename from p2t/common/poly2tri-private.h rename to poly2tri-c/p2t/common/poly2tri-private.h diff --git a/p2t/common/shapes.c b/poly2tri-c/p2t/common/shapes.c similarity index 100% rename from p2t/common/shapes.c rename to poly2tri-c/p2t/common/shapes.c diff --git a/p2t/common/shapes.h b/poly2tri-c/p2t/common/shapes.h similarity index 100% rename from p2t/common/shapes.h rename to poly2tri-c/p2t/common/shapes.h diff --git a/p2t/common/utils.c b/poly2tri-c/p2t/common/utils.c similarity index 100% rename from p2t/common/utils.c rename to poly2tri-c/p2t/common/utils.c diff --git a/p2t/common/utils.h b/poly2tri-c/p2t/common/utils.h similarity index 100% rename from p2t/common/utils.h rename to poly2tri-c/p2t/common/utils.h diff --git a/p2t/poly2tri.h b/poly2tri-c/p2t/poly2tri.h similarity index 100% rename from p2t/poly2tri.h rename to poly2tri-c/p2t/poly2tri.h diff --git a/p2t/sweep/Makefile.am b/poly2tri-c/p2t/sweep/Makefile.am similarity index 100% rename from p2t/sweep/Makefile.am rename to poly2tri-c/p2t/sweep/Makefile.am diff --git a/p2t/sweep/advancing_front.c b/poly2tri-c/p2t/sweep/advancing_front.c similarity index 100% rename from p2t/sweep/advancing_front.c rename to poly2tri-c/p2t/sweep/advancing_front.c diff --git a/p2t/sweep/advancing_front.h b/poly2tri-c/p2t/sweep/advancing_front.h similarity index 100% rename from p2t/sweep/advancing_front.h rename to poly2tri-c/p2t/sweep/advancing_front.h diff --git a/p2t/sweep/cdt.c b/poly2tri-c/p2t/sweep/cdt.c similarity index 100% rename from p2t/sweep/cdt.c rename to poly2tri-c/p2t/sweep/cdt.c diff --git a/p2t/sweep/cdt.h b/poly2tri-c/p2t/sweep/cdt.h similarity index 100% rename from p2t/sweep/cdt.h rename to poly2tri-c/p2t/sweep/cdt.h diff --git a/p2t/sweep/sweep.c b/poly2tri-c/p2t/sweep/sweep.c similarity index 100% rename from p2t/sweep/sweep.c rename to poly2tri-c/p2t/sweep/sweep.c diff --git a/p2t/sweep/sweep.h b/poly2tri-c/p2t/sweep/sweep.h similarity index 100% rename from p2t/sweep/sweep.h rename to poly2tri-c/p2t/sweep/sweep.h diff --git a/p2t/sweep/sweep_context.c b/poly2tri-c/p2t/sweep/sweep_context.c similarity index 100% rename from p2t/sweep/sweep_context.c rename to poly2tri-c/p2t/sweep/sweep_context.c diff --git a/p2t/sweep/sweep_context.h b/poly2tri-c/p2t/sweep/sweep_context.h similarity index 100% rename from p2t/sweep/sweep_context.h rename to poly2tri-c/p2t/sweep/sweep_context.h diff --git a/refine/Makefile.am b/poly2tri-c/refine/Makefile.am similarity index 100% rename from refine/Makefile.am rename to poly2tri-c/refine/Makefile.am diff --git a/refine/bounded-line.c b/poly2tri-c/refine/bounded-line.c similarity index 100% rename from refine/bounded-line.c rename to poly2tri-c/refine/bounded-line.c diff --git a/refine/bounded-line.h b/poly2tri-c/refine/bounded-line.h similarity index 100% rename from refine/bounded-line.h rename to poly2tri-c/refine/bounded-line.h diff --git a/refine/cdt.c b/poly2tri-c/refine/cdt.c similarity index 100% rename from refine/cdt.c rename to poly2tri-c/refine/cdt.c diff --git a/refine/cdt.h b/poly2tri-c/refine/cdt.h similarity index 99% rename from refine/cdt.h rename to poly2tri-c/refine/cdt.h index 8a06ad9..1c8b247 100644 --- a/refine/cdt.h +++ b/poly2tri-c/refine/cdt.h @@ -33,7 +33,7 @@ #ifndef __P2TC_REFINE_CDT_H__ #define __P2TC_REFINE_CDT_H__ -#include +#include #include "mesh.h" #include "pslg.h" diff --git a/refine/circle.c b/poly2tri-c/refine/circle.c similarity index 100% rename from refine/circle.c rename to poly2tri-c/refine/circle.c diff --git a/refine/circle.h b/poly2tri-c/refine/circle.h similarity index 100% rename from refine/circle.h rename to poly2tri-c/refine/circle.h diff --git a/refine/cluster.c b/poly2tri-c/refine/cluster.c similarity index 100% rename from refine/cluster.c rename to poly2tri-c/refine/cluster.c diff --git a/refine/cluster.h b/poly2tri-c/refine/cluster.h similarity index 100% rename from refine/cluster.h rename to poly2tri-c/refine/cluster.h diff --git a/refine/delaunay-terminator.c b/poly2tri-c/refine/delaunay-terminator.c similarity index 100% rename from refine/delaunay-terminator.c rename to poly2tri-c/refine/delaunay-terminator.c diff --git a/refine/delaunay-terminator.h b/poly2tri-c/refine/delaunay-terminator.h similarity index 100% rename from refine/delaunay-terminator.h rename to poly2tri-c/refine/delaunay-terminator.h diff --git a/refine/edge.c b/poly2tri-c/refine/edge.c similarity index 100% rename from refine/edge.c rename to poly2tri-c/refine/edge.c diff --git a/refine/edge.h b/poly2tri-c/refine/edge.h similarity index 100% rename from refine/edge.h rename to poly2tri-c/refine/edge.h diff --git a/refine/line.c b/poly2tri-c/refine/line.c similarity index 100% rename from refine/line.c rename to poly2tri-c/refine/line.c diff --git a/refine/line.h b/poly2tri-c/refine/line.h similarity index 100% rename from refine/line.h rename to poly2tri-c/refine/line.h diff --git a/refine/mesh.c b/poly2tri-c/refine/mesh.c similarity index 100% rename from refine/mesh.c rename to poly2tri-c/refine/mesh.c diff --git a/refine/mesh.h b/poly2tri-c/refine/mesh.h similarity index 100% rename from refine/mesh.h rename to poly2tri-c/refine/mesh.h diff --git a/refine/point.c b/poly2tri-c/refine/point.c similarity index 100% rename from refine/point.c rename to poly2tri-c/refine/point.c diff --git a/refine/point.h b/poly2tri-c/refine/point.h similarity index 100% rename from refine/point.h rename to poly2tri-c/refine/point.h diff --git a/refine/pslg.c b/poly2tri-c/refine/pslg.c similarity index 100% rename from refine/pslg.c rename to poly2tri-c/refine/pslg.c diff --git a/refine/pslg.h b/poly2tri-c/refine/pslg.h similarity index 100% rename from refine/pslg.h rename to poly2tri-c/refine/pslg.h diff --git a/refine/refine.h b/poly2tri-c/refine/refine.h similarity index 100% rename from refine/refine.h rename to poly2tri-c/refine/refine.h diff --git a/refine/rmath.c b/poly2tri-c/refine/rmath.c similarity index 100% rename from refine/rmath.c rename to poly2tri-c/refine/rmath.c diff --git a/refine/rmath.h b/poly2tri-c/refine/rmath.h similarity index 100% rename from refine/rmath.h rename to poly2tri-c/refine/rmath.h diff --git a/refine/triangle.c b/poly2tri-c/refine/triangle.c similarity index 100% rename from refine/triangle.c rename to poly2tri-c/refine/triangle.c diff --git a/refine/triangle.h b/poly2tri-c/refine/triangle.h similarity index 100% rename from refine/triangle.h rename to poly2tri-c/refine/triangle.h diff --git a/refine/triangulation.h b/poly2tri-c/refine/triangulation.h similarity index 100% rename from refine/triangulation.h rename to poly2tri-c/refine/triangulation.h diff --git a/refine/utils.c b/poly2tri-c/refine/utils.c similarity index 100% rename from refine/utils.c rename to poly2tri-c/refine/utils.c diff --git a/refine/utils.h b/poly2tri-c/refine/utils.h similarity index 100% rename from refine/utils.h rename to poly2tri-c/refine/utils.h diff --git a/refine/vector2.c b/poly2tri-c/refine/vector2.c similarity index 100% rename from refine/vector2.c rename to poly2tri-c/refine/vector2.c diff --git a/refine/vector2.h b/poly2tri-c/refine/vector2.h similarity index 100% rename from refine/vector2.h rename to poly2tri-c/refine/vector2.h diff --git a/refine/visibility.c b/poly2tri-c/refine/visibility.c similarity index 100% rename from refine/visibility.c rename to poly2tri-c/refine/visibility.c diff --git a/refine/visibility.h b/poly2tri-c/refine/visibility.h similarity index 100% rename from refine/visibility.h rename to poly2tri-c/refine/visibility.h diff --git a/render/Makefile.am b/poly2tri-c/render/Makefile.am similarity index 100% rename from render/Makefile.am rename to poly2tri-c/render/Makefile.am diff --git a/render/mesh-render.c b/poly2tri-c/render/mesh-render.c similarity index 99% rename from render/mesh-render.c rename to poly2tri-c/render/mesh-render.c index da57c1c..1e3c2c1 100644 --- a/render/mesh-render.c +++ b/poly2tri-c/render/mesh-render.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "mesh-render.h" /* Most computations using the Barycentric Coordinates are Based on diff --git a/render/mesh-render.h b/poly2tri-c/render/mesh-render.h similarity index 100% rename from render/mesh-render.h rename to poly2tri-c/render/mesh-render.h diff --git a/render/svg-plot.c b/poly2tri-c/render/svg-plot.c similarity index 99% rename from render/svg-plot.c rename to poly2tri-c/render/svg-plot.c index 5829caa..708a97a 100644 --- a/render/svg-plot.c +++ b/poly2tri-c/render/svg-plot.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include "svg-plot.h" diff --git a/render/svg-plot.h b/poly2tri-c/render/svg-plot.h similarity index 98% rename from render/svg-plot.h rename to poly2tri-c/render/svg-plot.h index bc9ff1f..1f9e0aa 100644 --- a/render/svg-plot.h +++ b/poly2tri-c/render/svg-plot.h @@ -33,7 +33,7 @@ #ifndef __P2TC_RENDER_SVG_PLOT_H__ #define __P2TC_RENDER_SVG_PLOT_H__ -#include +#include #define PLOT_LINE_WIDTH 0.40 #define ARROW_SIDE_ANGLE (G_PI / 180 * 30)