Makefile.am | 6 +--
build/win32/libmspub.dsp | 24 +++++++--------
build/win32/libmspub.vcproj | 28 +++++++++---------
build/win32/libmspub.vcxproj | 10 +++---
build/win32/pub2raw.dsp | 8 ++---
build/win32/pub2raw.vcproj | 4 +-
build/win32/pub2raw.vcxproj | 6 +--
build/win32/pub2xhtml.dsp | 8 ++---
build/win32/pub2xhtml.vcproj | 4 +-
build/win32/pub2xhtml.vcxproj | 6 +--
configure.ac | 4 +-
inc/Makefile.am | 1
inc/libmspub/MSPUBDocument.h | 55 +++++++++++++++++++++++++++++++++++
inc/libmspub/MSPUBStringVector.h | 60 +++++++++++++++++++++++++++++++++++++++
inc/libmspub/Makefile.am | 4 ++
inc/libmspub/libmspub.h | 37 ++++++++++++++++++++++++
libmspub-0.0.pc.in | 11 -------
libmspub.pc.in | 11 +++++++
src/conv/raw/Makefile.am | 2 -
src/conv/raw/pub2raw.cpp | 2 -
src/conv/svg/Makefile.am | 2 -
src/conv/svg/pub2xhtml.cpp | 2 -
src/lib/MSPUBDocument.cpp | 3 +
src/lib/MSPUBDocument.h | 55 -----------------------------------
src/lib/MSPUBSVGGenerator.cpp | 1
src/lib/MSPUBSVGGenerator.h | 2 -
src/lib/MSPUBStringVector.cpp | 2 -
src/lib/MSPUBStringVector.h | 60 ---------------------------------------
src/lib/Makefile.am | 8 ++---
src/lib/libmspub.h | 37 ------------------------
30 files changed, 235 insertions(+), 228 deletions(-)
New commits:
commit e59b81256f2d33530024b1b30e5447a4501c64b6
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri May 10 14:46:29 2013 +0200
Making Michael Stahl happy (second library in the row)
diff --git a/Makefile.am b/Makefile.am
index cbf9621..75dd140 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ pkgconfdir = $(libdir)/pkgconfig
pkgconf_DATA = libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.pc
-SUBDIRS = src build docs
+SUBDIRS = build inc src docs
EXTRA_DIST = \
AUTHORS \
@@ -14,10 +14,10 @@ EXTRA_DIST = \
NEWS \
README \
autogen.sh \
- libmspub-@MSPUB_MAJOR_VERSION@.@mspub_minor_vers...@.pc.in
+ libmspub.pc.in
distclean-local:
- rm -rf *.cache *~
+ rm -rf *.cache *~ *.out *.pc
dist-hook:
git log --date=short --pretty="format:@%cd %an <%ae>
[%H]%n%n%s%n%n%e%b" | sed -e "s|^\([^@]\)|\t\1|" -e "s|^@||"
>$(distdir)/ChangeLog
diff --git a/build/win32/libmspub.dsp b/build/win32/libmspub.dsp
index 4421e1b..795af8f 100644
--- a/build/win32/libmspub.dsp
+++ b/build/win32/libmspub.dsp
@@ -151,6 +151,18 @@ SOURCE=..\..\src\lib\VectorTransformation2D.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\..\inc\libmspub\libmspub.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libmspub\MSPUBDocument.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libmspub\MSPUBStringVector.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\lib\Arrow.h
# End Source File
# Begin Source File
@@ -191,10 +203,6 @@ SOURCE=..\..\src\lib\FillType.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\libmspub.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\src\lib\libmspub_utils.h
# End Source File
# Begin Source File
@@ -231,10 +239,6 @@ SOURCE=..\..\src\lib\MSPUBContentChunkType.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\MSPUBDocument.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\src\lib\MSPUBParser.h
# End Source File
# Begin Source File
@@ -247,10 +251,6 @@ SOURCE=..\..\src\lib\MSPUBParser97.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\MSPUBStringVector.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\src\lib\MSPUBSVGGenerator.h
# End Source File
# Begin Source File
diff --git a/build/win32/libmspub.vcproj b/build/win32/libmspub.vcproj
index b88d14c..5b8a581 100644
--- a/build/win32/libmspub.vcproj
+++ b/build/win32/libmspub.vcproj
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="2"
@@ -116,7 +116,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -238,6 +238,18 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
+ RelativePath="..\..\inc\libmspub\libmspub.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\inc\libmspub\MSPUBDocument.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\inc\libmspub\MSPUBStringVector.h"
+ >
+ </File>
+ <File
RelativePath="..\..\src\lib\Arrow.h"
>
</File>
@@ -278,10 +290,6 @@
>
</File>
<File
- RelativePath="..\..\src\lib\libmspub.h"
- >
- </File>
- <File
RelativePath="..\..\src\lib\libmspub_utils.h"
>
</File>
@@ -318,10 +326,6 @@
>
</File>
<File
- RelativePath="..\..\src\lib\MSPUBDocument.h"
- >
- </File>
- <File
RelativePath="..\..\src\lib\MSPUBParser.h"
>
</File>
@@ -334,10 +338,6 @@
>
</File>
<File
- RelativePath="..\..\src\lib\MSPUBStringVector.h"
- >
- </File>
- <File
RelativePath="..\..\src\lib\MSPUBSVGGenerator.h"
>
</File>
diff --git a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj
index c233331..fd24291 100644
--- a/build/win32/libmspub.vcxproj
+++ b/build/win32/libmspub.vcxproj
@@ -11,6 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\inc\libmspub\libmspub.h" />
+ <ClInclude Include="..\..\inc\libmspub\MSPUBDocument.h" />
+ <ClInclude Include="..\..\inc\libmspub\MSPUBStringVector.h" />
<ClInclude Include="..\..\src\lib\Arrow.h" />
<ClInclude Include="..\..\src\lib\BorderArtInfo.h" />
<ClInclude Include="..\..\src\lib\ColorReference.h" />
@@ -21,7 +24,6 @@
<ClInclude Include="..\..\src\lib\EscherFieldIds.h" />
<ClInclude Include="..\..\src\lib\Fill.h" />
<ClInclude Include="..\..\src\lib\FillType.h" />
- <ClInclude Include="..\..\src\lib\libmspub.h" />
<ClInclude Include="..\..\src\lib\libmspub_utils.h" />
<ClInclude Include="..\..\src\lib\Line.h" />
<ClInclude Include="..\..\src\lib\ListInfo.h" />
@@ -31,11 +33,9 @@
<ClInclude Include="..\..\src\lib\MSPUBCollector.h" />
<ClInclude Include="..\..\src\lib\MSPUBConstants.h" />
<ClInclude Include="..\..\src\lib\MSPUBContentChunkType.h" />
- <ClInclude Include="..\..\src\lib\MSPUBDocument.h" />
<ClInclude Include="..\..\src\lib\MSPUBParser.h" />
<ClInclude Include="..\..\src\lib\MSPUBParser2k.h" />
<ClInclude Include="..\..\src\lib\MSPUBParser97.h" />
- <ClInclude Include="..\..\src\lib\MSPUBStringVector.h" />
<ClInclude Include="..\..\src\lib\MSPUBSVGGenerator.h" />
<ClInclude Include="..\..\src\lib\MSPUBTypes.h" />
<ClInclude Include="..\..\src\lib\NumberingDelimiter.h" />
@@ -102,7 +102,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -132,7 +132,7 @@
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/build/win32/pub2raw.dsp b/build/win32/pub2raw.dsp
index 87161d5..9ff2349 100644
--- a/build/win32/pub2raw.dsp
+++ b/build/win32/pub2raw.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG"
/D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D
"WIN32" /D "_CONSOLE" /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I
"libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D
"_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I
"libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D
"_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/build/win32/pub2raw.vcproj b/build/win32/pub2raw.vcproj
index eaf223a..4d892a7 100644
--- a/build/win32/pub2raw.vcproj
+++ b/build/win32/pub2raw.vcproj
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -136,7 +136,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="4"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/pub2raw.vcxproj b/build/win32/pub2raw.vcxproj
index 4a82043..8651e9e 100644
--- a/build/win32/pub2raw.vcxproj
+++ b/build/win32/pub2raw.vcxproj
@@ -52,7 +52,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -144,4 +144,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/pub2xhtml.dsp b/build/win32/pub2xhtml.dsp
index 223c74d..bf074ab 100644
--- a/build/win32/pub2xhtml.dsp
+++ b/build/win32/pub2xhtml.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG"
/D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D
"WIN32" /D "_CONSOLE" /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I
"libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D
"_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9"
/D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D
"_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/build/win32/pub2xhtml.vcproj b/build/win32/pub2xhtml.vcproj
index f089e17..35ea4f5 100644
--- a/build/win32/pub2xhtml.vcproj
+++ b/build/win32/pub2xhtml.vcproj
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -136,7 +136,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="4"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/pub2xhtml.vcxproj b/build/win32/pub2xhtml.vcxproj
index cd726ea..8f41eb6 100644
--- a/build/win32/pub2xhtml.vcxproj
+++ b/build/win32/pub2xhtml.vcxproj
@@ -52,7 +52,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -144,4 +144,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/configure.ac b/configure.ac
index 6d8bf60..f8c0574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,11 +286,13 @@ src/conv/svg/Makefile
src/conv/svg/pub2xhtml.rc
src/lib/Makefile
src/lib/libmspub.rc
+inc/Makefile
+inc/libmspub/Makefile
build/Makefile
build/win32/Makefile
docs/Makefile
docs/doxygen/Makefile
-libmspub-0.0.pc
+libmspub-$MSPUB_MAJOR_VERSION.$MSPUB_MINOR_VERSION.pc:libmspub.pc.in
])
AC_OUTPUT
diff --git a/inc/Makefile.am b/inc/Makefile.am
new file mode 100644
index 0000000..172ddbe
--- /dev/null
+++ b/inc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libmspub
diff --git a/inc/libmspub/MSPUBDocument.h b/inc/libmspub/MSPUBDocument.h
new file mode 100644
index 0000000..645ec2c
--- /dev/null
+++ b/inc/libmspub/MSPUBDocument.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libmspub
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Brennan Vincent <brenn...@email.arizona.edu>
+ * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __MSPUBDOCUMENT_H__
+#define __MSPUBDOCUMENT_H__
+
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "MSPUBStringVector.h"
+
+class WPXInputStream;
+
+namespace libmspub
+{
+class MSPUBDocument
+{
+public:
+
+ static bool isSupported(WPXInputStream *input);
+
+ static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+
+ static bool generateSVG(::WPXInputStream *input, MSPUBStringVector &output);
+};
+
+} // namespace libmspub
+
+#endif // __MSPUBDOCUMENT_H__
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libmspub/MSPUBStringVector.h b/inc/libmspub/MSPUBStringVector.h
new file mode 100644
index 0000000..b3b659a
--- /dev/null
+++ b/inc/libmspub/MSPUBStringVector.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libmspub
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __MSPUBSTRINGVECTOR_H__
+#define __MSPUBSTRINGVECTOR_H__
+
+#include <libwpd/libwpd.h>
+
+namespace libmspub
+{
+class MSPUBStringVectorImpl;
+
+class MSPUBStringVector
+{
+public:
+ MSPUBStringVector();
+ MSPUBStringVector(const MSPUBStringVector &vec);
+ ~MSPUBStringVector();
+
+ MSPUBStringVector &operator=(const MSPUBStringVector &vec);
+
+ unsigned size() const;
+ bool empty() const;
+ const WPXString &operator[](unsigned idx) const;
+ void append(const WPXString &str);
+ void clear();
+
+private:
+ MSPUBStringVectorImpl *m_pImpl;
+};
+
+} // namespace libmspub
+
+#endif /* __MSPUBSTRINGVECTOR_H__ */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libmspub/Makefile.am b/inc/libmspub/Makefile.am
new file mode 100644
index 0000000..b00eb61
--- /dev/null
+++ b/inc/libmspub/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+ libmspub.h \
+ MSPUBDocument.h \
+ MSPUBStringVector.h
diff --git a/inc/libmspub/libmspub.h b/inc/libmspub/libmspub.h
new file mode 100644
index 0000000..5c0da72
--- /dev/null
+++ b/inc/libmspub/libmspub.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libmspub
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __LIBMSPUB_H__
+#define __LIBMSPUB_H__
+
+#include "MSPUBDocument.h"
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+
+#endif
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/libmspub-0.0.pc.in b/libmspub-0.0.pc.in
deleted file mode 100644
index be16580..0000000
--- a/libmspub-0.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
-Description: Library for parsing the Microsoft Publisher file format structure
-Version: @VERSION@
-Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
-Libs: -L${libdir} -lmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
-Cflags: -I${includedir}/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
diff --git a/libmspub.pc.in b/libmspub.pc.in
new file mode 100644
index 0000000..be16580
--- /dev/null
+++ b/libmspub.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
+Description: Library for parsing the Microsoft Publisher file format structure
+Version: @VERSION@
+Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
+Libs: -L${libdir} -lmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
+Cflags: -I${includedir}/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 26a41b5..b5df257 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = pub2raw
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS)
$(WPD_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS)
pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@
diff --git a/src/conv/raw/pub2raw.cpp b/src/conv/raw/pub2raw.cpp
index 22cab3d..d2bd245 100644
--- a/src/conv/raw/pub2raw.cpp
+++ b/src/conv/raw/pub2raw.cpp
@@ -31,10 +31,10 @@
#include <stdio.h>
#include <string.h>
-#include "libmspub.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
#include <libwpg/libwpg.h>
+#include <libmspub/libmspub.h>
class RawPainter : public libwpg::WPGPaintInterface
{
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 52fa201..f392237 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = pub2xhtml
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS)
$(WPD_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPG_CFLAGS) $(WPD_CFLAGS)
$(DEBUG_CXXFLAGS)
pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@
diff --git a/src/conv/svg/pub2xhtml.cpp b/src/conv/svg/pub2xhtml.cpp
index 4161940..20aa5d8 100644
--- a/src/conv/svg/pub2xhtml.cpp
+++ b/src/conv/svg/pub2xhtml.cpp
@@ -33,9 +33,9 @@
#include <fstream>
#include <stdio.h>
#include <string.h>
-#include "libmspub.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libmspub/libmspub.h>
namespace
{
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
index 5089ea3..8ac3545 100644
--- a/src/lib/MSPUBDocument.cpp
+++ b/src/lib/MSPUBDocument.cpp
@@ -31,7 +31,8 @@
#include <string>
#include <string.h>
#include <boost/scoped_ptr.hpp>
-#include "MSPUBDocument.h"
+#include <libmspub/libmspub.h>
+
#include "MSPUBSVGGenerator.h"
#include "MSPUBCollector.h"
#include "MSPUBParser.h"
diff --git a/src/lib/MSPUBDocument.h b/src/lib/MSPUBDocument.h
deleted file mode 100644
index c430867..0000000
--- a/src/lib/MSPUBDocument.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libmspub
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Brennan Vincent <brenn...@email.arizona.edu>
- * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __MSPUBDOCUMENT_H__
-#define __MSPUBDOCUMENT_H__
-
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "MSPUBStringVector.h"
-
-class WPXInputStream;
-
-namespace libmspub
-{
-class MSPUBDocument
-{
-public:
-
- static bool isSupported(WPXInputStream *input);
-
- static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
-
- static bool generateSVG(::WPXInputStream *input, MSPUBStringVector &output);
-};
-
-} // namespace libmspub
-
-#endif // __MSPUBRAPHICS_H__
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBSVGGenerator.cpp b/src/lib/MSPUBSVGGenerator.cpp
index 8ca477b..427e94f 100644
--- a/src/lib/MSPUBSVGGenerator.cpp
+++ b/src/lib/MSPUBSVGGenerator.cpp
@@ -28,7 +28,6 @@
*/
#include "MSPUBSVGGenerator.h"
-#include "libmspub.h"
#include <locale.h>
#include <sstream>
#include <string>
diff --git a/src/lib/MSPUBSVGGenerator.h b/src/lib/MSPUBSVGGenerator.h
index 77ddafb..b98e8c7 100644
--- a/src/lib/MSPUBSVGGenerator.h
+++ b/src/lib/MSPUBSVGGenerator.h
@@ -35,7 +35,7 @@
#include <sstream>
#include <libwpd/libwpd.h>
#include <libwpg/libwpg.h>
-#include "MSPUBStringVector.h"
+#include <libmspub/libmspub.h>
namespace libmspub
{
diff --git a/src/lib/MSPUBStringVector.cpp b/src/lib/MSPUBStringVector.cpp
index 72af55a..cff7824 100644
--- a/src/lib/MSPUBStringVector.cpp
+++ b/src/lib/MSPUBStringVector.cpp
@@ -28,7 +28,7 @@
*/
#include <vector>
-#include "MSPUBStringVector.h"
+#include <libmspub/libmspub.h>
namespace libmspub
{
diff --git a/src/lib/MSPUBStringVector.h b/src/lib/MSPUBStringVector.h
deleted file mode 100644
index b3b659a..0000000
--- a/src/lib/MSPUBStringVector.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libmspub
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __MSPUBSTRINGVECTOR_H__
-#define __MSPUBSTRINGVECTOR_H__
-
-#include <libwpd/libwpd.h>
-
-namespace libmspub
-{
-class MSPUBStringVectorImpl;
-
-class MSPUBStringVector
-{
-public:
- MSPUBStringVector();
- MSPUBStringVector(const MSPUBStringVector &vec);
- ~MSPUBStringVector();
-
- MSPUBStringVector &operator=(const MSPUBStringVector &vec);
-
- unsigned size() const;
- bool empty() const;
- const WPXString &operator[](unsigned idx) const;
- void append(const WPXString &str);
- void clear();
-
-private:
- MSPUBStringVectorImpl *m_pImpl;
-};
-
-} // namespace libmspub
-
-#endif /* __MSPUBSTRINGVECTOR_H__ */
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a7f6be6..ee30001 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,11 +7,11 @@ endif
lib_LTLIBRARIES = libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_includedir =
$(includedir)/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@/libmspub
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_include_HEADERS = \
- libmspub.h \
- MSPUBDocument.h \
- MSPUBStringVector.h
+ $(top_srcdir)/inc/libmspub/libmspub.h \
+ $(top_srcdir)/inc/libmspub/MSPUBDocument.h \
+ $(top_srcdir)/inc/libmspub/MSPUBStringVector.h
-AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS)
$(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(ZLIB_CFLAGS)
$(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS)
$(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_DEPENDENCIES =
@LIBMSPUB_WIN32_RESOURCE@
diff --git a/src/lib/libmspub.h b/src/lib/libmspub.h
deleted file mode 100644
index 5c0da72..0000000
--- a/src/lib/libmspub.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libmspub
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __LIBMSPUB_H__
-#define __LIBMSPUB_H__
-
-#include "MSPUBDocument.h"
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-
-#endif
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
