diff options
| author | Pino Toscano <pino@kde.org> | 2012-08-15 18:59:15 +0200 |
|---|---|---|
| committer | Pino Toscano <pino@kde.org> | 2012-08-15 18:59:15 +0200 |
| commit | 2df57857000c5adbee6b029ff7a79acc707786a0 (patch) | |
| tree | 34baa66e1eb0d536ec776016fbfac2dfc2086c11 /utils | |
| parent | 3e802949264d9310df057daff891a3fccb2eb8d3 (diff) | |
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
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | utils/Makefile.am | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 4a29841b..06378bd9 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 ad845c19..d56cc9c6 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 |