[poppler] glib/Makefile.am qt4/demos qt4/src qt4/tests test/Makefile.am utils/CMakeLists.txt utils/Makefile.am

[Pino Toscano]

 glib/Makefile.am      |    4 +---
 qt4/demos/Makefile.am |    2 --
 qt4/src/Makefile.am   |    2 --
 qt4/tests/Makefile.am |    2 --
 test/Makefile.am      |    6 ++----
 utils/CMakeLists.txt  |    3 ---
 utils/Makefile.am     |    4 +---
 7 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 2df57857000c5adbee6b029ff7a79acc707786a0
Author: Pino Toscano <pino at kde.org>
Date:   Wed Aug 15 18:59:15 2012 +0200

    build: remove extra fontconfig CFLAGS and LIBS
    
    fontconfig is used only in .cpp sources inside the 'poppler' subdirectory, so there is no need to add the include paths for it in other directories;
    likewise, do not to link to it if not needed

diff --git a/glib/Makefile.am b/glib/Makefile.am
index fc5844b..54be977 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES =					\
 	-I$(top_srcdir)/poppler			\
 	$(POPPLER_GLIB_CFLAGS)			\
 	$(FREETYPE_CFLAGS)			\
-	$(FONTCONFIG_CFLAGS)                    \
 	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
 
@@ -75,8 +74,7 @@ libpoppler_glib_la_LIBADD =				\
 	$(top_builddir)/poppler/libpoppler.la		\
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(POPPLER_GLIB_LIBS)				\
-	$(FREETYPE_LIBS)				\
-	$(FONTCONFIG_LIBS)
+	$(FREETYPE_LIBS)
 
 libpoppler_glib_la_LDFLAGS = -version-info 12:0:4 @create_shared_lib@ @auto_import_flags@
 
diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
index 155fc1c..3cadda9 100644
--- a/qt4/demos/Makefile.am
+++ b/qt4/demos/Makefile.am
@@ -4,13 +4,11 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/poppler			\
 	-I$(top_srcdir)/qt4/src			\
-	$(FONTCONFIG_CFLAGS)			\
 	$(POPPLER_QT4_CFLAGS)
 
 LDADDS =					\
 	$(top_builddir)/poppler/libpoppler.la	\
 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
-	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
 
 SUFFIXES: .moc
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 02e0720..dc800e0 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -1,7 +1,6 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/poppler			\
-	$(FONTCONFIG_CFLAGS)			\
 	$(POPPLER_QT4_CFLAGS)
 
 SUFFIXES: .moc
@@ -59,7 +58,6 @@ libpoppler_qt4_la_CXXFLAGS = 			\
 libpoppler_qt4_la_LIBADD = 			\
 	$(top_builddir)/poppler/libpoppler.la	\
 	$(top_builddir)/poppler/libpoppler-arthur.la	\
-	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
 
 libpoppler_qt4_la_LDFLAGS = -version-info 4:0:0 @create_shared_lib@ @auto_import_flags@
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index be8ea35..67c0e36 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -5,13 +5,11 @@ INCLUDES =					\
 	-I$(top_srcdir)/poppler			\
 	-I$(top_srcdir)/qt4/src			\
 	-DTESTDATADIR=\"$(TESTDATADIR)\"        \
-	$(FONTCONFIG_CFLAGS)			\
 	$(POPPLER_QT4_CFLAGS)
 
 LDADDS =					\
 	$(top_builddir)/poppler/libpoppler.la	\
 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
-	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
 
 SUFFIXES: .moc
diff --git a/test/Makefile.am b/test/Makefile.am
index 0252911..619d671 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -39,8 +39,7 @@ INCLUDES =					\
 	-I$(top_srcdir)/glib			\
 	-I$(top_builddir)/glib			\
 	$(cairo_includes)			\
-	$(GTK_TEST_CFLAGS)			\
-	$(FONTCONFIG_CFLAGS)
+	$(GTK_TEST_CFLAGS)
 
 noinst_PROGRAMS = $(pdf_inspector) $(perf_test) $(pdf_fullrewrite) $(gtk_test)
 
@@ -53,8 +52,7 @@ gtk_test_LDADD =					\
 	$(top_builddir)/poppler/libpoppler.la           \
 	$(top_builddir)/glib/libpoppler-glib.la         \
 	$(CAIRO_LIBS)					\
-	$(GTK_TEST_LIBS)				\
-	$(FONTCONFIG_LIBS)
+	$(GTK_TEST_LIBS)
 
 
 pdf_inspector_SOURCES =			\
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 4a29841..06378bd 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -5,9 +5,6 @@ set(common_srcs
 set(common_libs
   poppler
 )
-if (FONTCONFIG_FOUND)
-  set(common_libs ${common_libs} ${FONTCONFIG_LIBRARIES})
-endif (FONTCONFIG_FOUND)
 
 if (ENABLE_SPLASH)
   # pdftoppm
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ad845c1..d56cc9c 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -16,13 +16,11 @@ INCLUDES =					\
 	-I$(top_srcdir)/utils			\
 	-I$(top_srcdir)/poppler			\
 	$(UTILS_CFLAGS)				\
-	$(FONTCONFIG_CFLAGS)			\
 	$(PDFTOCAIRO_CFLAGS)
 
 LDADD =						\
 	$(top_builddir)/poppler/libpoppler.la	\
-	$(UTILS_LIBS)				\
-	$(FONTCONFIG_LIBS)
+	$(UTILS_LIBS)
 
 if BUILD_CAIRO_OUTPUT