src/lib/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c48b74568ae2e202d087def28fe4130e67f21bda
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Thu Dec 10 11:35:13 2015 +0100
Put the CXXFLAGS in the same place and make the gperf dependency work again
Change-Id: I2616512253ccfd2a03e67902ab37b6e5f881aaea
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6946b0a..b98aa9c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -15,6 +15,8 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/inc \
-I$(top_srcdir)/src/lib \
-I$(top_builddir)/src/lib \
+ -DBOOST_ERROR_CODE_HEADER_ONLY \
+ -DBOOST_SYSTEM_NO_DEPRECATED \
$(LIBVISIO_CXXFLAGS) \
$(DEBUG_CXXFLAGS)
@@ -22,7 +24,6 @@ generated_files = \
$(top_builddir)/src/lib/tokens.h \
$(top_builddir)/src/lib/tokenhash.h
-libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_CPPFLAGS =
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = $(LIBVISIO_LIBS)
@LIBVISIO_WIN32_RESOURCE@
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES =
@LIBVISIO_WIN32_RESOURCE@
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info)
-export-dynamic -no-undefined
@@ -82,7 +83,6 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES =
\
libvisio_xml.cpp \
libvisio_xml.h \
$(generated_files)
-
VDXParser.lo : $(generated_files)
VSDXMLParserBase.lo : $(generated_files)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
