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

[Libreoffice Gerrit user]

 configure.ac             |    9 ++++++++-
 src/conv/raw/Makefile.am |    6 +++---
 src/conv/svg/Makefile.am |    6 +++---
 src/lib/Makefile.am      |    4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 9ae7b703255feb022ebf4e9a8360d26ab43474e5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jan 28 10:51:23 2013 +0100

    A bit of cleanup of build system

diff --git a/configure.ac b/configure.ac
index 23d5e93..d0279b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,18 @@ PKG_PROG_PKG_CONFIG([0.20])
 # ====================
 # Find additional apps
 # ====================
-PKG_CHECK_MODULES([LIBMSPUB],[
+PKG_CHECK_MODULES([WPD],[
 	libwpd-0.9
 	libwpd-stream-0.9
+])
+AC_SUBST(WPD_CFLAGS)
+AC_SUBST(WPD_LIBS)
+
+PKG_CHECK_MODULES([WPG],[
 	libwpg-0.2
 ])
+AC_SUBST(WPG_CFLAGS)
+AC_SUBST(WPG_LIBS)
 
 # =========
 # Find zlib
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 08ec6f3..26a41b5 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,14 +1,14 @@
 bin_PROGRAMS = pub2raw
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBMSPUB_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS)
 
 pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@
 
 if STATIC_TOOLS
-pub2raw_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.a $(LIBMSPUB_LIBS) @PUB2RAW_WIN32_RESOURCE@
+pub2raw_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.a $(WPD_LIBS) @PUB2RAW_WIN32_RESOURCE@
 pub2raw_LDFLAGS = -all-static 
 else
-pub2raw_LDADD = ../../lib/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.la $(LIBMSPUB_LIBS) @PUB2RAW_WIN32_RESOURCE@ 
+pub2raw_LDADD = ../../lib/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.la $(WPD_LIBS) @PUB2RAW_WIN32_RESOURCE@ 
 endif
 
 pub2raw_SOURCES = \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index a19f2ca..52fa201 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,14 +1,14 @@
 bin_PROGRAMS = pub2xhtml
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBMSPUB_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib  $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS)
 
 pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@
 
 if STATIC_TOOLS
-pub2xhtml_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.a $(LIBMSPUB_LIBS) @PUB2XHTML_WIN32_RESOURCE@
+pub2xhtml_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.a $(WPD_LIBS) @PUB2XHTML_WIN32_RESOURCE@
 pub2xhtml_LDFLAGS = -all-static 
 else
-pub2xhtml_LDADD = ../../lib/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.la $(LIBMSPUB_LIBS) @PUB2XHTML_WIN32_RESOURCE@ 
+pub2xhtml_LDADD = ../../lib/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.la $(WPD_LIBS) @PUB2XHTML_WIN32_RESOURCE@ 
 endif
 
 pub2xhtml_SOURCES = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 463116d..b932314 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,9 +11,9 @@ libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_include_HEADERS = \
 	MSPUBDocument.h \
 	MSPUBStringVector.h
 
-AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
 
-libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_LIBADD  = $(LIBMSPUB_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@
+libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_LIBADD  = $(WPD_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@
 libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_DEPENDENCIES = @LIBMSPUB_WIN32_RESOURCE@
 libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no_undefined
 libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_SOURCES = \