[git] Pinentry - branch, master, updated. pinentry-0.8.3-4-g54b9b92

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  54b9b92c13a496a33868501dec893bc8d82b1a8d (commit)
      from  0b3a8568e14b994a8d1f4c1cb42aed4959dfc811 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 54b9b92c13a496a33868501dec893bc8d82b1a8d
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 12 14:57:00 2013 +0200

    Fix for commit fb38be9 to allow for "make distcheck".
    
    * qt4/Makefile.am: Make correct use of BUILT_SOURCES.
    --
    This also remove some GNU make specific hacks.

diff --git a/.gitignore b/.gitignore
index 872e4af..575e011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,6 @@ secmem/Makefile
 w32/Makefile.in
 w32/Makefile
 
+/qt4/pinentryconfirm.moc
+/qt4/pinentrydialog.moc
+/qt4/qsecurelineedit.moc
diff --git a/qt4/Makefile.am b/qt4/Makefile.am
index 6606d71..6dd5f25 100644
--- a/qt4/Makefile.am
+++ b/qt4/Makefile.am
@@ -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 $@

-----------------------------------------------------------------------

Summary of changes:
 .gitignore      |    3 +++
 qt4/Makefile.am |   21 ++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org