From 167cee136ce4f123e93d84670d30dd75ae235b8c Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Fri, 30 May 2014 11:17:55 +0200 Subject: [PATCH] Cleanup qt4/src/Makefile.am https://bugs.freedesktop.org/show_bug.cgi?id=79411 --- qt4/src/Makefile.am | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index 83a3b98..42859fd 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -1,14 +1,7 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/poppler \ - $(POPPLER_QT4_CFLAGS) \ - $(LCMS_CFLAGS) - -SUFFIXES: .moc - -poppler_includedir = $(includedir)/poppler/qt4 +lib_LTLIBRARIES = libpoppler-qt4.la -poppler_include_HEADERS = \ +libpoppler_qt4_includedir = $(includedir)/poppler/qt4 +libpoppler_qt4_include_HEADERS = \ poppler-qt4.h \ poppler-link.h \ poppler-annotation.h \ @@ -18,8 +11,6 @@ poppler_include_HEADERS = \ poppler-media.h \ poppler-page-transition.h -lib_LTLIBRARIES = libpoppler-qt4.la - libpoppler_qt4_la_SOURCES = \ poppler-document.cc \ poppler-page.cc \ @@ -55,18 +46,28 @@ libpoppler_qt4_la_SOURCES = \ ArthurOutputDev.h \ ArthurOutputDev.cc -libpoppler_qt4_la_CXXFLAGS = \ +libpoppler_qt4_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/poppler \ + $(POPPLER_QT4_CFLAGS) \ + $(LCMS_CFLAGS) + +libpoppler_qt4_la_CXXFLAGS = \ -Dpoppler_qt4_EXPORTS -libpoppler_qt4_la_LIBADD = \ +libpoppler_qt4_la_LIBADD = \ $(top_builddir)/poppler/libpoppler.la \ $(POPPLER_QT4_LIBS) -libpoppler_qt4_la_LDFLAGS = -version-info 8:0:4 @create_shared_lib@ @auto_import_flags@ +libpoppler_qt4_la_LDFLAGS = \ + -version-info 8:0:4 \ + @create_shared_lib@ \ + @auto_import_flags@ # This rule lets GNU make create any *.moc from the equivalent *.h .h.moc: $(AM_V_GEN) $(MOCQT4) -i $< -o $@ +SUFFIXES: .moc BUILT_SOURCES = poppler-optcontent.moc -- 1.8.3.2