configure.ac | 10 ++++++----
src/conv/raw/Makefile.am | 10 +++++-----
src/conv/svg/Makefile.am | 10 +++++-----
src/lib/Makefile.am | 4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 76e810ab718354fe9f246761876faff04951fc54
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Jan 28 11:06:42 2013 +0100
Build cleanup
diff --git a/configure.ac b/configure.ac
index cf5d9bb..0c98560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,14 +41,20 @@ 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)
PKG_CHECK_MODULES([LCMS2],[
lcms2
])
+AC_SUBST(LCMS2_CFLAGS)
+AC_SUBST(LCMS2_LIBS)
# =========
# Find zlib
@@ -226,10 +232,6 @@ AS_IF([test "x$enable_debug" = "xyes"], [
], [
DEBUG_CXXFLAGS="-DNDEBUG"
])
-LIBCDR_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}"
-LIBCDR_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}"
-AC_SUBST(LIBCDR_CXXFLAGS)
-AC_SUBST(LIBCDR_LIBS)
AC_SUBST(DEBUG_CXXFLAGS)
# ============
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index f67ca45..9a9cffc 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,14 +1,14 @@
bin_PROGRAMS = cdr2raw cmx2raw
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBCDR_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS)
$(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
if STATIC_TOOLS
-cdr2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CDR2RAW_WIN32_RESOURCE@
+cdr2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
cdr2raw_LDFLAGS = -all-static
else
-cdr2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CDR2RAW_WIN32_RESOURCE@
+cdr2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
endif
cdr2raw_SOURCES = \
@@ -17,10 +17,10 @@ cdr2raw_SOURCES = \
cmx2raw_DEPENDENCIES = @CMX2RAW_WIN32_RESOURCE@
if STATIC_TOOLS
-cmx2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CMX2RAW_WIN32_RESOURCE@
+cmx2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
cmx2raw_LDFLAGS = -all-static
else
-cmx2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CMX2RAW_WIN32_RESOURCE@
+cmx2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
endif
cmx2raw_SOURCES = \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 0e5dfbd..6f0c65e 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,14 +1,14 @@
bin_PROGRAMS = cdr2xhtml cmx2xhtml
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBCDR_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS)
$(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
if STATIC_TOOLS
-cdr2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CDR2XHTML_WIN32_RESOURCE@
+cdr2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
cdr2xhtml_LDFLAGS = -all-static
else
-cdr2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CDR2XHTML_WIN32_RESOURCE@
+cdr2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
endif
cdr2xhtml_SOURCES = \
@@ -17,10 +17,10 @@ cdr2xhtml_SOURCES = \
cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
if STATIC_TOOLS
-cmx2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CMX2XHTML_WIN32_RESOURCE@
+cmx2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
cmx2xhtml_LDFLAGS = -all-static
else
-cmx2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CMX2XHTML_WIN32_RESOURCE@
+cmx2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
endif
cmx2xhtml_SOURCES = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bff4ce3..69d7497 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,9 +12,9 @@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
CDRStringVector.h \
CMXDocument.h
-AM_CXXFLAGS = $(LIBCDR_CXXFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS)
$(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
-libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD = $(LIBCDR_LIBS)
$(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
+libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS)
$(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES =
@LIBCDR_WIN32_RESOURCE@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info)
-export-dynamic -no-undefined
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_SOURCES = \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
