From 45e51b1d09d2369482281d7d9966da1b9784f2e6 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Fri, 30 May 2014 11:24:18 +0200
Subject: [PATCH] Cleanup qt4/demos/Makefile.am

https://bugs.freedesktop.org/show_bug.cgi?id=79411
---
 qt4/demos/Makefile.am | 59 +++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
index 3cadda9..448facd 100644
--- a/qt4/demos/Makefile.am
+++ b/qt4/demos/Makefile.am
@@ -1,25 +1,23 @@
 AM_LDFLAGS = @auto_import_flags@
 
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	-I$(top_srcdir)/qt4/src			\
-	$(POPPLER_QT4_CFLAGS)
-
-LDADDS =					\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
-	$(POPPLER_QT4_LIBS)
-
-SUFFIXES: .moc
-
-# This rule lets GNU make create any *.moc from the equivalent *.h
-.h.moc:
-	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
-
 noinst_PROGRAMS = poppler_qt4viewer
 
+BUILT_SOURCES =					\
+	abstractinfodock.moc			\
+	embeddedfiles.moc			\
+	fonts.moc				\
+	info.moc				\
+	metadata.moc				\
+	navigationtoolbar.moc			\
+	optcontent.moc				\
+	pageview.moc				\
+	permissions.moc				\
+	thumbnails.moc				\
+	toc.moc					\
+	viewer.moc
+
 poppler_qt4viewer_SOURCES =			\
+	$(BUILT_SOURCES)			\
 	abstractinfodock.cpp			\
 	abstractinfodock.h			\
 	documentobserver.cpp			\
@@ -48,20 +46,21 @@ poppler_qt4viewer_SOURCES =			\
 	viewer.cpp				\
 	viewer.h
 
-abstractinfodock.$(OBJEXT): abstractinfodock.moc
-embeddedfiles.$(OBJEXT): embeddedfiles.moc
-fonts.$(OBJEXT): fonts.moc
-info.$(OBJEXT): info.moc
-metadata.$(OBJEXT): metadata.moc
-navigationtoolbar.$(OBJEXT): navigationtoolbar.moc
-optcontent.$(OBJEXT): optcontent.moc
-pageview.$(OBJEXT): pageview.moc
-permissions.$(OBJEXT): permissions.moc
-thumbnails.$(OBJEXT): thumbnails.moc
-toc.$(OBJEXT): toc.moc
-viewer.$(OBJEXT): viewer.moc
+poppler_qt4viewer_CPPFLAGS =			\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	-I$(top_srcdir)/qt4/src			\
+	$(POPPLER_QT4_CFLAGS)
 
-poppler_qt4viewer_LDADD = $(LDADDS)
+poppler_qt4viewer_LDADD =				\
+	$(top_builddir)/poppler/libpoppler.la		\
+	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+	$(POPPLER_QT4_LIBS)
+
+# This rule lets GNU make create any *.moc from the equivalent *.h
+.h.moc:
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
+SUFFIXES: .moc
 
 clean-generic:
 	rm -f *.moc
-- 
1.8.3.2