Update to automake 1.14.

[pinentry.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f4fa814..f8f7aac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,12 +20,11 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-#DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4
+DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
-EXTRA_DIST = autogen.sh README.GIT ChangeLog-old \
+EXTRA_DIST = autogen.sh autogen.rc README.GIT ChangeLog-old \
             build-aux/gitlog-to-changelog \
             build-aux/git-log-fix build-aux/git-log-footer
 
@@ -35,10 +34,10 @@ else
 pinentry_curses =
 endif
 
-if BUILD_PINENTRY_GTK
-pinentry_gtk = gtk
+if BUILD_PINENTRY_TTY
+pinentry_tty = tty
 else
-pinentry_gtk =
+pinentry_tty =
 endif
 
 if BUILD_PINENTRY_GTK_2
@@ -47,12 +46,6 @@ else
 pinentry_gtk_2 =
 endif
 
-if BUILD_PINENTRY_QT
-pinentry_qt = qt
-else
-pinentry_qt =
-endif
-
 if BUILD_PINENTRY_QT4
 pinentry_qt4 = qt4
 else
@@ -65,9 +58,8 @@ else
 pinentry_w32 =
 endif
 
-SUBDIRS = assuan secmem pinentry ${pinentry_curses} \
-       ${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_qt4} \
-       ${pinentry_w32} doc
+SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \
+         ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc
 
 
 install-exec-local: