--- portfwd-0.22/src/Makefile.am~	Tue Feb  5 11:31:18 2002
+++ portfwd-0.22/src/Makefile.am	Tue Feb  5 11:31:18 2002
@@ -1,15 +1,6 @@
-CXXFLAGS = -Wall -ggdb -O3
-CFLAGS   = -Wall -ggdb -O3
 INCLUDES = -I$(top_srcdir)/src
 
 sbin_PROGRAMS = portfwd
 portfwd_SOURCES = addr.cc from_addr.cc host_map.cc portfwd.cc to_addr.cc \
 	entry.cc      net_portion.cc  proto_map.cc  \
-	forward.cc  port_pair.cc  solve.cc yconf.c lexconf.c util.cc 
-
-LDADD = getopt.o getopt1.o
-yconf.c: conf.y
-	$(YACC) -v -d -o $@ $<
-
-lexconf.c: conf.lex
-	$(LEX) -t $< > $@
+	forward.cc  port_pair.cc  solve.cc conf.y lexconf.c util.cc 
--- portfwd-0.22/tools/Makefile.am~	Tue Feb  5 11:32:37 2002
+++ portfwd-0.22/tools/Makefile.am	Tue Feb  5 11:32:37 2002
@@ -1,4 +1,3 @@
-CXXFLAGS = -Wall -g -O3
 INCLUDES = -I$(top_srcdir)/src
 
 noinst_PROGRAMS = t_vector udp_rcv udp_snd
--- portfwd-0.22/getopt/Makefile.am~	Tue Feb  5 11:33:28 2002
+++ portfwd-0.22/getopt/Makefile.am	Tue Feb  5 11:33:28 2002
@@ -1,11 +1,2 @@
-CC = $(REAL_CC)
 noinst_LIBRARIES = libgetopt.a
 libgetopt_a_SOURCES = getopt.c getopt1.c
-
-getopt.o: getopt.c
-	$(CC) -o $@ -c $<
-	cp $@ ../src
-getopt1.o: getopt1.c
-	$(CC) -o $@ -c $<
-	cp $@ ../src
-
--- portfwd-0.22/doc/Makefile.am~	Tue Feb  5 11:34:56 2002
+++ portfwd-0.22/doc/Makefile.am	Tue Feb  5 11:34:56 2002
@@ -1,7 +1,5 @@
 ## Makefile.am -- process this file with automake to produce Makefile.in
 
 man_MANS = portfwd.8 portfwd.cfg.5
-noinst_DATA = INSTALL.configure
 
-docdir = $(prefix)/doc/portfwd
-doc_DATA = FAQ conf.txt
+EXTRA_DIST = FAQ conf.txt INSTALL.configure