Update to automake 1.14.
[pinentry.git] / Makefile.am
index abc7b73..f8f7aac 100644 (file)
@@ -20,7 +20,6 @@
 ## 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
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
@@ -41,24 +40,12 @@ else
 pinentry_tty =
 endif
 
-if BUILD_PINENTRY_GTK
-pinentry_gtk = gtk
-else
-pinentry_gtk =
-endif
-
 if BUILD_PINENTRY_GTK_2
 pinentry_gtk_2 = gtk+-2
 else
 pinentry_gtk_2 =
 endif
 
-if BUILD_PINENTRY_QT
-pinentry_qt = qt
-else
-pinentry_qt =
-endif
-
 if BUILD_PINENTRY_QT4
 pinentry_qt4 = qt4
 else
@@ -72,8 +59,7 @@ pinentry_w32 =
 endif
 
 SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \
-       ${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_qt4} \
-       ${pinentry_w32} doc
+         ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc
 
 
 install-exec-local: