From 339cd78a57cc0fb53d90ae78187c6ad57f098e64 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Fri, 6 Jun 2014 21:14:15 +0200 Subject: [PATCH] Cleanup poppler/Makefile.am https://bugs.freedesktop.org/show_bug.cgi?id=79411 --- poppler/Makefile.am | 88 +++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/poppler/Makefile.am b/poppler/Makefile.am index c02f8d1..0bce3a1 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -1,7 +1,16 @@ +CFLAGS+=$(PTHREAD_CFLAGS) +CXXFLAGS+=$(PTHREAD_CFLAGS) + AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/goo +lib_LTLIBRARIES = libpoppler.la + +if BUILD_CAIRO_OUTPUT +noinst_LTLIBRARIES = libpoppler-cairo.la +endif + if BUILD_SPLASH_OUTPUT splash_sources = \ @@ -19,27 +28,6 @@ splash_libs = \ endif -if BUILD_CAIRO_OUTPUT - -poppler_cairo = libpoppler-cairo.la - -cairo_includes = \ - $(CAIRO_CFLAGS) - -libpoppler_cairo_la_SOURCES = \ - CairoFontEngine.cc \ - CairoFontEngine.h \ - CairoOutputDev.cc \ - CairoOutputDev.h \ - CairoRescaleBox.cc \ - CairoRescaleBox.h - -libpoppler_cairo_la_CPPFLAGS = \ - $(cairo_includes) \ - $(AM_CPPFLAGS) - -endif - if BUILD_LIBJPEG libjpeg_sources = \ @@ -125,31 +113,6 @@ cms_includes = $(LCMS_CFLAGS) cms_libs = $(LCMS_LIBS) endif -lib_LTLIBRARIES = libpoppler.la - -noinst_LTLIBRARIES = $(poppler_cairo) - -CFLAGS+=$(PTHREAD_CFLAGS) -CXXFLAGS+=$(PTHREAD_CFLAGS) - -libpoppler_la_LIBADD = \ - $(top_builddir)/goo/libgoo.la \ - $(top_builddir)/fofi/libfofi.la \ - $(cms_libs) \ - $(splash_libs) \ - $(libtiff_libs) \ - $(libjpeg_libs) \ - $(libpng_libs) \ - $(zlib_libs) \ - $(libcurl_libs) \ - $(libjpeg2000_libs) \ - $(FREETYPE_LIBS) \ - $(FONTCONFIG_LIBS) \ - $(PTHREAD_LIBS) \ - $(win32_libs) - -libpoppler_la_LDFLAGS = -version-info 46:0:0 @create_shared_lib@ @auto_import_flags@ - if ENABLE_XPDF_HEADERS poppler_includedir = $(includedir)/poppler @@ -316,6 +279,39 @@ libpoppler_la_CPPFLAGS = \ $(FONTCONFIG_CFLAGS) \ $(AM_CPPFLAGS) +libpoppler_la_LIBADD = \ + $(top_builddir)/goo/libgoo.la \ + $(top_builddir)/fofi/libfofi.la \ + $(cms_libs) \ + $(splash_libs) \ + $(libtiff_libs) \ + $(libjpeg_libs) \ + $(libpng_libs) \ + $(zlib_libs) \ + $(libcurl_libs) \ + $(libjpeg2000_libs) \ + $(FREETYPE_LIBS) \ + $(FONTCONFIG_LIBS) \ + $(PTHREAD_LIBS) \ + $(win32_libs) + +libpoppler_la_LDFLAGS = \ + -version-info 46:0:0 \ + @create_shared_lib@ \ + @auto_import_flags@ + +libpoppler_cairo_la_SOURCES = \ + CairoFontEngine.cc \ + CairoFontEngine.h \ + CairoOutputDev.cc \ + CairoOutputDev.h \ + CairoRescaleBox.cc \ + CairoRescaleBox.h + +libpoppler_cairo_la_CPPFLAGS = \ + $(CAIRO_CFLAGS) \ + $(AM_CPPFLAGS) + EXTRA_DIST = gen-unicode-tables.py \ GlobalParamsWin.cc \ PageLabelInfo_p.h -- 1.8.3.2