From 8b516c54c1d32a4979098bd8fd4170a04a545fe3 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Fri, 30 May 2014 10:00:50 +0200 Subject: [PATCH] Cleanup cpp/Makefile.am https://bugs.freedesktop.org/show_bug.cgi?id=79411 --- cpp/Makefile.am | 66 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 50856e2..2b23e05 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -1,37 +1,14 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ - -I$(top_srcdir)/poppler \ - $(libjpeg_includes) \ - $(libtiff_includes) \ - $(libjpeg2000_includes) \ - $(libpng_includes) - -if BUILD_LIBJPEG -libjpeg_includes = $(LIBJPEG_CFLAGS) -endif - -if BUILD_LIBTIFF -libtiff_includes = $(LIBTIFF_CFLAGS) -endif - -if BUILD_LIBOPENJPEG -libjpeg2000_includes = $(LIBOPENJPEG_CFLAGS) -endif - -if BUILD_LIBPNG -libpng_includes = $(LIBPNG_CFLAGS) -endif - SUBDIRS = . tests -poppler_includedir = $(includedir)/poppler/cpp -poppler_include_HEADERS = \ +lib_LTLIBRARIES = libpoppler-cpp.la + +libpoppler_cpp_includedir = $(includedir)/poppler/cpp +libpoppler_cpp_include_HEADERS = \ poppler-document.h \ poppler-embedded-file.h \ poppler-font.h \ poppler-global.h \ - poppler-image.h \ + poppler-image.h \ poppler-page.h \ poppler-page-renderer.h \ poppler-page-transition.h \ @@ -39,7 +16,6 @@ poppler_include_HEADERS = \ poppler-toc.h \ $(builddir)/poppler-version.h -lib_LTLIBRARIES = libpoppler-cpp.la libpoppler_cpp_la_SOURCES = \ poppler-document.cpp \ poppler-document-private.h \ @@ -60,11 +36,39 @@ libpoppler_cpp_la_SOURCES = \ poppler-toc-private.h \ poppler-version.cpp +if BUILD_LIBJPEG +libjpeg_includes = $(LIBJPEG_CFLAGS) +endif + +if BUILD_LIBTIFF +libtiff_includes = $(LIBTIFF_CFLAGS) +endif + +if BUILD_LIBOPENJPEG +libjpeg2000_includes = $(LIBOPENJPEG_CFLAGS) +endif + +if BUILD_LIBPNG +libpng_includes = $(LIBPNG_CFLAGS) +endif + +libpoppler_cpp_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/goo \ + -I$(top_srcdir)/poppler \ + $(libjpeg_includes) \ + $(libtiff_includes) \ + $(libjpeg2000_includes) \ + $(libpng_includes) + libpoppler_cpp_la_CXXFLAGS = \ -Dpoppler_cpp_EXPORTS -libpoppler_cpp_la_LIBADD = \ +libpoppler_cpp_la_LIBADD = \ $(top_builddir)/poppler/libpoppler.la \ $(LIBICONV) -libpoppler_cpp_la_LDFLAGS = -version-info 2:0:2 @create_shared_lib@ @auto_import_flags@ +libpoppler_cpp_la_LDFLAGS = \ + -version-info 2:0:2 \ + @create_shared_lib@ \ + @auto_import_flags@ -- 1.8.3.2