more file rearranging

src/Makefile

@@ -25,20 +25,20 @@ DYNAMIC_LIBS +=
 ######################################
 # SOURCE FILES
 SRCS =  saxlib.cpp \
-	helpers/InputSourceResolver.cpp \
-	../Utils/rot13codecvt.cpp \
-	../Utils/utf8ucs2codecvt.cpp \
-	../Utils/impl/ucs2_utf8.cpp \
-	../Utils/utf16beucs2codecvt.cpp \
-	../Utils/utf16leucs2codecvt.cpp \
-	../Utils/impl/ucs2_utf16.cpp \
-	../Utils/iso88591utf8codecvt.cpp \
-	../Utils/utf8iso88591codecvt.cpp \
-	../Utils/impl/iso88591_utf8.cpp \
-	../Utils/utf16utf8codecvt.cpp \
-	../Utils/ucs2utf8codecvt.cpp \
-	../Utils/base64codecvt.cpp \
-	../XML/XMLCharacterClasses.cpp 
+	SAX/helpers/InputSourceResolver.cpp \
+	Utils/rot13codecvt.cpp \
+	Utils/utf8ucs2codecvt.cpp \
+	Utils/impl/ucs2_utf8.cpp \
+	Utils/utf16beucs2codecvt.cpp \
+	Utils/utf16leucs2codecvt.cpp \
+	Utils/impl/ucs2_utf16.cpp \
+	Utils/iso88591utf8codecvt.cpp \
+	Utils/utf8iso88591codecvt.cpp \
+	Utils/impl/iso88591_utf8.cpp \
+	Utils/utf16utf8codecvt.cpp \
+	Utils/ucs2utf8codecvt.cpp \
+	Utils/base64codecvt.cpp \
+	XML/XMLCharacterClasses.cpp 
 
 HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SRCS)))
 OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))

src/SAX.vcproj

@@ -691,53 +691,53 @@ cl /TC /D USE_LIBXML2 /EP saxlib.S > saxlib.cpp
 				Name="Helpers"
 				Filter="">
 				<File
-					RelativePath=".\helpers\InputSourceResolver.cpp">
+					RelativePath=".\SAX\helpers\InputSourceResolver.cpp">
 				</File>
 			</Filter>
 			<Filter
 				Name="Utils"
 				Filter="">
 				<File
-					RelativePath="..\Utils\base64codecvt.cpp">
+					RelativePath=".\Utils\base64codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\iso88591utf8codecvt.cpp">
+					RelativePath=".\Utils\iso88591utf8codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\rot13codecvt.cpp">
+					RelativePath=".\Utils\rot13codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\ucs2utf8codecvt.cpp">
+					RelativePath=".\Utils\ucs2utf8codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\utf16beucs2codecvt.cpp">
+					RelativePath=".\Utils\utf16beucs2codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\utf16leucs2codecvt.cpp">
+					RelativePath=".\Utils\utf16leucs2codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\utf16utf8codecvt.cpp">
+					RelativePath=".\Utils\utf16utf8codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\utf8iso88591codecvt.cpp">
+					RelativePath=".\Utils\utf8iso88591codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\Utils\utf8ucs2codecvt.cpp">
+					RelativePath=".\Utils\utf8ucs2codecvt.cpp">
 				</File>
 				<File
-					RelativePath="..\XML\XMLCharacterClasses.cpp">
+					RelativePath=".\XML\XMLCharacterClasses.cpp">
 				</File>
 				<Filter
 					Name="impl"
 					Filter="">
 					<File
-						RelativePath="..\Utils\impl\iso88591_utf8.cpp">
+						RelativePath=".\Utils\impl\iso88591_utf8.cpp">
 					</File>
 					<File
-						RelativePath="..\Utils\impl\ucs2_utf16.cpp">
+						RelativePath=".\Utils\impl\ucs2_utf16.cpp">
 					</File>
 					<File
-						RelativePath="..\Utils\impl\ucs2_utf8.cpp">
+						RelativePath=".\Utils\impl\ucs2_utf8.cpp">
 					</File>
 				</Filter>
 			</Filter>
@@ -748,7 +748,7 @@ cl /TC /D USE_LIBXML2 /EP saxlib.S &gt; saxlib.cpp
 					Name="Wrappers"
 					Filter="">
 					<File
-						RelativePath=".\wrappers\saxexpat.cpp">
+						RelativePath=".\SAX\wrappers\saxexpat.cpp">
 						<FileConfiguration
 							Name="Debug|Win32"
 							ExcludedFromBuild="TRUE">
@@ -763,7 +763,7 @@ cl /TC /D USE_LIBXML2 /EP saxlib.S &gt; saxlib.cpp
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\wrappers\saxlibxml2.cpp">
+						RelativePath=".\SAX\wrappers\saxlibxml2.cpp">
 						<FileConfiguration
 							Name="Debug|Win32"
 							ExcludedFromBuild="TRUE">
@@ -778,7 +778,7 @@ cl /TC /D USE_LIBXML2 /EP saxlib.S &gt; saxlib.cpp
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="wrappers\saxxerces.cpp">
+						RelativePath=".\SAX\wrappers\saxxerces.cpp">
 						<FileConfiguration
 							Name="Debug|Win32"
 							ExcludedFromBuild="TRUE">

src/saxlib.S

@@ -21,7 +21,7 @@ define NO_DEFAULT_PARSER
 include <SAX/XMLReader.h>
 
 #ifdef USE_LIBXML2
-include <SAX/wrappers/saxlibxml2.cpp>
+include "SAX/wrappers/saxlibxml2.cpp"
 #ifdef _MSC_VER
 message("Pulling in libxml2 wrappers.")
 #endif
@@ -36,7 +36,7 @@ message("Nothing to pull in for MSXML.")
 #endif 
 
 #ifdef USE_XERCES
-include <SAX/wrappers/saxxerces.cpp>
+include "SAX/wrappers/saxxerces.cpp"
 #ifdef _MSC_VER
 message("Pulling in Xerces wrappers.")
 #endif
@@ -49,14 +49,14 @@ message("Nothing to pull in for Garden.")
 #endif
 
 #ifdef USE_EXPAT
-include <SAX/wrappers/saxexpat.cpp>
+include "SAX/wrappers/saxexpat.cpp"
 #ifdef _MSC_VER
 message("Pulling in Expat wrappers.")
 #endif	
 #endif
 
 ifndef ARABICA_NO_CODECVT_SPECIALISATIONS
-include "../Utils/impl/codecvt_specialisations.cpp"
+include "Utils/impl/codecvt_specialisations.cpp"
 endif
 
 #ifdef __GNUWIN32__