diff --git a/configure.ac b/configure.in
similarity index 100%
rename from configure.ac
rename to configure.in
diff --git a/src/common/Makefile b/src/common/Makefile
index 3b0e45159d..f7b99e7cd1 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,228 +1,321 @@
-SRC=log.c config.c utils.c key.c onion.c cell.c routent.c scheduler.c
-OBJ=${SRC:.c=.o}
-INCLUDE=-I/usr/local/ssl/include
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# src/common/Makefile.  Generated from Makefile.in by configure.
 
-CFLAGS=${INCLUDE} -Wall -Wpointer-arith -O2
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all:	${OBJ}
-
-clean:
-	rm -f $(OBJ)
-
-depend:
-	makedepend -- $(CFLAGS) -- $(SRC)
-
-# DO NOT DELETE
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
-cell.o: cell.h log.h /usr/include/alloca.h /usr/include/asm/socket.h
-cell.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h
-cell.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-cell.o: /usr/include/bits/environments.h /usr/include/bits/in.h
-cell.o: /usr/include/bits/local_lim.h /usr/include/bits/posix1_lim.h
-cell.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-cell.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-cell.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-cell.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h
-cell.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-cell.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h
-cell.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-cell.o: /usr/include/bits/wordsize.h /usr/include/bits/xopen_lim.h
-cell.o: /usr/include/endian.h /usr/include/features.h /usr/include/getopt.h
-cell.o: /usr/include/gnu/stubs.h /usr/include/limits.h
-cell.o: /usr/include/linux/limits.h /usr/include/netinet/in.h
-cell.o: /usr/include/openssl/rand.h /usr/include/stdint.h
-cell.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/cdefs.h
-cell.o: /usr/include/syslog.h /usr/include/sys/select.h
-cell.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-cell.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/unistd.h
-cell.o: /usr/include/xlocale.h
-cell.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-cell.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-cell.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-cell.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
-config.o: config.h log.h /usr/include/alloca.h /usr/include/asm/errno.h
-config.o: /usr/include/bits/endian.h /usr/include/bits/errno.h
-config.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-config.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-config.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-config.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h
-config.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-config.o: /usr/include/ctype.h /usr/include/endian.h /usr/include/errno.h
-config.o: /usr/include/features.h /usr/include/_G_config.h
-config.o: /usr/include/gconv.h /usr/include/gnu/stubs.h /usr/include/libio.h
-config.o: /usr/include/linux/errno.h /usr/include/stdio.h
-config.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/cdefs.h
-config.o: /usr/include/syslog.h /usr/include/sys/select.h
-config.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-config.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/wchar.h
-config.o: /usr/include/xlocale.h
-config.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-config.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-key.o: config.h key.h log.h /usr/include/alloca.h /usr/include/asm/errno.h
-key.o: /usr/include/bits/endian.h /usr/include/bits/errno.h
-key.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-key.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-key.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-key.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h
-key.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-key.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h
-key.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/gnu/stubs.h
-key.o: /usr/include/libio.h /usr/include/linux/errno.h
-key.o: /usr/include/openssl/asn1.h /usr/include/openssl/bio.h
-key.o: /usr/include/openssl/blowfish.h /usr/include/openssl/bn.h
-key.o: /usr/include/openssl/buffer.h /usr/include/openssl/cast.h
-key.o: /usr/include/openssl/crypto.h /usr/include/openssl/des.h
-key.o: /usr/include/openssl/dh.h /usr/include/openssl/dsa.h
-key.o: /usr/include/openssl/e_os2.h /usr/include/openssl/err.h
-key.o: /usr/include/openssl/evp.h /usr/include/openssl/lhash.h
-key.o: /usr/include/openssl/md2.h /usr/include/openssl/md4.h
-key.o: /usr/include/openssl/md5.h /usr/include/openssl/objects.h
-key.o: /usr/include/openssl/obj_mac.h /usr/include/openssl/opensslconf.h
-key.o: /usr/include/openssl/opensslv.h /usr/include/openssl/pem2.h
-key.o: /usr/include/openssl/pem.h /usr/include/openssl/pkcs7.h
-key.o: /usr/include/openssl/rc2.h /usr/include/openssl/rc4.h
-key.o: /usr/include/openssl/ripemd.h /usr/include/openssl/rsa.h
-key.o: /usr/include/openssl/safestack.h /usr/include/openssl/sha.h
-key.o: /usr/include/openssl/stack.h /usr/include/openssl/symhacks.h
-key.o: /usr/include/openssl/x509.h /usr/include/openssl/x509_vfy.h
-key.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-key.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-key.o: /usr/include/sys/select.h /usr/include/sys/syslog.h
-key.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h
-key.o: /usr/include/time.h /usr/include/wchar.h /usr/include/xlocale.h
-key.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-key.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-log.o: log.h /usr/include/asm/errno.h /usr/include/bits/errno.h
-log.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-log.o: /usr/include/bits/stdio_lim.h /usr/include/bits/types.h
-log.o: /usr/include/bits/wchar.h /usr/include/errno.h /usr/include/features.h
-log.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/gnu/stubs.h
-log.o: /usr/include/libio.h /usr/include/linux/errno.h /usr/include/stdio.h
-log.o: /usr/include/string.h /usr/include/sys/cdefs.h /usr/include/syslog.h
-log.o: /usr/include/sys/syslog.h /usr/include/wchar.h /usr/include/xlocale.h
-log.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-log.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-onion.o: cell.h log.h onion.h routent.h /usr/include/alloca.h
-onion.o: /usr/include/arpa/inet.h /usr/include/asm/errno.h
-onion.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-onion.o: /usr/include/bits/byteswap.h /usr/include/bits/confname.h
-onion.o: /usr/include/bits/endian.h /usr/include/bits/environments.h
-onion.o: /usr/include/bits/errno.h /usr/include/bits/in.h
-onion.o: /usr/include/bits/local_lim.h /usr/include/bits/posix1_lim.h
-onion.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-onion.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-onion.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-onion.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h
-onion.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-onion.o: /usr/include/bits/types.h /usr/include/bits/uio.h
-onion.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-onion.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-onion.o: /usr/include/bits/xopen_lim.h /usr/include/endian.h
-onion.o: /usr/include/errno.h /usr/include/features.h /usr/include/_G_config.h
-onion.o: /usr/include/gconv.h /usr/include/getopt.h /usr/include/gnu/stubs.h
-onion.o: /usr/include/libio.h /usr/include/limits.h /usr/include/linux/errno.h
-onion.o: /usr/include/linux/limits.h /usr/include/netinet/in.h
-onion.o: /usr/include/openssl/asn1.h /usr/include/openssl/bio.h
-onion.o: /usr/include/openssl/blowfish.h /usr/include/openssl/bn.h
-onion.o: /usr/include/openssl/cast.h /usr/include/openssl/crypto.h
-onion.o: /usr/include/openssl/des.h /usr/include/openssl/dh.h
-onion.o: /usr/include/openssl/dsa.h /usr/include/openssl/e_os2.h
-onion.o: /usr/include/openssl/err.h /usr/include/openssl/evp.h
-onion.o: /usr/include/openssl/lhash.h /usr/include/openssl/md2.h
-onion.o: /usr/include/openssl/md4.h /usr/include/openssl/md5.h
-onion.o: /usr/include/openssl/objects.h /usr/include/openssl/obj_mac.h
-onion.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-onion.o: /usr/include/openssl/rand.h /usr/include/openssl/rc2.h
-onion.o: /usr/include/openssl/rc4.h /usr/include/openssl/ripemd.h
-onion.o: /usr/include/openssl/rsa.h /usr/include/openssl/safestack.h
-onion.o: /usr/include/openssl/sha.h /usr/include/openssl/stack.h
-onion.o: /usr/include/openssl/symhacks.h /usr/include/stdint.h
-onion.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-onion.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-onion.o: /usr/include/sys/select.h /usr/include/sys/socket.h
-onion.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-onion.o: /usr/include/sys/timeb.h /usr/include/sys/time.h
-onion.o: /usr/include/sys/types.h /usr/include/sys/uio.h /usr/include/time.h
-onion.o: /usr/include/unistd.h /usr/include/wchar.h /usr/include/xlocale.h
-onion.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-onion.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-onion.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-onion.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h version.h
-routent.o: cell.h routent.h /usr/include/alloca.h /usr/include/bits/confname.h
-routent.o: /usr/include/bits/endian.h /usr/include/bits/environments.h
-routent.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h
-routent.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-routent.o: /usr/include/bits/sigset.h /usr/include/bits/stdio_lim.h
-routent.o: /usr/include/bits/time.h /usr/include/bits/types.h
-routent.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-routent.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-routent.o: /usr/include/endian.h /usr/include/features.h
-routent.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h
-routent.o: /usr/include/gnu/stubs.h /usr/include/libio.h
-routent.o: /usr/include/openssl/asn1.h /usr/include/openssl/bio.h
-routent.o: /usr/include/openssl/blowfish.h /usr/include/openssl/bn.h
-routent.o: /usr/include/openssl/cast.h /usr/include/openssl/crypto.h
-routent.o: /usr/include/openssl/des.h /usr/include/openssl/dh.h
-routent.o: /usr/include/openssl/dsa.h /usr/include/openssl/e_os2.h
-routent.o: /usr/include/openssl/evp.h /usr/include/openssl/md2.h
-routent.o: /usr/include/openssl/md4.h /usr/include/openssl/md5.h
-routent.o: /usr/include/openssl/objects.h /usr/include/openssl/obj_mac.h
-routent.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-routent.o: /usr/include/openssl/rc2.h /usr/include/openssl/rc4.h
-routent.o: /usr/include/openssl/ripemd.h /usr/include/openssl/rsa.h
-routent.o: /usr/include/openssl/safestack.h /usr/include/openssl/sha.h
-routent.o: /usr/include/openssl/stack.h /usr/include/openssl/symhacks.h
-routent.o: /usr/include/stdint.h /usr/include/stdio.h /usr/include/stdlib.h
-routent.o: /usr/include/sys/cdefs.h /usr/include/sys/select.h
-routent.o: /usr/include/sys/sysmacros.h /usr/include/sys/timeb.h
-routent.o: /usr/include/sys/time.h /usr/include/sys/types.h
-routent.o: /usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h
-routent.o: /usr/include/xlocale.h
-routent.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-routent.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-scheduler.o: log.h scheduler.h /usr/include/bits/confname.h
-scheduler.o: /usr/include/bits/environments.h /usr/include/bits/posix_opt.h
-scheduler.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-scheduler.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-scheduler.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-scheduler.o: /usr/include/bits/types.h /usr/include/bits/wchar.h
-scheduler.o: /usr/include/bits/wordsize.h /usr/include/features.h
-scheduler.o: /usr/include/_G_config.h /usr/include/gconv.h
-scheduler.o: /usr/include/getopt.h /usr/include/gnu/stubs.h
-scheduler.o: /usr/include/libio.h /usr/include/malloc.h /usr/include/stdio.h
-scheduler.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-scheduler.o: /usr/include/sys/select.h /usr/include/sys/syslog.h
-scheduler.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/unistd.h
-scheduler.o: /usr/include/wchar.h
-scheduler.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-scheduler.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-utils.o: log.h /usr/include/alloca.h /usr/include/asm/errno.h
-utils.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-utils.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-utils.o: /usr/include/bits/environments.h /usr/include/bits/errno.h
-utils.o: /usr/include/bits/local_lim.h /usr/include/bits/posix1_lim.h
-utils.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-utils.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-utils.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-utils.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h
-utils.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-utils.o: /usr/include/bits/types.h /usr/include/bits/uio.h
-utils.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-utils.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-utils.o: /usr/include/bits/xopen_lim.h /usr/include/ctype.h
-utils.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h
-utils.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h
-utils.o: /usr/include/gnu/stubs.h /usr/include/libio.h /usr/include/limits.h
-utils.o: /usr/include/linux/errno.h /usr/include/linux/limits.h
-utils.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-utils.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-utils.o: /usr/include/sys/select.h /usr/include/sys/socket.h
-utils.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-utils.o: /usr/include/sys/time.h /usr/include/sys/types.h
-utils.o: /usr/include/sys/uio.h /usr/include/sys/un.h /usr/include/time.h
-utils.o: /usr/include/unistd.h /usr/include/wchar.h /usr/include/xlocale.h
-utils.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-utils.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-utils.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-utils.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h utils.h
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/or
+pkglibdir = $(libdir)/or
+pkgincludedir = $(includedir)/or
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/bergo/src/work/or/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/bergo/src/work/or/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/bergo/src/work/or/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/bergo/src/work/or/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/ginstall -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/bergo/src/work/or/missing --run tar
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = or
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.0.0
+am__include = include
+am__quote = 
+install_sh = /home/bergo/src/work/or/install-sh
+
+noinst_LIBRARIES = libor.a
+
+
+#CFLAGS  = -Wall -Wpointer-arith -O2
+libor_a_SOURCES = cell.c config.c key.c log.c onion.c opcell.c \
+                     routent.c scheduler.c utils.c
+
+
+
+# ss.h is not used anywhere, distributing it just because
+noinst_HEADERS = cell.h config.h key.h log.h onion.h opcell.h \
+		     policies.h routent.h scheduler.h utils.h \
+                     ss.h version.h
+
+subdir = src/common
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orconfig.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+
+libor_a_AR = $(AR) cru
+libor_a_LIBADD =
+am_libor_a_OBJECTS = cell.$(OBJEXT) config.$(OBJEXT) key.$(OBJEXT) \
+	log.$(OBJEXT) onion.$(OBJEXT) opcell.$(OBJEXT) \
+	routent.$(OBJEXT) scheduler.$(OBJEXT) utils.$(OBJEXT)
+libor_a_OBJECTS = $(am_libor_a_OBJECTS)
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -I/usr/local/ssl/include 
+LDFLAGS = -L/usr/local/ssl/lib 
+LIBS =  -lpopt -lcrypto
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/cell.Po ./$(DEPDIR)/config.Po \
+	./$(DEPDIR)/key.Po ./$(DEPDIR)/log.Po \
+	./$(DEPDIR)/onion.Po ./$(DEPDIR)/opcell.Po \
+	./$(DEPDIR)/routent.Po ./$(DEPDIR)/scheduler.Po \
+	./$(DEPDIR)/utils.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -Wall -O2
+DIST_SOURCES = $(libor_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+SOURCES = $(libor_a_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/common/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+AR = ar
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libor.a: $(libor_a_OBJECTS) $(libor_a_DEPENDENCIES) 
+	-rm -f libor.a
+	$(libor_a_AR) libor.a $(libor_a_OBJECTS) $(libor_a_LIBADD)
+	$(RANLIB) libor.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/cell.Po
+include ./$(DEPDIR)/config.Po
+include ./$(DEPDIR)/key.Po
+include ./$(DEPDIR)/log.Po
+include ./$(DEPDIR)/onion.Po
+include ./$(DEPDIR)/opcell.Po
+include ./$(DEPDIR)/routent.Po
+include ./$(DEPDIR)/scheduler.Po
+include ./$(DEPDIR)/utils.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES) $(HEADERS)
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/httpap/Makefile b/src/httpap/Makefile
index 83207f4c5f..5a4cde6edf 100644
--- a/src/httpap/Makefile
+++ b/src/httpap/Makefile
@@ -1,99 +1,323 @@
-SRC=httpap.c http.c
-OBJ=${SRC:.c=.o}
-PROGS=httpap
-LIB=
-LIBS=
-INCLUDE =
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# src/httpap/Makefile.  Generated from Makefile.in by configure.
 
-CFLAGS= $(INCLUDE) -Wall -Wpointer-arith -O2 -ggdb
-LDFLAGS = $(LIB) $(LIBS)
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all:	${PROGS}
-
-clean:
-	rm -f *.o ${PROGS}
-
-depend:
-	makedepend -- ${CFLAGS} -- ${SRC}
-
-httpap:	${OBJ}
-	$(LINK.c) -o $@ $(OBJ) ../common/log.o ../common/config.o ../common/utils.o -lpopt
-
-# DO NOT DELETE
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
-httpap.o: ../common/config.h ../common/log.h ../common/ss.h ../common/utils.h
-httpap.o: ../common/version.h httpap.h http.h /usr/include/alloca.h
-httpap.o: /usr/include/arpa/inet.h /usr/include/asm/errno.h
-httpap.o: /usr/include/asm/sigcontext.h /usr/include/asm/socket.h
-httpap.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h
-httpap.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-httpap.o: /usr/include/bits/environments.h /usr/include/bits/errno.h
-httpap.o: /usr/include/bits/in.h /usr/include/bits/local_lim.h
-httpap.o: /usr/include/bits/netdb.h /usr/include/bits/posix1_lim.h
-httpap.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-httpap.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/resource.h
-httpap.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-httpap.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h
-httpap.o: /usr/include/bits/siginfo.h /usr/include/bits/signum.h
-httpap.o: /usr/include/bits/sigset.h /usr/include/bits/sigstack.h
-httpap.o: /usr/include/bits/sigthread.h /usr/include/bits/sockaddr.h
-httpap.o: /usr/include/bits/socket.h /usr/include/bits/stdio_lim.h
-httpap.o: /usr/include/bits/time.h /usr/include/bits/types.h
-httpap.o: /usr/include/bits/uio.h /usr/include/bits/waitflags.h
-httpap.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-httpap.o: /usr/include/bits/wordsize.h /usr/include/bits/xopen_lim.h
-httpap.o: /usr/include/ctype.h /usr/include/endian.h /usr/include/errno.h
-httpap.o: /usr/include/features.h /usr/include/_G_config.h
-httpap.o: /usr/include/gconv.h /usr/include/getopt.h /usr/include/gnu/stubs.h
-httpap.o: /usr/include/libio.h /usr/include/limits.h
-httpap.o: /usr/include/linux/errno.h /usr/include/linux/limits.h
-httpap.o: /usr/include/netdb.h /usr/include/netinet/in.h
-httpap.o: /usr/include/rpc/netdb.h /usr/include/signal.h /usr/include/stdint.h
-httpap.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-httpap.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-httpap.o: /usr/include/sys/resource.h /usr/include/sys/select.h
-httpap.o: /usr/include/sys/socket.h /usr/include/sys/syslog.h
-httpap.o: /usr/include/sys/sysmacros.h /usr/include/sys/time.h
-httpap.o: /usr/include/sys/types.h /usr/include/sys/ucontext.h
-httpap.o: /usr/include/sys/uio.h /usr/include/sys/un.h /usr/include/sys/wait.h
-httpap.o: /usr/include/time.h /usr/include/ucontext.h /usr/include/unistd.h
-httpap.o: /usr/include/wait.h /usr/include/wchar.h /usr/include/xlocale.h
-httpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-httpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-httpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-httpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
-http.o: ../common/log.h ../common/utils.h http.h /usr/include/alloca.h
-http.o: /usr/include/arpa/inet.h /usr/include/asm/errno.h
-http.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-http.o: /usr/include/bits/byteswap.h /usr/include/bits/confname.h
-http.o: /usr/include/bits/endian.h /usr/include/bits/environments.h
-http.o: /usr/include/bits/errno.h /usr/include/bits/in.h
-http.o: /usr/include/bits/local_lim.h /usr/include/bits/netdb.h
-http.o: /usr/include/bits/posix1_lim.h /usr/include/bits/posix2_lim.h
-http.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h
-http.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-http.o: /usr/include/bits/siginfo.h /usr/include/bits/sigset.h
-http.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h
-http.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-http.o: /usr/include/bits/types.h /usr/include/bits/uio.h
-http.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-http.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-http.o: /usr/include/bits/xopen_lim.h /usr/include/ctype.h
-http.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h
-http.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h
-http.o: /usr/include/gnu/stubs.h /usr/include/libio.h /usr/include/limits.h
-http.o: /usr/include/linux/errno.h /usr/include/linux/limits.h
-http.o: /usr/include/netdb.h /usr/include/netinet/in.h
-http.o: /usr/include/rpc/netdb.h /usr/include/stdint.h /usr/include/stdio.h
-http.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/cdefs.h
-http.o: /usr/include/syslog.h /usr/include/sys/select.h
-http.o: /usr/include/sys/socket.h /usr/include/sys/syslog.h
-http.o: /usr/include/sys/sysmacros.h /usr/include/sys/time.h
-http.o: /usr/include/sys/types.h /usr/include/sys/uio.h /usr/include/sys/un.h
-http.o: /usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h
-http.o: /usr/include/xlocale.h
-http.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-http.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-http.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-http.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/or
+pkglibdir = $(libdir)/or
+pkgincludedir = $(includedir)/or
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/bergo/src/work/or/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/bergo/src/work/or/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/bergo/src/work/or/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/bergo/src/work/or/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/ginstall -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/bergo/src/work/or/missing --run tar
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = or
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.0.0
+am__include = include
+am__quote = 
+install_sh = /home/bergo/src/work/or/install-sh
+
+bin_PROGRAMS = httpap
+
+httpap_LDADD = -L../common -lor
+
+httpap_SOURCES = httpap.c http.c
+
+noinst_HEADERS = httpap.h http.h
+subdir = src/httpap
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orconfig.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = httpap$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_httpap_OBJECTS = httpap.$(OBJEXT) http.$(OBJEXT)
+httpap_OBJECTS = $(am_httpap_OBJECTS)
+httpap_DEPENDENCIES =
+httpap_LDFLAGS =
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -I/usr/local/ssl/include 
+LDFLAGS = -L/usr/local/ssl/lib 
+LIBS =  -lpopt -lcrypto
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/http.Po ./$(DEPDIR)/httpap.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -Wall -O2
+DIST_SOURCES = $(httpap_SOURCES)
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+SOURCES = $(httpap_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/httpap/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+httpap$(EXEEXT): $(httpap_OBJECTS) $(httpap_DEPENDENCIES) 
+	@rm -f httpap$(EXEEXT)
+	$(LINK) $(httpap_LDFLAGS) $(httpap_OBJECTS) $(httpap_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/http.Po
+include ./$(DEPDIR)/httpap.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/op/Makefile b/src/op/Makefile
index acfb32b084..fbe9bdf311 100644
--- a/src/op/Makefile
+++ b/src/op/Makefile
@@ -1,285 +1,338 @@
-SRC=args.c config.c op.c routers.c auth.c ss.c buffers.c crypto.c
-OBJ=${SRC:.c=.o}
-PROGS=op
-LIB=-L/usr/local/ssl/lib
-LIBS=-lcrypto
-INCLUDE = -I/usr/local/ssl/include
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# src/op/Makefile.  Generated from Makefile.in by configure.
 
-CFLAGS= $(INCLUDE) -Wall -Wpointer-arith -O2 -ggdb
-LDFLAGS = $(LIB) $(LIBS)
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all:	${PROGS}
-
-clean:
-	rm -f *.o ${PROGS}
-
-depend:
-	makedepend -- ${CFLAGS} -- ${SRC}
-
-${PROGS}:	${OBJ}
-	$(LINK.c) -o $@ $(OBJ) ../common/log.o ../common/config.o ../common/onion.o ../common/utils.o ../common/cell.o ../common/scheduler.o -lpopt
-
-# DO NOT DELETE
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
-args.o: args.h ../common/log.h /usr/include/alloca.h
-args.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-args.o: /usr/include/bits/environments.h /usr/include/bits/posix_opt.h
-args.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-args.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-args.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-args.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h
-args.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-args.o: /usr/include/bits/wordsize.h /usr/include/ctype.h
-args.o: /usr/include/endian.h /usr/include/features.h /usr/include/_G_config.h
-args.o: /usr/include/gconv.h /usr/include/getopt.h /usr/include/gnu/stubs.h
-args.o: /usr/include/libio.h /usr/include/stdio.h /usr/include/stdlib.h
-args.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-args.o: /usr/include/sys/select.h /usr/include/sys/syslog.h
-args.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h
-args.o: /usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h
-args.o: /usr/include/xlocale.h
-args.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-args.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-auth.o: auth.h ../common/log.h /usr/include/alloca.h /usr/include/asm/socket.h
-auth.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h
-auth.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-auth.o: /usr/include/bits/environments.h /usr/include/bits/in.h
-auth.o: /usr/include/bits/local_lim.h /usr/include/bits/posix1_lim.h
-auth.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-auth.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-auth.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-auth.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h
-auth.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-auth.o: /usr/include/bits/types.h /usr/include/bits/uio.h
-auth.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-auth.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-auth.o: /usr/include/bits/xopen_lim.h /usr/include/endian.h
-auth.o: /usr/include/features.h /usr/include/_G_config.h /usr/include/gconv.h
-auth.o: /usr/include/getopt.h /usr/include/gnu/stubs.h /usr/include/libio.h
-auth.o: /usr/include/limits.h /usr/include/linux/limits.h
-auth.o: /usr/include/netinet/in.h /usr/include/openssl/bio.h
-auth.o: /usr/include/openssl/bn.h /usr/include/openssl/crypto.h
-auth.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-auth.o: /usr/include/openssl/rand.h /usr/include/openssl/rsa.h
-auth.o: /usr/include/openssl/safestack.h /usr/include/openssl/stack.h
-auth.o: /usr/include/openssl/symhacks.h /usr/include/stdint.h
-auth.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-auth.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-auth.o: /usr/include/sys/select.h /usr/include/sys/socket.h
-auth.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-auth.o: /usr/include/sys/types.h /usr/include/sys/uio.h /usr/include/time.h
-auth.o: /usr/include/unistd.h /usr/include/wchar.h /usr/include/xlocale.h
-auth.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-auth.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-auth.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-auth.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
-buffers.o: buffers.h ../common/cell.h ../common/log.h ../common/onion.h
-buffers.o: ../common/routent.h ../common/version.h crypto.h op.h
-buffers.o: /usr/include/alloca.h /usr/include/bits/confname.h
-buffers.o: /usr/include/bits/endian.h /usr/include/bits/environments.h
-buffers.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h
-buffers.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-buffers.o: /usr/include/bits/sigset.h /usr/include/bits/stdio_lim.h
-buffers.o: /usr/include/bits/time.h /usr/include/bits/types.h
-buffers.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-buffers.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-buffers.o: /usr/include/endian.h /usr/include/features.h
-buffers.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h
-buffers.o: /usr/include/gnu/stubs.h /usr/include/libio.h
-buffers.o: /usr/include/openssl/asn1.h /usr/include/openssl/bio.h
-buffers.o: /usr/include/openssl/blowfish.h /usr/include/openssl/bn.h
-buffers.o: /usr/include/openssl/cast.h /usr/include/openssl/crypto.h
-buffers.o: /usr/include/openssl/des.h /usr/include/openssl/dh.h
-buffers.o: /usr/include/openssl/dsa.h /usr/include/openssl/e_os2.h
-buffers.o: /usr/include/openssl/evp.h /usr/include/openssl/md2.h
-buffers.o: /usr/include/openssl/md4.h /usr/include/openssl/md5.h
-buffers.o: /usr/include/openssl/objects.h /usr/include/openssl/obj_mac.h
-buffers.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-buffers.o: /usr/include/openssl/rc2.h /usr/include/openssl/rc4.h
-buffers.o: /usr/include/openssl/ripemd.h /usr/include/openssl/rsa.h
-buffers.o: /usr/include/openssl/safestack.h /usr/include/openssl/sha.h
-buffers.o: /usr/include/openssl/stack.h /usr/include/openssl/symhacks.h
-buffers.o: /usr/include/stdint.h /usr/include/stdio.h /usr/include/stdlib.h
-buffers.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-buffers.o: /usr/include/sys/select.h /usr/include/sys/syslog.h
-buffers.o: /usr/include/sys/sysmacros.h /usr/include/sys/timeb.h
-buffers.o: /usr/include/sys/time.h /usr/include/sys/types.h
-buffers.o: /usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h
-buffers.o: /usr/include/xlocale.h
-buffers.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-buffers.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-config.o: ../common/config.h ../common/log.h config.h
-config.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-config.o: /usr/include/bits/stdio_lim.h /usr/include/bits/types.h
-config.o: /usr/include/bits/wchar.h /usr/include/features.h
-config.o: /usr/include/_G_config.h /usr/include/gconv.h
-config.o: /usr/include/gnu/stubs.h /usr/include/libio.h /usr/include/stdio.h
-config.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-config.o: /usr/include/sys/syslog.h /usr/include/wchar.h
-config.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-config.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-crypto.o: ../common/cell.h ../common/log.h ../common/onion.h
-crypto.o: ../common/routent.h ../common/version.h crypto.h
-crypto.o: /usr/include/alloca.h /usr/include/asm/errno.h
-crypto.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-crypto.o: /usr/include/bits/environments.h /usr/include/bits/errno.h
-crypto.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h
-crypto.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-crypto.o: /usr/include/bits/sigset.h /usr/include/bits/stdio_lim.h
-crypto.o: /usr/include/bits/time.h /usr/include/bits/types.h
-crypto.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-crypto.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h
-crypto.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h
-crypto.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h
-crypto.o: /usr/include/gnu/stubs.h /usr/include/libio.h
-crypto.o: /usr/include/linux/errno.h /usr/include/malloc.h
-crypto.o: /usr/include/openssl/asn1.h /usr/include/openssl/bio.h
-crypto.o: /usr/include/openssl/blowfish.h /usr/include/openssl/bn.h
-crypto.o: /usr/include/openssl/cast.h /usr/include/openssl/crypto.h
-crypto.o: /usr/include/openssl/des.h /usr/include/openssl/dh.h
-crypto.o: /usr/include/openssl/dsa.h /usr/include/openssl/e_os2.h
-crypto.o: /usr/include/openssl/err.h /usr/include/openssl/evp.h
-crypto.o: /usr/include/openssl/lhash.h /usr/include/openssl/md2.h
-crypto.o: /usr/include/openssl/md4.h /usr/include/openssl/md5.h
-crypto.o: /usr/include/openssl/objects.h /usr/include/openssl/obj_mac.h
-crypto.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-crypto.o: /usr/include/openssl/rc2.h /usr/include/openssl/rc4.h
-crypto.o: /usr/include/openssl/ripemd.h /usr/include/openssl/rsa.h
-crypto.o: /usr/include/openssl/safestack.h /usr/include/openssl/sha.h
-crypto.o: /usr/include/openssl/stack.h /usr/include/openssl/symhacks.h
-crypto.o: /usr/include/stdint.h /usr/include/stdio.h /usr/include/stdlib.h
-crypto.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-crypto.o: /usr/include/sys/select.h /usr/include/sys/syslog.h
-crypto.o: /usr/include/sys/sysmacros.h /usr/include/sys/timeb.h
-crypto.o: /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/time.h
-crypto.o: /usr/include/unistd.h /usr/include/wchar.h /usr/include/xlocale.h
-crypto.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-crypto.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-op.o: args.h auth.h buffers.h ../common/cell.h ../common/config.h
-op.o: ../common/log.h ../common/onion.h ../common/routent.h
-op.o: ../common/scheduler.h ../common/ss.h ../common/utils.h
-op.o: ../common/version.h config.h crypto.h op.h routers.h ss.h
-op.o: /usr/include/alloca.h /usr/include/arpa/inet.h /usr/include/asm/errno.h
-op.o: /usr/include/asm/sigcontext.h /usr/include/asm/socket.h
-op.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h
-op.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-op.o: /usr/include/bits/environments.h /usr/include/bits/errno.h
-op.o: /usr/include/bits/in.h /usr/include/bits/local_lim.h
-op.o: /usr/include/bits/netdb.h /usr/include/bits/posix1_lim.h
-op.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-op.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/resource.h
-op.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-op.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h
-op.o: /usr/include/bits/siginfo.h /usr/include/bits/signum.h
-op.o: /usr/include/bits/sigset.h /usr/include/bits/sigstack.h
-op.o: /usr/include/bits/sigthread.h /usr/include/bits/sockaddr.h
-op.o: /usr/include/bits/socket.h /usr/include/bits/stdio_lim.h
-op.o: /usr/include/bits/time.h /usr/include/bits/types.h
-op.o: /usr/include/bits/uio.h /usr/include/bits/waitflags.h
-op.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-op.o: /usr/include/bits/wordsize.h /usr/include/bits/xopen_lim.h
-op.o: /usr/include/ctype.h /usr/include/endian.h /usr/include/errno.h
-op.o: /usr/include/features.h /usr/include/_G_config.h /usr/include/gconv.h
-op.o: /usr/include/getopt.h /usr/include/gnu/stubs.h /usr/include/libio.h
-op.o: /usr/include/limits.h /usr/include/linux/errno.h
-op.o: /usr/include/linux/limits.h /usr/include/netdb.h
-op.o: /usr/include/netinet/in.h /usr/include/openssl/asn1.h
-op.o: /usr/include/openssl/bio.h /usr/include/openssl/blowfish.h
-op.o: /usr/include/openssl/bn.h /usr/include/openssl/buffer.h
-op.o: /usr/include/openssl/cast.h /usr/include/openssl/crypto.h
-op.o: /usr/include/openssl/des.h /usr/include/openssl/dh.h
-op.o: /usr/include/openssl/dsa.h /usr/include/openssl/e_os2.h
-op.o: /usr/include/openssl/err.h /usr/include/openssl/evp.h
-op.o: /usr/include/openssl/lhash.h /usr/include/openssl/md2.h
-op.o: /usr/include/openssl/md4.h /usr/include/openssl/md5.h
-op.o: /usr/include/openssl/objects.h /usr/include/openssl/obj_mac.h
-op.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-op.o: /usr/include/openssl/pem2.h /usr/include/openssl/pem.h
-op.o: /usr/include/openssl/pkcs7.h /usr/include/openssl/rand.h
-op.o: /usr/include/openssl/rc2.h /usr/include/openssl/rc4.h
-op.o: /usr/include/openssl/ripemd.h /usr/include/openssl/rsa.h
-op.o: /usr/include/openssl/safestack.h /usr/include/openssl/sha.h
-op.o: /usr/include/openssl/stack.h /usr/include/openssl/symhacks.h
-op.o: /usr/include/openssl/x509.h /usr/include/openssl/x509_vfy.h
-op.o: /usr/include/rpc/netdb.h /usr/include/signal.h /usr/include/stdint.h
-op.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-op.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-op.o: /usr/include/sys/resource.h /usr/include/sys/select.h
-op.o: /usr/include/sys/socket.h /usr/include/sys/syslog.h
-op.o: /usr/include/sys/sysmacros.h /usr/include/sys/timeb.h
-op.o: /usr/include/sys/time.h /usr/include/sys/types.h
-op.o: /usr/include/sys/ucontext.h /usr/include/sys/uio.h /usr/include/sys/un.h
-op.o: /usr/include/sys/wait.h /usr/include/time.h /usr/include/ucontext.h
-op.o: /usr/include/unistd.h /usr/include/wait.h /usr/include/wchar.h
-op.o: /usr/include/xlocale.h
-op.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-op.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-op.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-op.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
-routers.o: ../common/cell.h ../common/config.h ../common/log.h
-routers.o: ../common/routent.h ../common/utils.h routers.h
-routers.o: /usr/include/alloca.h /usr/include/asm/errno.h
-routers.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-routers.o: /usr/include/bits/byteswap.h /usr/include/bits/confname.h
-routers.o: /usr/include/bits/endian.h /usr/include/bits/environments.h
-routers.o: /usr/include/bits/errno.h /usr/include/bits/in.h
-routers.o: /usr/include/bits/local_lim.h /usr/include/bits/netdb.h
-routers.o: /usr/include/bits/posix1_lim.h /usr/include/bits/posix2_lim.h
-routers.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h
-routers.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-routers.o: /usr/include/bits/siginfo.h /usr/include/bits/sigset.h
-routers.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h
-routers.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-routers.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h
-routers.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-routers.o: /usr/include/bits/wordsize.h /usr/include/bits/xopen_lim.h
-routers.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h
-routers.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h
-routers.o: /usr/include/gnu/stubs.h /usr/include/libio.h /usr/include/limits.h
-routers.o: /usr/include/linux/errno.h /usr/include/linux/limits.h
-routers.o: /usr/include/netdb.h /usr/include/netinet/in.h
-routers.o: /usr/include/openssl/asn1.h /usr/include/openssl/bio.h
-routers.o: /usr/include/openssl/blowfish.h /usr/include/openssl/bn.h
-routers.o: /usr/include/openssl/buffer.h /usr/include/openssl/cast.h
-routers.o: /usr/include/openssl/crypto.h /usr/include/openssl/des.h
-routers.o: /usr/include/openssl/dh.h /usr/include/openssl/dsa.h
-routers.o: /usr/include/openssl/e_os2.h /usr/include/openssl/err.h
-routers.o: /usr/include/openssl/evp.h /usr/include/openssl/lhash.h
-routers.o: /usr/include/openssl/md2.h /usr/include/openssl/md4.h
-routers.o: /usr/include/openssl/md5.h /usr/include/openssl/objects.h
-routers.o: /usr/include/openssl/obj_mac.h /usr/include/openssl/opensslconf.h
-routers.o: /usr/include/openssl/opensslv.h /usr/include/openssl/pem2.h
-routers.o: /usr/include/openssl/pem.h /usr/include/openssl/pkcs7.h
-routers.o: /usr/include/openssl/rc2.h /usr/include/openssl/rc4.h
-routers.o: /usr/include/openssl/ripemd.h /usr/include/openssl/rsa.h
-routers.o: /usr/include/openssl/safestack.h /usr/include/openssl/sha.h
-routers.o: /usr/include/openssl/stack.h /usr/include/openssl/symhacks.h
-routers.o: /usr/include/openssl/x509.h /usr/include/openssl/x509_vfy.h
-routers.o: /usr/include/rpc/netdb.h /usr/include/stdint.h /usr/include/stdio.h
-routers.o: /usr/include/stdlib.h /usr/include/string.h
-routers.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-routers.o: /usr/include/sys/select.h /usr/include/sys/syslog.h
-routers.o: /usr/include/sys/sysmacros.h /usr/include/sys/timeb.h
-routers.o: /usr/include/sys/time.h /usr/include/sys/types.h
-routers.o: /usr/include/sys/un.h /usr/include/time.h /usr/include/unistd.h
-routers.o: /usr/include/wchar.h /usr/include/xlocale.h
-routers.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-routers.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-routers.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-routers.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
-ss.o: ../common/log.h ../common/ss.h ../common/utils.h ../common/version.h
-ss.o: ss.h /usr/include/bits/confname.h /usr/include/bits/endian.h
-ss.o: /usr/include/bits/environments.h /usr/include/bits/posix_opt.h
-ss.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-ss.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-ss.o: /usr/include/bits/sockaddr.h /usr/include/bits/time.h
-ss.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-ss.o: /usr/include/endian.h /usr/include/features.h /usr/include/getopt.h
-ss.o: /usr/include/gnu/stubs.h /usr/include/malloc.h /usr/include/string.h
-ss.o: /usr/include/sys/cdefs.h /usr/include/syslog.h /usr/include/sys/select.h
-ss.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-ss.o: /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/sys/un.h
-ss.o: /usr/include/time.h /usr/include/unistd.h /usr/include/xlocale.h
-ss.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-ss.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/or
+pkglibdir = $(libdir)/or
+pkgincludedir = $(includedir)/or
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/bergo/src/work/or/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/bergo/src/work/or/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/bergo/src/work/or/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/bergo/src/work/or/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/ginstall -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/bergo/src/work/or/missing --run tar
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = or
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.0.0
+am__include = include
+am__quote = 
+install_sh = /home/bergo/src/work/or/install-sh
+
+bin_PROGRAMS = op
+
+op_LDADD = -L../common -lor
+
+op_SOURCES = args.c config.c op.c routers.c auth.c ss.c \
+             buffers.c crypto.c
+
+
+noinst_HEADERS = args.h auth.h buffers.h config.h crypto.h op.h \
+                 routers.h ss.h
+
+subdir = src/op
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orconfig.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = op$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_op_OBJECTS = args.$(OBJEXT) config.$(OBJEXT) op.$(OBJEXT) \
+	routers.$(OBJEXT) auth.$(OBJEXT) ss.$(OBJEXT) buffers.$(OBJEXT) \
+	crypto.$(OBJEXT)
+op_OBJECTS = $(am_op_OBJECTS)
+op_DEPENDENCIES =
+op_LDFLAGS =
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -I/usr/local/ssl/include 
+LDFLAGS = -L/usr/local/ssl/lib 
+LIBS =  -lpopt -lcrypto
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/args.Po ./$(DEPDIR)/auth.Po \
+	./$(DEPDIR)/buffers.Po ./$(DEPDIR)/config.Po \
+	./$(DEPDIR)/crypto.Po ./$(DEPDIR)/op.Po \
+	./$(DEPDIR)/routers.Po ./$(DEPDIR)/ss.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -Wall -O2
+DIST_SOURCES = $(op_SOURCES)
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+SOURCES = $(op_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/op/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+op$(EXEEXT): $(op_OBJECTS) $(op_DEPENDENCIES) 
+	@rm -f op$(EXEEXT)
+	$(LINK) $(op_LDFLAGS) $(op_OBJECTS) $(op_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/args.Po
+include ./$(DEPDIR)/auth.Po
+include ./$(DEPDIR)/buffers.Po
+include ./$(DEPDIR)/config.Po
+include ./$(DEPDIR)/crypto.Po
+include ./$(DEPDIR)/op.Po
+include ./$(DEPDIR)/routers.Po
+include ./$(DEPDIR)/ss.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/or/Makefile b/src/or/Makefile
index a4e3cb8f28..872dc7d79c 100644
--- a/src/or/Makefile
+++ b/src/or/Makefile
@@ -1,18 +1,348 @@
-SRC=args.c buffers.c cell.c circuit.c command.c connection.c connection_app.c connection_op.c connection_or.c config.c main.c onion.c routers.c
-OBJ=${SRC:.c=.o}
-PROGS=or
-LIB=
-LIBS=
-INCLUDE = -I/usr/local/ssl/include
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# src/or/Makefile.  Generated from Makefile.in by configure.
 
-CFLAGS=  $(INCLUDE) -Wall -Wpointer-arith -ggdb
-LDFLAGS = $(LIB) $(LIBS)
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all:	${OBJ} ${PROGS}
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-or:	${OBJ}
-	gcc -o or $(CFLAGS) *.o ../common/*.o -lcrypto -lpopt
 
-clean:
-	rm -f *.o ${PROGS}
+SHELL = /bin/sh
 
+srcdir = .
+top_srcdir = ../..
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/or
+pkglibdir = $(libdir)/or
+pkgincludedir = $(includedir)/or
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/bergo/src/work/or/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/bergo/src/work/or/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/bergo/src/work/or/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/bergo/src/work/or/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/ginstall -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/bergo/src/work/or/missing --run tar
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = or
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.0.0
+am__include = include
+am__quote = 
+install_sh = /home/bergo/src/work/or/install-sh
+
+bin_PROGRAMS = or
+
+or_LDADD = -L../common -lor
+
+or_SOURCES = args.c buffers.c cell.c circuit.c command.c connection.c \
+             connection_app.c connection_op.c connection_or.c config.c \
+             main.c onion.c routers.c
+
+
+noinst_HEADERS = or.h
+subdir = src/or
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orconfig.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = or$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_or_OBJECTS = args.$(OBJEXT) buffers.$(OBJEXT) cell.$(OBJEXT) \
+	circuit.$(OBJEXT) command.$(OBJEXT) connection.$(OBJEXT) \
+	connection_app.$(OBJEXT) connection_op.$(OBJEXT) \
+	connection_or.$(OBJEXT) config.$(OBJEXT) main.$(OBJEXT) \
+	onion.$(OBJEXT) routers.$(OBJEXT)
+or_OBJECTS = $(am_or_OBJECTS)
+or_DEPENDENCIES =
+or_LDFLAGS =
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -I/usr/local/ssl/include 
+LDFLAGS = -L/usr/local/ssl/lib 
+LIBS =  -lpopt -lcrypto
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/args.Po ./$(DEPDIR)/buffers.Po \
+	./$(DEPDIR)/cell.Po ./$(DEPDIR)/circuit.Po \
+	./$(DEPDIR)/command.Po ./$(DEPDIR)/config.Po \
+	./$(DEPDIR)/connection.Po \
+	./$(DEPDIR)/connection_app.Po \
+	./$(DEPDIR)/connection_op.Po \
+	./$(DEPDIR)/connection_or.Po ./$(DEPDIR)/main.Po \
+	./$(DEPDIR)/onion.Po ./$(DEPDIR)/routers.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -Wall -O2
+DIST_SOURCES = $(or_SOURCES)
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+SOURCES = $(or_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/or/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+or$(EXEEXT): $(or_OBJECTS) $(or_DEPENDENCIES) 
+	@rm -f or$(EXEEXT)
+	$(LINK) $(or_LDFLAGS) $(or_OBJECTS) $(or_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/args.Po
+include ./$(DEPDIR)/buffers.Po
+include ./$(DEPDIR)/cell.Po
+include ./$(DEPDIR)/circuit.Po
+include ./$(DEPDIR)/command.Po
+include ./$(DEPDIR)/config.Po
+include ./$(DEPDIR)/connection.Po
+include ./$(DEPDIR)/connection_app.Po
+include ./$(DEPDIR)/connection_op.Po
+include ./$(DEPDIR)/connection_or.Po
+include ./$(DEPDIR)/main.Po
+include ./$(DEPDIR)/onion.Po
+include ./$(DEPDIR)/routers.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/orkeygen/Makefile b/src/orkeygen/Makefile
index 20c65c4571..2be7a1c401 100644
--- a/src/orkeygen/Makefile
+++ b/src/orkeygen/Makefile
@@ -1,58 +1,317 @@
-SRC=orkeygen.c
-OBJ=${SRC:.c=.o}
-PROGS=orkeygen
-LIB=-L/usr/local/ssl/lib
-LIBS=-lcrypto
-INCLUDE=-I/usr/local/ssl/include
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# src/orkeygen/Makefile.  Generated from Makefile.in by configure.
 
-CFLAGS= $(INCLUDE)
-LDFLAGS = $(LIB) ${LIBS}
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all:	${PROGS}
-
-clean:
-	rm -f *.o ${PROGS}
-
-depend:
-	makedepend -- ${CFLAGS} -- ${SRC}
-
-${PROGS}:	${OBJ}
-	$(LINK.c) -o $@ $(OBJ)
-
-# DO NOT DELETE
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
-orkeygen.o: /usr/include/alloca.h /usr/include/asm/errno.h
-orkeygen.o: /usr/include/bits/endian.h /usr/include/bits/errno.h
-orkeygen.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-orkeygen.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-orkeygen.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-orkeygen.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h
-orkeygen.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-orkeygen.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h
-orkeygen.o: /usr/include/_G_config.h /usr/include/gconv.h
-orkeygen.o: /usr/include/gnu/stubs.h /usr/include/libio.h
-orkeygen.o: /usr/include/linux/errno.h /usr/include/openssl/asn1.h
-orkeygen.o: /usr/include/openssl/bio.h /usr/include/openssl/blowfish.h
-orkeygen.o: /usr/include/openssl/bn.h /usr/include/openssl/buffer.h
-orkeygen.o: /usr/include/openssl/cast.h /usr/include/openssl/crypto.h
-orkeygen.o: /usr/include/openssl/des.h /usr/include/openssl/dh.h
-orkeygen.o: /usr/include/openssl/dsa.h /usr/include/openssl/e_os2.h
-orkeygen.o: /usr/include/openssl/err.h /usr/include/openssl/evp.h
-orkeygen.o: /usr/include/openssl/lhash.h /usr/include/openssl/md2.h
-orkeygen.o: /usr/include/openssl/md4.h /usr/include/openssl/md5.h
-orkeygen.o: /usr/include/openssl/objects.h /usr/include/openssl/obj_mac.h
-orkeygen.o: /usr/include/openssl/opensslconf.h /usr/include/openssl/opensslv.h
-orkeygen.o: /usr/include/openssl/pem2.h /usr/include/openssl/pem.h
-orkeygen.o: /usr/include/openssl/pkcs7.h /usr/include/openssl/rc2.h
-orkeygen.o: /usr/include/openssl/rc4.h /usr/include/openssl/ripemd.h
-orkeygen.o: /usr/include/openssl/rsa.h /usr/include/openssl/safestack.h
-orkeygen.o: /usr/include/openssl/sha.h /usr/include/openssl/stack.h
-orkeygen.o: /usr/include/openssl/symhacks.h /usr/include/openssl/x509.h
-orkeygen.o: /usr/include/openssl/x509_vfy.h /usr/include/stdio.h
-orkeygen.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-orkeygen.o: /usr/include/sys/select.h /usr/include/sys/sysmacros.h
-orkeygen.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/wchar.h
-orkeygen.o: /usr/include/xlocale.h
-orkeygen.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-orkeygen.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/or
+pkglibdir = $(libdir)/or
+pkgincludedir = $(includedir)/or
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/bergo/src/work/or/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/bergo/src/work/or/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/bergo/src/work/or/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/bergo/src/work/or/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/ginstall -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/bergo/src/work/or/missing --run tar
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = or
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.0.0
+am__include = include
+am__quote = 
+install_sh = /home/bergo/src/work/or/install-sh
+
+bin_PROGRAMS = orkeygen
+
+orkeygen_SOURCES = orkeygen.c
+subdir = src/orkeygen
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orconfig.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = orkeygen$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_orkeygen_OBJECTS = orkeygen.$(OBJEXT)
+orkeygen_OBJECTS = $(am_orkeygen_OBJECTS)
+orkeygen_LDADD = $(LDADD)
+orkeygen_DEPENDENCIES =
+orkeygen_LDFLAGS =
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -I/usr/local/ssl/include 
+LDFLAGS = -L/usr/local/ssl/lib 
+LIBS =  -lpopt -lcrypto
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/orkeygen.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -Wall -O2
+DIST_SOURCES = $(orkeygen_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(orkeygen_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/orkeygen/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+orkeygen$(EXEEXT): $(orkeygen_OBJECTS) $(orkeygen_DEPENDENCIES) 
+	@rm -f orkeygen$(EXEEXT)
+	$(LINK) $(orkeygen_LDFLAGS) $(orkeygen_OBJECTS) $(orkeygen_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/orkeygen.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/smtpap/Makefile b/src/smtpap/Makefile
index fc685ba34c..5b83f90b16 100644
--- a/src/smtpap/Makefile
+++ b/src/smtpap/Makefile
@@ -1,80 +1,323 @@
-SRC=smtpap.c io.c
-OBJ=${SRC:.c=.o}
-PROGS=smtpap
-LIB=
-LIBS=
-INCLUDE =
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# src/smtpap/Makefile.  Generated from Makefile.in by configure.
 
-CFLAGS= $(INCLUDE) -Wall -Wpointer-arith -O2 -ggdb
-LDFLAGS = $(LIB) $(LIBS)
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all:	${PROGS}
-
-clean:
-	rm -f *.o ${PROGS}
-
-depend:
-	makedepend -- ${CFLAGS} -- ${SRC}
-
-${PROGS}:	${OBJ}
-	$(LINK.c) -o $@ $(OBJ) ../common/log.o ../common/config.o ../common/utils.o -lpopt
-
-# DO NOT DELETE
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
-io.o: ../common/log.h ../common/utils.h io.h smtpap.h
-io.o: /usr/include/bits/endian.h /usr/include/bits/pthreadtypes.h
-io.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-io.o: /usr/include/bits/sigset.h /usr/include/bits/sockaddr.h
-io.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h
-io.o: /usr/include/bits/types.h /usr/include/bits/wchar.h
-io.o: /usr/include/endian.h /usr/include/features.h /usr/include/_G_config.h
-io.o: /usr/include/gconv.h /usr/include/gnu/stubs.h /usr/include/libio.h
-io.o: /usr/include/malloc.h /usr/include/stdio.h /usr/include/string.h
-io.o: /usr/include/sys/cdefs.h /usr/include/syslog.h /usr/include/sys/select.h
-io.o: /usr/include/sys/syslog.h /usr/include/sys/sysmacros.h
-io.o: /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/sys/un.h
-io.o: /usr/include/time.h /usr/include/wchar.h /usr/include/xlocale.h
-io.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-io.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-smtpap.o: ../common/config.h ../common/log.h ../common/ss.h ../common/utils.h
-smtpap.o: ../common/version.h io.h smtpap.h /usr/include/alloca.h
-smtpap.o: /usr/include/arpa/inet.h /usr/include/asm/errno.h
-smtpap.o: /usr/include/asm/sigcontext.h /usr/include/asm/socket.h
-smtpap.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h
-smtpap.o: /usr/include/bits/confname.h /usr/include/bits/endian.h
-smtpap.o: /usr/include/bits/environments.h /usr/include/bits/errno.h
-smtpap.o: /usr/include/bits/in.h /usr/include/bits/local_lim.h
-smtpap.o: /usr/include/bits/netdb.h /usr/include/bits/posix1_lim.h
-smtpap.o: /usr/include/bits/posix2_lim.h /usr/include/bits/posix_opt.h
-smtpap.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/resource.h
-smtpap.o: /usr/include/bits/sched.h /usr/include/bits/select.h
-smtpap.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h
-smtpap.o: /usr/include/bits/siginfo.h /usr/include/bits/signum.h
-smtpap.o: /usr/include/bits/sigset.h /usr/include/bits/sigstack.h
-smtpap.o: /usr/include/bits/sigthread.h /usr/include/bits/sockaddr.h
-smtpap.o: /usr/include/bits/socket.h /usr/include/bits/stdio_lim.h
-smtpap.o: /usr/include/bits/time.h /usr/include/bits/types.h
-smtpap.o: /usr/include/bits/uio.h /usr/include/bits/waitflags.h
-smtpap.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h
-smtpap.o: /usr/include/bits/wordsize.h /usr/include/bits/xopen_lim.h
-smtpap.o: /usr/include/ctype.h /usr/include/endian.h /usr/include/errno.h
-smtpap.o: /usr/include/features.h /usr/include/_G_config.h
-smtpap.o: /usr/include/gconv.h /usr/include/getopt.h /usr/include/gnu/stubs.h
-smtpap.o: /usr/include/libio.h /usr/include/limits.h
-smtpap.o: /usr/include/linux/errno.h /usr/include/linux/limits.h
-smtpap.o: /usr/include/netdb.h /usr/include/netinet/in.h
-smtpap.o: /usr/include/rpc/netdb.h /usr/include/signal.h /usr/include/stdint.h
-smtpap.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h
-smtpap.o: /usr/include/sys/cdefs.h /usr/include/syslog.h
-smtpap.o: /usr/include/sys/resource.h /usr/include/sys/select.h
-smtpap.o: /usr/include/sys/socket.h /usr/include/sys/syslog.h
-smtpap.o: /usr/include/sys/sysmacros.h /usr/include/sys/time.h
-smtpap.o: /usr/include/sys/types.h /usr/include/sys/ucontext.h
-smtpap.o: /usr/include/sys/uio.h /usr/include/sys/un.h /usr/include/sys/wait.h
-smtpap.o: /usr/include/time.h /usr/include/ucontext.h /usr/include/unistd.h
-smtpap.o: /usr/include/wait.h /usr/include/wchar.h /usr/include/xlocale.h
-smtpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-smtpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-smtpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-smtpap.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/or
+pkglibdir = $(libdir)/or
+pkgincludedir = $(includedir)/or
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/bergo/src/work/or/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/bergo/src/work/or/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/bergo/src/work/or/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/bergo/src/work/or/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/ginstall -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/bergo/src/work/or/missing --run tar
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = or
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.0.0
+am__include = include
+am__quote = 
+install_sh = /home/bergo/src/work/or/install-sh
+
+bin_PROGRAMS = smtpap
+
+smtpap_LDADD = -L../common -lor
+
+smtpap_SOURCES = smtpap.c io.c
+
+noinst_HEADERS = smtpap.h io.h
+subdir = src/smtpap
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orconfig.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = smtpap$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_smtpap_OBJECTS = smtpap.$(OBJEXT) io.$(OBJEXT)
+smtpap_OBJECTS = $(am_smtpap_OBJECTS)
+smtpap_DEPENDENCIES =
+smtpap_LDFLAGS =
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -I/usr/local/ssl/include 
+LDFLAGS = -L/usr/local/ssl/lib 
+LIBS =  -lpopt -lcrypto
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/io.Po ./$(DEPDIR)/smtpap.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -Wall -O2
+DIST_SOURCES = $(smtpap_SOURCES)
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+SOURCES = $(smtpap_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/smtpap/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+smtpap$(EXEEXT): $(smtpap_OBJECTS) $(smtpap_DEPENDENCIES) 
+	@rm -f smtpap$(EXEEXT)
+	$(LINK) $(smtpap_LDFLAGS) $(smtpap_OBJECTS) $(smtpap_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/io.Po
+include ./$(DEPDIR)/smtpap.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT: