From 6f6964733c7de8c54dc60f946e10ea66bac269ea Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 8 Nov 2015 17:41:53 +0000 Subject: Use external Potrace (bzr r14449.1.1) --- src/trace/Makefile_insert | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'src/trace/Makefile_insert') diff --git a/src/trace/Makefile_insert b/src/trace/Makefile_insert index 21ec4ac0c..9c300aa8d 100644 --- a/src/trace/Makefile_insert +++ b/src/trace/Makefile_insert @@ -14,21 +14,6 @@ ink_common_sources += \ trace/filterset.cpp \ trace/siox.h \ trace/siox.cpp \ - trace/potrace/auxiliary.h \ - trace/potrace/bitmap.h \ - trace/potrace/curve.cpp \ - trace/potrace/curve.h \ - trace/potrace/decompose.cpp \ - trace/potrace/decompose.h \ - trace/potrace/greymap.cpp \ - trace/potrace/greymap.h \ - trace/potrace/lists.h \ - trace/potrace/potracelib.cpp \ - trace/potrace/potracelib.h \ - trace/potrace/progress.h \ - trace/potrace/render.cpp \ - trace/potrace/render.h \ - trace/potrace/trace.cpp \ - trace/potrace/trace.h \ + trace/potrace/bitmap.h \ trace/potrace/inkscape-potrace.cpp \ trace/potrace/inkscape-potrace.h -- cgit v1.2.3 From 94f3d50ddcbd6ceca8d3d834554a5100142648e4 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 9 Nov 2015 00:46:25 +0000 Subject: Enable builds without flood/trace on systems without Potrace (bzr r14449.1.4) --- src/trace/Makefile_insert | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/trace/Makefile_insert') diff --git a/src/trace/Makefile_insert b/src/trace/Makefile_insert index 9c300aa8d..27353df15 100644 --- a/src/trace/Makefile_insert +++ b/src/trace/Makefile_insert @@ -1,5 +1,7 @@ ## Makefile.am fragment sourced by src/Makefile.am. +if HAVE_POTRACE + ink_common_sources += \ trace/pool.h \ trace/trace.h \ @@ -17,3 +19,5 @@ ink_common_sources += \ trace/potrace/bitmap.h \ trace/potrace/inkscape-potrace.cpp \ trace/potrace/inkscape-potrace.h + +endif -- cgit v1.2.3