[poppler] 2 commits - qt4/demos

[Pino Toscano]

 qt4/demos/Makefile.am |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 3c407efe9f1f0cc3f6366d3a2b6e9b687656cc95
Merge: 51f0cea... 7f4acb8...
Author: Pino Toscano <pino at kde.org>
Date:   Mon Feb 18 21:30:42 2008 +0100

    Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler

commit 51f0cea0e3ba1acfc63877752e950fdd8c07e258
Author: Pino Toscano <pino at kde.org>
Date:   Mon Feb 18 21:29:41 2008 +0100

    make the poppler_qt4viewer compile with the auto"tools"

diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
index 4f53d07..49391dd 100644
--- a/qt4/demos/Makefile.am
+++ b/qt4/demos/Makefile.am
@@ -15,8 +15,8 @@ LDADDS =					\
 SUFFIXES: .moc
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
-%.moc: %.h
-	moc $< -o $@
+.h.moc:
+	moc -i $< -o $@
 
 noinst_PROGRAMS = poppler_qt4viewer
 
@@ -30,7 +30,15 @@ poppler_qt4viewer_SOURCES =			\
 	pageview.cpp				\
 	permissions.cpp				\
 	toc.cpp					\
-	viewer.cpp				\
-	viewer.moc
+	viewer.cpp
+
+abstractinfodock.$(OBJEXT): abstractinfodock.moc
+fonts.$(OBJEXT): fonts.moc
+info.$(OBJEXT): info.moc
+navigationtoolbar.$(OBJEXT): navigationtoolbar.moc
+pageview.$(OBJEXT): pageview.moc
+permissions.$(OBJEXT): permissions.moc
+toc.$(OBJEXT): toc.moc
+viewer.$(OBJEXT): viewer.moc
 
 poppler_qt4viewer_LDADD = $(LDADDS)