[Libwpd-cvs] writerperfect/filter Makefile.am, 1.8, 1.9 WordPerfectCollector.cxx, 1.68, 1.69

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpd/writerperfect/filter
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9352/filter

Modified Files:
	Makefile.am WordPerfectCollector.cxx 
Log Message:
Allow build wpg2odt when required libwpg is not present

Index: WordPerfectCollector.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- WordPerfectCollector.cxx	3 Dec 2008 13:00:31 -0000	1.68
+++ WordPerfectCollector.cxx	13 Apr 2010 08:24:14 -0000	1.69
@@ -36,14 +36,16 @@
 #include "DocumentElement.hxx"
 #include "TextRunStyle.hxx"
 #include "FontStyle.hxx"
-#include "GraphicsStyle.hxx"
 #include "ListStyle.hxx"
 #include "PageSpan.hxx"
 #include "SectionStyle.hxx"
 #include "TableStyle.hxx"
 #include "FilterInternal.hxx"
 #include "WriterProperties.hxx"
+#ifdef USE_LIBWPG
+#include "GraphicsStyle.hxx"
 #include "OdgExporter.hxx"
+#endif
 #include "InternalHandler.hxx"
 
 _WriterDocumentState::_WriterDocumentState() :
@@ -1234,6 +1236,7 @@
 
 	if (propList["libwpd:mimetype"]->getStr() == "image/x-wpg")
 	{
+#ifdef USE_LIBWPG
 		std::vector<DocumentElement *> tmpContentElements;
 		InternalHandler tmpHandler(&tmpContentElements);
 		OdgExporter exporter(&tmpHandler, true);
@@ -1250,6 +1253,7 @@
 				mpCurrentContentElements->push_back(*iter);
 			mpCurrentContentElements->push_back(new TagCloseElement("draw:object"));
 		}
+#endif
 	}
 	else
 	{

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	29 Jun 2007 11:21:47 -0000	1.8
+++ Makefile.am	13 Apr 2010 08:24:14 -0000	1.9
@@ -1,8 +1,30 @@
+if USE_LIBWPG
+
+writerperfect_wpg_sources = \
+	GraphicsStyle.cxx		\
+	GraphicsStyle.hxx		\
+	OdgExporter.cxx			\
+	OdgExporter.hxx
+
+writerperfect_wpg_cxxflags = \
+	$(WRITERPERFECTWPG_CXXFLAGS)
+	
+writerperfect_wpg_ldflags = \
+	$(WRITERPERFECTWPG_LIBS)
+
+else
+
+writerperfect_wpg_sources = 
+writerperfect_wpg_cxxflags =
+writerperfect_wpg_ldflags =
+
+endif
+	
 noinst_LTLIBRARIES = libwriterperfect-1.la
 
-AM_CXXFLAGS = $(WRITERPERFECT_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = $(WRITERPERFECTCORE_CXXFLAGS) $(writerperfect_wpg_cxxflags) $(DEBUG_CXXFLAGS)
 
-libwriterperfect_1_la_LIBADD  = $(WRITERPERFECT_LIBS)
+libwriterperfect_1_la_LIBADD  = $(WRITERPERFECTCORE_LIBS) $(writerperfect_wpg_ldflags)
 libwriterperfect_1_la_SOURCES =		\
 	FilterInternal.hxx		\
 	Style.hxx			\
@@ -12,14 +34,10 @@
 	DocumentHandler.hxx		\
 	FontStyle.cxx			\
 	FontStyle.hxx			\
-	GraphicsStyle.cxx		\
-	GraphicsStyle.hxx		\
 	InternalHandler.cxx		\
 	InternalHandler.hxx		\
 	ListStyle.cxx			\
 	ListStyle.hxx			\
-	OdgExporter.cxx			\
-	OdgExporter.hxx			\
 	PageSpan.cxx			\
 	PageSpan.hxx			\
 	SectionStyle.cxx 		\
@@ -29,4 +47,6 @@
 	TextRunStyle.cxx 		\
 	TextRunStyle.hxx		\
 	WordPerfectCollector.cxx 	\
-	WordPerfectCollector.hxx 
+	WordPerfectCollector.hxx	\
+	$(writerperfect_wpg_sources)	
+