changelog: Finalise 2.2

[innduct.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b1579cdd6655a8326363a948aaa2a30d76a26687..c9a87c353ce2302bfffa98e0f25f41eb6cae51a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,25 +2,9 @@
 #  tailing reliable realtime streaming feeder for inn
 #  Makefile.am
 #
-#  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
-# 
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-# 
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#  (I believe that when you compile and link this as part of the inn2
-#  build, with the Makefile runes I have provided, all the libraries
-#  and files which end up included in innduct are licence-compatible
-#  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+#  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+#  and contributors; see LICENCE.txt.
+#  SPDX-License-Identifier: GPL-3.0-or-later
 
 AUTOMAKE_OPTIONS=foreign
 
@@ -37,22 +21,20 @@ WARNINGS= \
        -Wmissing-format-attribute -Wredundant-decls -Wnested-externs \
        -Wno-pointer-sign
 
-CFLAGS = @CFLAGS@ $(WARNINGS) $(WERROR) $(CMDLINE_CFLAGS)
+AM_CFLAGS = $(WARNINGS) $(WERROR) $(CMDLINE_CFLAGS)
 
 bin_PROGRAMS = innduct
 bin_SCRIPTS = innduct-stats-report innduct-forall
 man_MANS = innduct.8 innduct-stats-report.8
 innduct_SOURCES = duct.c conn.c filemon.c infile.c recv.c xmit.c \
-               cli.c defer.c help.c statemc.c __oop-read-copy.c
+               cli.c defer.c help.c statemc.c
+
+dist_doc_DATA = README.states README.statistics README.example \
+               LICENCE.txt
 
-innduct_LDADD = -L/usr/lib/news -lstorage -linn -lm -loop
+innduct_LDADD = -lm -loop
 
-autoconf:
-       aclocal-1.4
-       autoheader2.50
-       autoconf2.50
-       automake-1.4
-       perl -i.bak -pe '$$_="" if m/^(?:Makefile|config\.h):/..m/^$$/' \
-               Makefile.in
+autogen autoconf:
+       ./autogen.sh
 
 MAINTAINERCLEANFILES = configure config.h.in Makefile.in