chiark / gitweb /
Merge branch 'fwd' 1.3.5
authorMark Wooding <mdw@distorted.org.uk>
Wed, 2 Apr 2008 09:02:05 +0000 (10:02 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 2 Apr 2008 09:02:05 +0000 (10:02 +0100)
* fwd:
  Rename entire project from `fw' to `fwd'.

1  2 
Makefile.am
fwd.1.in
socket.c

diff --cc Makefile.am
index 3c5ca14860863e35c5eb162b6eaccaf31fb9adaf,eb33ab49f20fea7a9750c70c3d3b71e5399c8682..57b1a836bdf964525870132fa0300a86159a0de4
@@@ -96,16 -95,9 +96,16 @@@ fwd_SOURCES         += mantext.
  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 $@
  
 +###--------------------------------------------------------------------------
 +### The blast tool.
 +
 +noinst_PROGRAMS               += blast
 +blast_SOURCES          = blast.c
 +blast_LDADD            = $(mLib_LIBS)
 +
  ###--------------------------------------------------------------------------
  ### Other infrastructure.
  
diff --cc fwd.1.in
Simple merge
diff --cc socket.c
Simple merge