Fix distcheck errors

5 files changed, 63 insertions, 39 deletions

diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index bf68e6f..99aba14 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 	libpgplus.dsw \
 	libpgplus.dsp \
-	pub2raw.dsp \
-	pub2xhtml.dsp \
+	ppp2raw.dsp \
+	ppp2xhtml.dsp \
 	compile-resource \
 	lt-compile-resource
diff --git a/build/win32/libmspub.dsp b/build/win32/libpgplus.dsp
index 1234886..b85f433 100644
--- a/build/win32/libmspub.dsp
+++ b/build/win32/libpgplus.dsp
@@ -87,15 +87,27 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=..\..\src\lib\libpgplus_utils.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PGPLUSCollector.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\PGPLUSDocument.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\PGPLUSSVGGenerator.cpp

+SOURCE=..\..\src\lib\PGPLUSParser.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\libpgplus_utils.cpp

+SOURCE=..\..\src\lib\PGPLUSStringVector.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PGPLUSSVGGenerator.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -103,19 +115,31 @@ SOURCE=..\..\src\lib\libpgplus_utils.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=..\..\src\lib\libpgplus.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\libpgplus_utils.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PGPLUSCollector.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\PGPLUSDocument.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\PGPLUSSVGGenerator.h

+SOURCE=..\..\src\lib\PGPLUSParser.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\libpgplus.h

+SOURCE=..\..\src\lib\PGPLUSStringVector.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\libpgplus_utils.h

+SOURCE=..\..\src\lib\PGPLUSSVGGenerator.h

 # End Source File

 # End Group

 # End Target

diff --git a/build/win32/libmspub.dsw b/build/win32/libpgplus.dsw
index 204d17d..8065cde 100644
--- a/build/win32/libmspub.dsw
+++ b/build/win32/libpgplus.dsw
@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pub2xhtml"=.\pub2xhtml.dsp - Package Owner=<4>

+Project: "ppp2xhtml"=.\ppp2xhtml.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -30,7 +30,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pub2raw"=.\pub2raw.dsp - Package Owner=<4>

+Project: "ppp2raw"=.\ppp2raw.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/build/win32/pub2raw.dsp b/build/win32/ppp2raw.dsp
index ce39f85..f114ec5 100644
--- a/build/win32/pub2raw.dsp
+++ b/build/win32/ppp2raw.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pub2raw" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ppp2raw" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=pub2raw - Win32 Release

+CFG=ppp2raw - Win32 Release

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "pub2raw.mak".

+!MESSAGE NMAKE /f "ppp2raw.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "pub2raw.mak" CFG="pub2raw - Win32 Release"

+!MESSAGE NMAKE /f "ppp2raw.mak" CFG="ppp2raw - Win32 Release"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "pub2raw - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "pub2raw - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "ppp2raw - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "ppp2raw - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=pub2raw - Win32 Release
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "pub2raw - Win32 Release"

+!IF  "$(CFG)" == "ppp2raw - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -52,11 +52,11 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2raw.exe" /libpath:"Release\lib"

-# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2raw.exe" /libpath:"Release\lib"

+# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\ppp2raw.exe" /libpath:"Release\lib"

+# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\ppp2raw.exe" /libpath:"Release\lib"

 # SUBTRACT LINK32 /nodefaultlib

 

-!ELSEIF  "$(CFG)" == "pub2raw - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ppp2raw - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -80,22 +80,22 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2raw.exe" /libpath:"Debug\lib"

-# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2raw.exe" /libpath:"Debug\lib"

+# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\ppp2raw.exe" /libpath:"Debug\lib"

+# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\ppp2raw.exe" /libpath:"Debug\lib"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

 

 # Begin Target

 

-# Name "pub2raw - Win32 Release"

-# Name "pub2raw - Win32 Debug"

+# Name "ppp2raw - Win32 Release"

+# Name "ppp2raw - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

 # Begin Source File

 

-SOURCE=..\..\src\conv\raw\pub2raw.cpp

+SOURCE=..\..\src\conv\raw\ppp2raw.cpp

 # End Source File

 # End Group

 # End Target

diff --git a/build/win32/pub2xhtml.dsp b/build/win32/ppp2xhtml.dsp
index 463d166..181c7d8 100644
--- a/build/win32/pub2xhtml.dsp
+++ b/build/win32/ppp2xhtml.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pub2xhtml" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ppp2xhtml" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=pub2xhtml - Win32 Release

+CFG=ppp2xhtml - Win32 Release

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "pub2xhtml.mak".

+!MESSAGE NMAKE /f "ppp2xhtml.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "pub2xhtml.mak" CFG="pub2xhtml - Win32 Release"

+!MESSAGE NMAKE /f "ppp2xhtml.mak" CFG="ppp2xhtml - Win32 Release"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "pub2xhtml - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "pub2xhtml - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "ppp2xhtml - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "ppp2xhtml - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=pub2xhtml - Win32 Release
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "pub2xhtml - Win32 Release"

+!IF  "$(CFG)" == "ppp2xhtml - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -52,11 +52,11 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2xhtml.exe" /libpath:"Release\lib"

-# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2xhtml.exe" /libpath:"Release\lib"

+# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\ppp2xhtml.exe" /libpath:"Release\lib"

+# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\ppp2xhtml.exe" /libpath:"Release\lib"

 # SUBTRACT LINK32 /nodefaultlib

 

-!ELSEIF  "$(CFG)" == "pub2xhtml - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ppp2xhtml - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -80,22 +80,22 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2xhtml.exe" /libpath:"Debug\lib"

-# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2xhtml.exe" /libpath:"Debug\lib"

+# ADD BASE LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\ppp2xhtml.exe" /libpath:"Debug\lib"

+# ADD LINK32 libpgplus-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\ppp2xhtml.exe" /libpath:"Debug\lib"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

 

 # Begin Target

 

-# Name "pub2xhtml - Win32 Release"

-# Name "pub2xhtml - Win32 Debug"

+# Name "ppp2xhtml - Win32 Release"

+# Name "ppp2xhtml - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

 # Begin Source File

 

-SOURCE=..\..\src\conv\svg\pub2xhtml.cpp

+SOURCE=..\..\src\conv\svg\ppp2xhtml.cpp

 # End Source File

 # End Group

 # End Target