[bogofilter-announce] Version 0.7.4 Beta Released

[Matthias Andree]

I have a somewhat large Makefile.am patch to make automake Do The Right
Thing, but I feel that's nontrivial and needs your approval during the
beta release phase. Particularly, it changes lexertest from bin_PROGRAMS
to noinst_PROGRAMS and removes manual rules when automake can handle
them.

Please have a look and tell me if you want me to check this in or no.
(I may have to adjust the .xml.1 rule for BSD make, we'll see).

Index: Makefile.am
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- Makefile.am	17 Sep 2002 06:21:28 -0000	1.7
+++ Makefile.am	17 Sep 2002 11:51:00 -0000
@@ -27,21 +27,31 @@
 # Revision 1.1.1.1  2002/09/14 22:15:20  adrian_otto
 # 0.7.3 Base Source
 #
-bin_PROGRAMS = bogofilter lexertest
-bogofilter_SOURCES = bogofilter.c bogofilter.h lock.c lock.h main.c lexer_l.c
-lexertest_SOURCES =
-lexertest_LDADD = lexertest.o
+
+# foreign: don't insist on ChangeLog
+# 1.6: minimum version
+AUTOMAKE_OPTIONS = foreign 1.6
+
+# what to build
+bin_PROGRAMS = bogofilter
+noinst_PROGRAMS = lexertest
 man1_MANS = bogofilter.1
-EXTRA_DIST = $(man1_MANS)
+
+# what to build that from
+bogofilter_SOURCES = bogofilter.c bogofilter.h lock.c lock.h main.c lexer_l.l
+
+lexertest_SOURCES = lexer_l.l
+lexertest_CFLAGS = -DMAIN
+
+# what to distribute
+EXTRA_DIST = $(man1_MANS) \
+	     bogofilter.xml \
+	     bogofilter.spec bogofilter.spec.in
+	     
 #
-lexer_l.c: lexer_l.l
-	$(LEX) lexer_l.l
-#
-lexertest.o: lexer_l.c
-	$(COMPILE) -DMAIN -o lexertest.o -c lexer_l.c
-#
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core lexer_l.c
-#
-bogofilter.1: bogofilter.xml
-	xmlto man bogofilter.xml
+.xml.1:
+	xmlto man $<
+
+.PHONY: rpm
+rpm:	    dist $(distdir).tar.gz
+	rpm -ta $(distdir).tar.gz