[poppler] Branch 'poppler-0.10' - 3 commits - CMakeLists.txt poppler/Makefile.am

[Pino Toscano]

 CMakeLists.txt      |   25 ++++++++++++++-----------
 poppler/Makefile.am |    1 -
 2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 7a79012628c7138ab40bf10c1f075e8d17948d4d
Merge: 4f9b984... 776617a...
Author: Pino Toscano <pino at kde.org>
Date:   Fri Dec 12 00:48:32 2008 +0100

    Merge branch 'poppler-0.10' of ssh://pino@git.freedesktop.org/git/poppler/poppler into poppler-0.10

commit 4f9b984eeae69efa3cccdeddb5fdae4880e073da
Author: Pino Toscano <pino at kde.org>
Date:   Fri Dec 12 00:47:06 2008 +0100

    update the xpdf headers installation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10efcaa..99360dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,16 +251,6 @@ install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE
 
 if(ENABLE_XPDF_HEADERS)
   install(FILES
-    goo/GooHash.h
-    goo/GooList.h
-    goo/GooTimer.h
-    goo/GooMutex.h
-    goo/GooString.h
-    goo/GooVector.h
-    goo/gtypes.h
-    goo/gmem.h
-    goo/gfile.h
-    goo/FixedPoint.h
     poppler/Annot.h
     poppler/Array.h
     poppler/BaseFile.h
@@ -287,8 +277,10 @@ if(ENABLE_XPDF_HEADERS)
     poppler/JBIG2Stream.h
     poppler/Lexer.h
     poppler/Link.h
+    poppler/Movie.h
     poppler/NameToCharCode.h
     poppler/Object.h
+    poppler/OptionalContent.h
     poppler/Outline.h
     poppler/OutputDev.h
     poppler/Page.h
@@ -318,9 +310,20 @@ if(ENABLE_XPDF_HEADERS)
     poppler/UTF8.h
     poppler/XpdfPluginAPI.h
     poppler/Sound.h
-    poppler/Movie.h
     ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h
     DESTINATION include/poppler)
+  install(FILES
+    goo/GooHash.h
+    goo/GooList.h
+    goo/GooTimer.h
+    goo/GooMutex.h
+    goo/GooString.h
+    goo/GooVector.h
+    goo/gtypes.h
+    goo/gmem.h
+    goo/gfile.h
+    goo/FixedPoint.h
+    DESTINATION include/poppler/goo)
   if(LIBOPENJPEG_FOUND)
     install(FILES
       poppler/JPEG2000Stream.h
commit 625b246d4744b87c486f9e2227349082217d7df5
Author: Pino Toscano <pino at kde.org>
Date:   Fri Dec 12 00:41:21 2008 +0100

    don't install Function.cc, as it is not an header

diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index db9fd74..5d22918 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -159,7 +159,6 @@ poppler_include_HEADERS =	\
 	FontEncodingTables.h	\
 	FontInfo.h		\
 	Form.h 			\
-	Function.cc		\
 	Function.h		\
 	Gfx.h			\
 	GfxFont.h		\