src/Makefile.am | 6 +++++-
src/conv/Makefile.am | 3 +++
src/conv/raw/Makefile.am | 4 ++++
src/conv/svg/Makefile.am | 4 ++++
src/conv/svg/pub2xhtml.cpp | 2 +-
5 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 1eebf9a725a30cd64c041533c8671f01d37d53db
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Thu Nov 7 22:37:36 2013 +0100
Make --disable-tools effective
Change-Id: Iba7371e85e1fdb17c0be5b364cbfcb9e3a5c47f9
diff --git a/src/Makefile.am b/src/Makefile.am
index 4796627..64fd45e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = lib conv
+SUBDIRS = lib
+
+if BUILD_TOOLS
+SUBDIRS += conv
+endif
diff --git a/src/conv/Makefile.am b/src/conv/Makefile.am
index f43c908..99a8b67 100644
--- a/src/conv/Makefile.am
+++ b/src/conv/Makefile.am
@@ -1,2 +1,5 @@
+if BUILD_TOOLS
+
SUBDIRS = raw svg
+endif
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index d8a25dd..6ac2242 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
bin_PROGRAMS = pub2raw
AM_CXXFLAGS = -I$(top_srcdir)/inc \
@@ -32,3 +34,5 @@ EXTRA_DIST = \
# These may be in the builddir too
BUILD_EXTRA_DIST = \
pub2raw.rc
+
+endif # BUILD_TOOLS
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 2c03601..e0406a0 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
bin_PROGRAMS = pub2xhtml
AM_CXXFLAGS = -I$(top_srcdir)/inc \
@@ -30,3 +32,5 @@ EXTRA_DIST = \
# These may be in the builddir too
BUILD_EXTRA_DIST = \
pub2xhtml.rc
+
+endif # BUILD_TOOLS
diff --git a/src/conv/svg/pub2xhtml.cpp b/src/conv/svg/pub2xhtml.cpp
index 3955d52..ee722fc 100644
--- a/src/conv/svg/pub2xhtml.cpp
+++ b/src/conv/svg/pub2xhtml.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
}
librevenge::RVNGStringVector outputStrings;
- librevenge::RVNGSVGDrawingGenerator generator(outputStrings, "");
+ librevenge::RVNGSVGDrawingGenerator generator(outputStrings, "svg");
if (!libmspub::MSPUBDocument::parse(&input, &generator))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
