more automake stuff

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/Makefile.am b/Makefile.am
index ba97c23..bb631e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -97,8 +97,6 @@ smime_keysng: $(srcdir)/smime_keys.pl
        cp $(srcdir)/smime_keys.pl smime_keysng
        chmod +x smime_keysng
 
-Makefile: $(BUILT_SOURCES)
-
 keymap_defs.h: OPS
        $(srcdir)/gen_defs $^ > keymap_defs.h
 
@@ -130,14 +128,6 @@ install-data-local: Madmuttrc
        fi
 
 
-# kluge around automake problems.
-
-dist-hook:
-       -for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-
-mutt-dist:
-       (cd $(srcdir) && ./build-release )
-
 update-doc: stamp-doc-rc
        (cd doc && $(MAKE) update-doc)
 
@@ -147,7 +137,7 @@ stamp-doc-rc: $(srcdir)/init.h makedoc Madmuttrc.head
        -rm -f Madmuttrc stamp-doc-rc
        $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
                $(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc
-       touch stamp-doc-rc
+       touch $@
 
 
 -include cflags.mk