X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=5fc748658aba344259c4ec69f21a5d6143aba30b;hp=ba97c239658b2fc8a24ff9f41b1a048749ea60bf;hb=18ebc21bf1d29ed07fa007329879493493e18eb3;hpb=408bb2f4e5bd18dc15627f1cd5dc6ffb741a08b6

diff --git a/Makefile.am b/Makefile.am
index ba97c23..5fc7486 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,18 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
+SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib tools \
 	  lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
 	  pop imap $(NNTP_SUBDIR)
 
-BUILT_SOURCES = keymap_defs.h version.h charset.gperf
+BUILT_SOURCES = keymap_defs.h version.h charset.gperf rctokens.gperf rcparser.c rcparser.h
 DISTCLEANFILES = $(BUILT_SOURCES)
 
+rcparser.c rcparser.h: rcparser.y
+	$(MAKE) -C tools lemon
+	$(top_builddir)/tools/lemon -s $<
+	touch rcparser.c rcparser.h
+
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
 	alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
@@ -37,7 +42,7 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		       $(top_builddir)/lib-ui/libui.a \
 		       $(top_builddir)/lib-mx/libmx.a \
 		       \
-		       $(top_builddir)/pop/libpop.a  \
+		       $(top_builddir)/pop/libpop.a   \
 		       $(top_builddir)/imap/libimap.a \
 		       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -84,7 +89,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
 
@@ -93,12 +98,13 @@ LDADD = @LIBOBJS@ @LIBINTL@
 charset.gperf: charset.def
 	sh $< > $@
 
+rctokens.gperf: rctokens.sh
+	sh $< > $@
+
 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 +136,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 +145,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