[Libreoffice-commits] libcdr.git: configure.ac src/conv src/lib

[Fridrich Å trba]

 configure.ac                    |   10 +++++-----
 src/conv/svg/Makefile.am        |    2 +-
 src/conv/text/Makefile.am       |    2 +-
 src/lib/CDRContentCollector.cpp |    2 +-
 src/lib/Makefile.am             |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 007dd6502fc8b007251bc477399407dd93220389
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 5 18:40:00 2013 +0100

    SVG generator must be a core functionality
    
    Change-Id: I02e28aeeae34769760875020837d861d4b706fdc

diff --git a/configure.ac b/configure.ac
index 550fddc..ec7cd3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,11 +44,6 @@ PKG_CHECK_MODULES([REVENGE],[
 AC_SUBST([REVENGE_CFLAGS])
 AC_SUBST([REVENGE_LIBS])
 
-PKG_CHECK_MODULES([REVENGE_GENERATORS],[
-	librevenge-generators-0.0
-])
-AC_SUBST([REVENGE_GENERATORS_CFLAGS])
-AC_SUBST([REVENGE_GENERATORS_LIBS])
 
 # =====
 # Tools
@@ -62,9 +57,14 @@ AS_IF([test "x$enable_tools" = "xyes"], [
 	PKG_CHECK_MODULES([REVENGE_STREAM],[
 		librevenge-stream-0.0
 	])
+	PKG_CHECK_MODULES([REVENGE_GENERATORS],[
+		librevenge-generators-0.0
+	])
 ])
 AC_SUBST([REVENGE_STREAM_CFLAGS])
 AC_SUBST([REVENGE_STREAM_LIBS])
+AC_SUBST([REVENGE_GENERATORS_CFLAGS])
+AC_SUBST([REVENGE_GENERATORS_LIBS])
 AM_CONDITIONAL(BUILD_TOOLS, [test "x$enable_tools" = "xyes"])
 
 # ==========
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 97196b0..6de9b6d 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -25,8 +25,8 @@ cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
 
 cmx2xhtml_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
-	$(REVENGE_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
+	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
 	@CMX2XHTML_WIN32_RESOURCE@ 
 
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 7085f67..f52e6bb 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -25,8 +25,8 @@ cmx2text_DEPENDENCIES = @CMX2TEXT_WIN32_RESOURCE@
 
 cmx2text_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
-	$(REVENGE_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
+	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
 	@CMX2TEXT_WIN32_RESOURCE@ 
 
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 0df3ca3..b83cffa 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -29,7 +29,7 @@
 
 #include <math.h>
 #include <string.h>
-#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge/librevenge.h>
 #include <libcdr/libcdr.h>
 #include "CDRContentCollector.h"
 #include "CDRInternalStream.h"
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index eb39d35..13a94c0 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -13,7 +13,7 @@ libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_include_HEADERS = \
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
 
-libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
+libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_SOURCES = \