From efd15e3735ea4f345c18b839bc6cb8d8b313e0bb Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Mon, 10 Sep 2012 13:08:47 +0800
Subject: [PATCH] rearrange files

---
 CMakeLists.txt                            | 19 +++++++++----------
 src/HTMLRenderer/LineBuffer.cc            |  2 +-
 src/HTMLRenderer/export.cc                |  1 -
 src/HTMLRenderer/general.cc               |  4 ++--
 src/HTMLRenderer/text.cc                  |  3 +--
 src/{HTMLRenderer => include}/namespace.h |  0
 src/include/pdf2htmlEX-config.h.in        |  6 +++---
 src/include/util.h                        |  2 --
 src/pdf2htmlEX.cc                         |  2 +-
 9 files changed, 17 insertions(+), 22 deletions(-)
 rename src/{HTMLRenderer => include}/namespace.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d769cf1..dd6d288 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,26 +60,25 @@ configure_file (${CMAKE_SOURCE_DIR}/src/include/pdf2htmlEX-config.h.in ${CMAKE_S
 
 add_executable(pdf2htmlEX 
     src/pdf2htmlEX.cc 
-    src/HTMLRenderer.h 
+    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/namespace.h
+    src/include/namespace.h
     src/HTMLRenderer/LineBuffer.cc
-    src/ff/ff.h
-    src/ff/ff.c
-    src/BackgroundRenderer.h 
+    src/include/ff.h
+    src/ff.c
+    src/include/BackgroundRenderer.h 
     src/BackgroundRenderer.cc 
-    src/FontPreprocessor.h
+    src/include/FontPreprocessor.h
     src/FontPreprocessor.cc
-    src/Consts.h 
-    src/Consts.cc 
-    src/util.h
+    src/include/util.h
     src/util.cc
-    src/config.h)
+    src/include/pdf2htmlEX-config.h
+    )
 
 target_link_libraries(pdf2htmlEX ${POPPLER_LIBRARIES} ${Boost_LIBRARIES} ${FONTFORGE_LIBRARIES} ${PYTHON_LIBRARIES})
 
diff --git a/src/HTMLRenderer/LineBuffer.cc b/src/HTMLRenderer/LineBuffer.cc
index cd66976..dcb8995 100644
--- a/src/HTMLRenderer/LineBuffer.cc
+++ b/src/HTMLRenderer/LineBuffer.cc
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "HTMLRenderer.h"
-#include "HTMLRenderer/namespace.h"
+#include "namespace.h"
 
 using std::min;
 using std::max;
diff --git a/src/HTMLRenderer/export.cc b/src/HTMLRenderer/export.cc
index fbc138e..00fbcab 100644
--- a/src/HTMLRenderer/export.cc
+++ b/src/HTMLRenderer/export.cc
@@ -12,7 +12,6 @@
 
 #include "HTMLRenderer.h"
 #include "namespace.h"
-#include "config.h"
 
 void HTMLRenderer::export_remote_font(const FontInfo & info, const string & suffix, const string & fontfileformat, GfxFont * font) 
 {
diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc
index 94ac06e..29ab895 100644
--- a/src/HTMLRenderer/general.cc
+++ b/src/HTMLRenderer/general.cc
@@ -13,9 +13,9 @@
 
 #include "HTMLRenderer.h"
 #include "BackgroundRenderer.h"
-#include "config.h"
 #include "namespace.h"
-#include "ff/ff.h"
+#include "ff.h"
+#include "pdf2htmlEX-config.h"
 
 using std::fixed;
 using std::flush;
diff --git a/src/HTMLRenderer/text.cc b/src/HTMLRenderer/text.cc
index ca1b5c1..96da4e2 100644
--- a/src/HTMLRenderer/text.cc
+++ b/src/HTMLRenderer/text.cc
@@ -15,10 +15,9 @@
 #include <CharCodeToUnicode.h>
 #include <fofi/FoFiTrueType.h>
 
-#include "ff/ff.h"
+#include "ff.h"
 #include "HTMLRenderer.h"
 #include "namespace.h"
-#include "config.h"
 
 using std::unordered_set;
 using std::min;
diff --git a/src/HTMLRenderer/namespace.h b/src/include/namespace.h
similarity index 100%
rename from src/HTMLRenderer/namespace.h
rename to src/include/namespace.h
diff --git a/src/include/pdf2htmlEX-config.h.in b/src/include/pdf2htmlEX-config.h.in
index 6efeefa..836d34c 100644
--- a/src/include/pdf2htmlEX-config.h.in
+++ b/src/include/pdf2htmlEX-config.h.in
@@ -6,8 +6,8 @@
  */
 
 
-#ifndef CONFIG_H__
-#define CONFIG_H__
+#ifndef PDF2HTMLEX_CONFIG_H__
+#define PDF2HTMLEX_CONFIG_H__
 
 #include <string>
 
@@ -16,4 +16,4 @@ static const std::string PDF2HTMLEX_PREFIX = "@CMAKE_INSTALL_PREFIX@";
 static const std::string PDF2HTMLEX_DATA_PATH = "@CMAKE_INSTALL_PREFIX@""/share/pdf2htmlEX";
 
 
-#endif //CONFIG_H__
+#endif //PDF2HTMLEX_CONFIG_H__
diff --git a/src/include/util.h b/src/include/util.h
index cce21a5..a677228 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -19,8 +19,6 @@
 
 #include <UTF8.h>
 
-#include "Consts.h"
-
 using std::istream;
 using std::ostream;
 using std::max;
diff --git a/src/pdf2htmlEX.cc b/src/pdf2htmlEX.cc
index 2f48a98..8b24e71 100644
--- a/src/pdf2htmlEX.cc
+++ b/src/pdf2htmlEX.cc
@@ -23,7 +23,7 @@
 
 #include "HTMLRenderer.h"
 #include "Param.h"
-#include "config.h"
+#include "pdf2htmlEX-config.h"
 
 namespace po = boost::program_options;
 using namespace std;