Fix for commit fb38be9 to allow for "make distcheck".
authorWerner Koch <wk@gnupg.org>
Fri, 12 Jul 2013 12:57:00 +0000 (14:57 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 12 Jul 2013 12:57:00 +0000 (14:57 +0200)
* qt4/Makefile.am: Make correct use of BUILT_SOURCES.
--
This also remove some GNU make specific hacks.

.gitignore
qt4/Makefile.am

index 872e4af..575e011 100644 (file)
@@ -35,3 +35,6 @@ secmem/Makefile
 w32/Makefile.in
 w32/Makefile
 
+/qt4/pinentryconfirm.moc
+/qt4/pinentrydialog.moc
+/qt4/qsecurelineedit.moc
index 6606d71..6dd5f25 100644 (file)
@@ -41,17 +41,20 @@ pinentry_qt4_LDADD = $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
        ../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
        $(top_builddir)/secmem/libsecmem.a $(LIBCAP)
 
-$(pinentry_qt4_OBJECTS) : pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
+BUILT_SOURCES = \
+       pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
+
+MAINTAINERCLEANFILES = \
+       pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
+
+EXTRA_DIST += \
+        pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
 
 pinentry_qt4_SOURCES = pinentrydialog.h pinentrydialog.cpp \
        main.cpp secstring.h secstring.cpp qsecurelineedit.h \
        qsecurelineedit.cpp qrc_pinentry.cpp \
-       qsecurelineedit_p.h pinentryconfirm.cpp pinentryconfirm.h
-
-clean-moc-extra:
-       rm -vf *.moc
-
-clean-am: clean-moc-extra
+       qsecurelineedit_p.h pinentryconfirm.cpp pinentryconfirm.h \
+       pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
 
-%.moc: %.h
-       $(MOC) $< -o $@
+.h.moc:
+       $(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@