[Libreoffice-commits] libvisio.git: configure.ac src/conv src/Makefile.am

[Fridrich Å trba]

 configure.ac              |    1 +
 src/Makefile.am           |    5 ++++-
 src/conv/Makefile.am      |    4 ++++
 src/conv/raw/Makefile.am  |    4 ++++
 src/conv/svg/Makefile.am  |    4 ++++
 src/conv/text/Makefile.am |    4 ++++
 6 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit bcce044ce26cea0d863cef8fd34d7cda7182caf6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 5 14:26:50 2013 +0100

    --disable-tools actually working
    
    Change-Id: I83bd3e4c35d2a250b61626aa826b473c5d6edd14

diff --git a/configure.ac b/configure.ac
index 5b3f67b..969bc45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,7 @@ AC_MSG_NOTICE([
 Build configuration:
 	debug:           ${enable_debug}
 	docs:            ${build_docs}
+	tools:           ${enable_tools}
 	werror:          ${enable_werror}
 ==============================================================================
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index d56ced2..64fd45e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +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 189bcd4..f46e7d9 100644
--- a/src/conv/Makefile.am
+++ b/src/conv/Makefile.am
@@ -1 +1,5 @@
+if BUILD_TOOLS
+
 SUBDIRS = raw svg text
+
+endif
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 3c7c474..7ef88ee 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = vsd2raw vss2raw
 
 AM_CXXFLAGS = \
@@ -52,3 +54,5 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
 	vsd2raw.rc \
 	vss2raw.rc	
+
+endif
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index d366cd0..6f24fc6 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = vsd2xhtml vss2xhtml
 
 AM_CXXFLAGS = \
@@ -52,3 +54,5 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
 	vsd2xhtml.rc \
 	vss2xhtml.rc
+
+endif
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 5e3a1d9..7b08e81 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = vsd2text vss2text
 
 AM_CXXFLAGS = \
@@ -49,3 +51,5 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
 	vsd2text.rc	\
 	vss2text.rc	
+
+endif