Merge branch 'fwd'

[fwd] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3c5ca14..57b1a83 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,26 @@
 ### -*-makefile-*-
 ###
-### Makefile for fw
+### Makefile for fwd
 ###
 ### (c) 1999 Mark Wooding
 ###
 
 ###----- Licensing notice ---------------------------------------------------
 ###
-### This file is part of the `fw' port forwarder.
+### This file is part of the `fwd' port forwarder.
 ###
-### `fw' is free software; you can redistribute it and/or modify
+### `fwd' 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 2 of the License, or
 ### (at your option) any later version.
 ###
-### `fw' is distributed in the hope that it will be useful,
+### `fwd' 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 `fw'; if not, write to the Free Software Foundation,
+### along with `fwd'; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 bin_PROGRAMS            =
@@ -37,66 +37,66 @@ AM_CFLAGS            = $(mLib_CFLAGS)
 ###--------------------------------------------------------------------------
 ### Documentation.
 
-make_manpage            = perl $(srcdir)/make-manpage <$(srcdir)/fw.1.in
-EXTRA_DIST             += fw.1.in make-manpage
+make_manpage            = perl $(srcdir)/make-manpage <$(srcdir)/fwd.1.in
+EXTRA_DIST             += fwd.1.in make-manpage
 
 ## The manual page.
-man_MANS               += fw.1
-CLEANFILES             += fw.1
+man_MANS               += fwd.1
+CLEANFILES             += fwd.1
 
-fw.1: fw.1.in make-manpage
+fwd.1: fwd.1.in make-manpage
        $(make_manpage) man >$@.new && mv $@.new $@
 
 ## The grammar summary.
 MAINTAINERCLEANFILES   += $(srcdir)/GRAMMAR
 EXTRA_DIST             += GRAMMAR
 
-$(srcdir)/GRAMMAR: fw.1.in make-manpage
+$(srcdir)/GRAMMAR: fwd.1.in make-manpage
        $(make_manpage) text >$@.new && mv $@.new $@
 
 ###--------------------------------------------------------------------------
 ### The main port forwarder.
 
-bin_PROGRAMS           += fw
-fw_SOURCES              =
-fw_LDADD                = $(mLib_LIBS)
+bin_PROGRAMS           += fwd
+fwd_SOURCES             =
+fwd_LDADD               = $(mLib_LIBS)
 
 ## Main program.
-fw_SOURCES             += fw.c fw.h
+fwd_SOURCES            += fwd.c fwd.h
 
-fw_SOURCES             += chan.c
-fw_SOURCES             += endpt.c
-fw_SOURCES             += source.c
+fwd_SOURCES            += chan.c
+fwd_SOURCES            += endpt.c
+fwd_SOURCES            += source.c
 
-fw_SOURCES             += conf.c
-fw_SOURCES             += scan.c
-fw_SOURCES             += fattr.c
+fwd_SOURCES            += conf.c
+fwd_SOURCES            += scan.c
+fwd_SOURCES            += fattr.c
 
-fw_SOURCES             += reffd.c
+fwd_SOURCES            += reffd.c
 
 ## Sockets.
-fw_SOURCES             += socket.c
+fwd_SOURCES            += socket.c
 
-fw_SOURCES             += un.c
+fwd_SOURCES            += un.c
 
-fw_SOURCES             += inet.c
-fw_SOURCES             += acl.c
-fw_SOURCES             += identify.c
-fw_SOURCES             += privconn.c
+fwd_SOURCES            += inet.c
+fwd_SOURCES            += acl.c
+fwd_SOURCES            += identify.c
+fwd_SOURCES            += privconn.c
 
 ## Files.
-fw_SOURCES             += file.c
+fwd_SOURCES            += file.c
 
 ## Executables.
-fw_SOURCES             += exec.c
-fw_SOURCES             += rlimits.h
+fwd_SOURCES            += exec.c
+fwd_SOURCES            += rlimits.h
 
 ## Documentation.
-fw_SOURCES             += mantext.c
+fwd_SOURCES            += mantext.c
 CLEANFILES             += mantext.c
 BUILT_SOURCES          += mantext.c
 
-mantext.c: fw.1.in make-manpage
+mantext.c: fwd.1.in make-manpage
        $(make_manpage) c >$@.new && mv $@.new $@
 
 ###--------------------------------------------------------------------------
@@ -123,7 +123,11 @@ EXTRA_DIST         += debian/control
 EXTRA_DIST             += debian/copyright
 
 ## Run the daemon automatically.
-EXTRA_DIST             += debian/fw.init
-EXTRA_DIST             += debian/fw.postinst
+EXTRA_DIST             += debian/fwd.init
+EXTRA_DIST             += debian/fwd.postinst
+
+## Compatbility cruft.
+EXTRA_DIST             += debian/fw.sh
+EXTRA_DIST             += debian/fw.README.Debian
 
 ###----- That's all, folks --------------------------------------------------