[poppler] Branch 'poppler-0.14' - glib/Makefile.am poppler/Makefile.am

[Albert Astals Cid]

 glib/Makefile.am    |    7 +++----
 poppler/Makefile.am |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 75c2cba15327930ae35a2bb160bdd3dc672bb178
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Jun 13 15:31:15 2010 +0100

    do not distribute these two files
    
    they are generated on configure/cmake time and depend on the machine

diff --git a/glib/Makefile.am b/glib/Makefile.am
index f69c67a..2b0fadd 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -47,8 +47,8 @@ poppler_glib_includedir = $(includedir)/poppler/glib
 
 poppler_glib_include_HEADERS =			\
 	$(poppler_glib_public_headers)		\
-	poppler-enums.h				\
-	poppler-features.h
+	poppler-enums.h
+nodist_poppler_glib_include_HEADERS = poppler-features.h
 
 lib_LTLIBRARIES = libpoppler-glib.la
 libpoppler_glib_la_SOURCES =			\
@@ -92,8 +92,7 @@ endif
 
 BUILT_SOURCES =					\
 	poppler-enums.c				\
-	poppler-enums.h				\
-	poppler-features.h
+	poppler-enums.h
 
 CLEANFILES = $(BUILT_SOURCES) $(stamp_files)
 DISTCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 3affce8..5f8f7fb 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -249,8 +249,8 @@ poppler_include_HEADERS =	\
 	SecurityHandler.h	\
 	UTF8.h			\
 	XpdfPluginAPI.h		\
-	Sound.h			\
-	poppler-config.h
+	Sound.h
+nodist_poppler_include_HEADERS = poppler-config.h
 
 endif