reorganize files

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_BUILD_TYPE Release CACHE STRING "Build configuration (Debug, Release,
 project(pdf2htmlEX)
 cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 
-include_directories(${CMAKE_SOURCE_DIR}/src/include)
+include_directories(${CMAKE_SOURCE_DIR}/src)
 
 set(PDF2HTMLEX_VERSION "0.6")
 set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})
@@ -138,37 +138,40 @@ if(NOT CXX0X_SUPPORT)
 endif()
 
 
-configure_file (${CMAKE_SOURCE_DIR}/src/include/pdf2htmlEX-config.h.in ${CMAKE_SOURCE_DIR}/src/include/pdf2htmlEX-config.h)
+configure_file (${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h.in ${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h)
 configure_file (${CMAKE_SOURCE_DIR}/pdf2htmlEX.1.in ${CMAKE_SOURCE_DIR}/pdf2htmlEX.1)
 
 add_executable(pdf2htmlEX 
+    src/Param.h
+    src/config.h
+    src/pdf2htmlEX-config.h
     src/pdf2htmlEX.cc 
-    src/include/HTMLRenderer.h 
-    src/HTMLRenderer/general.cc
-    src/HTMLRenderer/state.cc
-    src/HTMLRenderer/install.cc
-    src/HTMLRenderer/export.cc
-    src/HTMLRenderer/text.cc
-    src/HTMLRenderer/image.cc
+    src/HTMLRenderer/HTMLRenderer.h 
     src/HTMLRenderer/draw.cc
-    src/HTMLRenderer/link.cc
-    src/include/namespace.h
+    src/HTMLRenderer/export.cc
+    src/HTMLRenderer/general.cc
+    src/HTMLRenderer/image.cc
+    src/HTMLRenderer/install.cc
     src/HTMLRenderer/LineBuffer.cc
-    src/HTMLRenderer/TmpFiles.cc
-    src/include/ffw.h
-    src/ffw.c
-    src/include/BackgroundRenderer.h 
-    src/include/SplashBackgroundRenderer.h 
-    src/SplashBackgroundRenderer.cc 
-    src/include/CairoBackgroundRenderer.h 
-    src/CairoBackgroundRenderer.cc 
-    src/include/Preprocessor.h
-    src/Preprocessor.cc
-    src/include/util.h
-    src/util.cc
-    src/include/ArgParser.h
-    src/ArgParser.cc
-    src/include/pdf2htmlEX-config.h
+    src/HTMLRenderer/link.cc
+    src/HTMLRenderer/state.cc
+    src/HTMLRenderer/text.cc
+    src/HTMLRenderer/Preprocessor.h
+    src/HTMLRenderer/Preprocessor.cc
+    src/BackgroundRenderer/BackgroundRenderer.h 
+    src/BackgroundRenderer/SplashBackgroundRenderer.h 
+    src/BackgroundRenderer/SplashBackgroundRenderer.cc 
+    src/BackgroundRenderer/CairoBackgroundRenderer.h 
+    src/BackgroundRenderer/CairoBackgroundRenderer.cc 
+    src/util/namespace.h
+    src/util/ffw.h
+    src/util/ffw.c
+    src/util/util.h
+    src/util/util.cc
+    src/util/TmpFiles.h
+    src/util/TmpFiles.cc
+    src/util/ArgParser.h
+    src/util/ArgParser.cc
     )
 target_link_libraries(pdf2htmlEX ${PDF2HTMLEX_LIBS})
 

src/BackgroundRenderer/SplashBackgroundRenderer.h

@@ -15,8 +15,8 @@
 #include <splash/SplashBitmap.h>
 #include <SplashOutputDev.h>
 
-#include "HTMLRenderer.h"
 #include "Param.h"
+#include "HTMLRenderer/HTMLRenderer.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/HTMLRenderer.h

@@ -25,9 +25,9 @@
 #include <Annot.h>
 
 #include "Param.h"
-#include "util.h"
 #include "Preprocessor.h"
-#include "TmpFiles.h"
+#include "util/util.h"
+#include "util/TmpFiles.h"
 
 /*
  * Naming Convention

src/HTMLRenderer/LineBuffer.cc

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "HTMLRenderer.h"
-#include "namespace.h"
+#include "util/namespace.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/Preprocessor.cc

@@ -15,7 +15,7 @@
 #include <GfxFont.h>
 
 #include "Preprocessor.h"
-#include "util.h"
+#include "util/util.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/draw.cc

@@ -14,8 +14,8 @@
 #include <iostream>
 
 #include "HTMLRenderer.h"
-#include "util.h"
-#include "namespace.h"
+#include "util/util.h"
+#include "util/namespace.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/export.cc

@@ -11,7 +11,7 @@
 #include <cctype>
 
 #include "HTMLRenderer.h"
-#include "namespace.h"
+#include "util/namespace.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/general.cc

@@ -14,10 +14,10 @@
 #include <vector>
 
 #include "HTMLRenderer.h"
-#include "BackgroundRenderer.h"
-#include "namespace.h"
-#include "ffw.h"
 #include "pdf2htmlEX-config.h"
+#include "BackgroundRenderer/BackgroundRenderer.h"
+#include "util/namespace.h"
+#include "util/ffw.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/image.cc

@@ -8,7 +8,7 @@
  */
 
 #include "HTMLRenderer.h"
-#include "namespace.h"
+#include "util/namespace.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/install.cc

@@ -15,8 +15,8 @@
 
 #include "Param.h"
 #include "HTMLRenderer.h"
-#include "namespace.h"
-#include "util.h"
+#include "util/namespace.h"
+#include "util/util.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/link.cc

@@ -11,10 +11,10 @@
 #include <sstream>
 #include <algorithm>
 
-#include <HTMLRenderer.h>
 #include <Link.h>
 
-#include "namespace.h"
+#include "HTMLRenderer.h"
+#include "util/namespace.h"
 
 namespace pdf2htmlEX {
    

src/HTMLRenderer/state.cc

@@ -16,8 +16,8 @@
 #include <algorithm>
 
 #include "HTMLRenderer.h"
-#include "namespace.h"
-#include "util.h"
+#include "util/namespace.h"
+#include "util/util.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/text.cc

@@ -15,9 +15,9 @@
 #include <CharCodeToUnicode.h>
 #include <fofi/FoFiTrueType.h>
 
-#include "ffw.h"
 #include "HTMLRenderer.h"
-#include "namespace.h"
+#include "util/ffw.h"
+#include "util/namespace.h"
 
 namespace pdf2htmlEX {
 

src/pdf2htmlEX.cc

@@ -19,10 +19,10 @@
 #include <PDFDocFactory.h>
 #include <GlobalParams.h>
 
-#include "HTMLRenderer.h"
 #include "Param.h"
 #include "pdf2htmlEX-config.h"
-#include "ArgParser.h"
+#include "HTMLRenderer/HTMLRenderer.h"
+#include "util/ArgParser.h"
 
 using namespace std;
 using namespace pdf2htmlEX;