From e927fa05a5f1219b37c686c579a2c1d2e904c060 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Thu, 18 Mar 1999 10:24:53 +0000
Subject: [PATCH] include Makefile.am.common

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5580 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/common/Makefile.am       |   9 ++-
 appl/ftp/ftp/Makefile.am          |  31 +++++----
 appl/ftp/ftpd/Makefile.am         |  32 ++++-----
 appl/kx/Makefile.am               |  50 ++++++++++----
 appl/popper/Makefile.am           |  15 +++--
 appl/push/Makefile.am             |  15 +++--
 appl/telnet/Makefile.am           |   8 ++-
 appl/telnet/libtelnet/Makefile.am |  22 ++++--
 appl/telnet/telnet/Makefile.am    |  11 ++-
 appl/telnet/telnetd/Makefile.am   |  13 ++--
 appl/xnlock/Makefile.am           |  25 ++++---
 lib/com_err/Makefile.am           |  12 ++--
 lib/des/Makefile.am               |  70 +++++++++++++++++--
 lib/editline/Makefile.am          |  10 ++-
 lib/kafs/Makefile.am              |  24 ++++---
 lib/otp/Makefile.am               |  11 +--
 lib/roken/Makefile.am             | 108 +++++++++++++++++++++++++-----
 lib/sl/Makefile.am                |  27 +++++---
 18 files changed, 348 insertions(+), 145 deletions(-)

diff --git a/appl/ftp/common/Makefile.am b/appl/ftp/common/Makefile.am
index 11e8fdd3e..adb71a38f 100644
--- a/appl/ftp/common/Makefile.am
+++ b/appl/ftp/common/Makefile.am
@@ -1,13 +1,12 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies
+include $(top_srcdir)/Makefile.am.common
 
-CFLAGS = $(WFLAGS) @CFLAGS@
-
-INCLUDES = $(INCLUDE_krb4) 
+INCLUDES += $(INCLUDE_krb4) 
 
 noinst_LIBRARIES = libcommon.a
 
 libcommon_a_SOURCES = \
 	sockbuf.c \
-	buffer.c
+	buffer.c \
+	common.h
diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am
index 8d5fbc83d..d9f2d6ccf 100644
--- a/appl/ftp/ftp/Makefile.am
+++ b/appl/ftp/ftp/Makefile.am
@@ -1,41 +1,48 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies
+include $(top_srcdir)/Makefile.am.common
 
-CFLAGS = @CFLAGS@ $(WFLAGS)
-
-INCLUDES = -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_readline)
+INCLUDES += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4)
 
 bin_PROGRAMS = ftp
 
 if KRB4
-krb4_sources = $(EXTRA_ftp_SOURCES)
-else
-krb4_sources = 
+krb4_sources = krb4.c kauth.c
+endif
+if KRB5
+krb5_sources = gssapi.c
+x = \
+	$(top_builddir)/lib/gssapi/libgssapi.la \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/asn1/libasn1.la
+
 endif
 
 ftp_SOURCES = \
 	cmds.c \
 	cmdtab.c \
+	extern.h \
 	ftp.c \
+	ftp_locl.h \
+	ftp_var.h \
 	main.c \
+	pathnames.h \
 	ruserpass.c \
 	domacro.c \
 	globals.c \
 	security.c \
+	security.h \
 	$(krb4_sources) \
-	gssapi.c
+	$(krb5_sources)
 
-EXTRA_ftp_SOURCES = krb4.c kauth.c
+EXTRA_ftp_SOURCES = krb4.c kauth.c gssapi.c
 
 LIB_tgetent = @LIB_tgetent@
 
 LDADD = \
 	../common/libcommon.a \
-	$(top_builddir)/lib/gssapi/libgssapi.la \
-	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(x) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/roken/libroken.la \
 	$(LIB_readline)
diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am
index a3a255439..4b651076f 100644
--- a/appl/ftp/ftpd/Makefile.am
+++ b/appl/ftp/ftpd/Makefile.am
@@ -9,22 +9,25 @@ INCLUDES = -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER
 libexec_PROGRAMS = ftpd
 
 if KRB4
-krb4_sources = $(EXTRA_ftpd_SOURCES)
-else
-krb4_sources = 
+krb4_sources = krb4.c kauth.c
+endif
+if KRB5
+krb5_sources = gssapi.c gss_userok.c
 endif
 
 ftpd_SOURCES =		\
-	ftpd.c		\
+	extern.h	\
 	ftpcmd.y	\
+	ftpd.c		\
+	ftpd_locl.h	\
 	logwtmp.c	\
+	pathnames.h	\
 	popen.c		\
 	security.c	\
 	$(krb4_sources) \
-	gssapi.c	\
-	gss_userok.c
+	$(krb5_sources)
 
-EXTRA_ftpd_SOURCES = krb4.c kauth.c
+EXTRA_ftpd_SOURCES = krb4.c kauth.c gssapi.c gss_userok.c
 
 $(ftpd_OBJECTS): security.h
 
@@ -39,19 +42,12 @@ gssapi.c:
 
 CLEANFILES = security.c security.h krb4.c gssapi.c
 
-if KRB4
-afslib = $(top_builddir)/lib/kafs/libkafs.a $(AIX_EXTRA_KAFS)
-else
-afslib =
-endif
-
 LDADD = ../common/libcommon.a \
-	$(top_builddir)/lib/gssapi/libgssapi.la \
-	$(afslib) \
-	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_kafs) \
+	$(LIB_gssapi) \
+	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/otp/libotp.la \
+	$(top_builddir)/lib/des/libdes.la \
 	$(top_builddir)/lib/roken/libroken.la \
 	@LIB_crypt@ $(DBLIB)
diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am
index a71ac0592..831b95604 100644
--- a/appl/kx/Makefile.am
+++ b/appl/kx/Makefile.am
@@ -1,29 +1,39 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-XINCS = @X_CFLAGS@
-XLIBS = @X_XLIBS@ @LIB_XauReadAuth@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
+INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS)
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) $(XINCS)
+WFLAGS += $(WFLAGS_NOIMPLICITINT)
 
-bin_PROGRAMS = kx rxterm rxtelnet tenletxr
+bin_PROGRAMS = kx
+bin_SCRIPTS = rxterm rxtelnet tenletxr
 
 libexec_PROGRAMS = kxd
 
-encdata.c:
-	$(LN_S) $(srcdir)/../kauth/encdata.c .
+if NEED_WRITEAUTH
+XauWriteAuth_c = writeauth.c
+endif
 
-common_SOURCES = \
+kx_SOURCES = \
+	kx.c \
+	kx.h \
 	common.c \
 	encdata.c \
-	@XauWriteAuth_c@
+	$(XauWriteAuth_c)
 
-kx_SOURCES = kx.c \
-	$(common_SOURCES)
+EXTRA_kx_SOURCES = writeauth.c
 
-kxd_SOURCES = kxd.c \
-	$(common_SOURCES)
+kxd_SOURCES = \
+	kxd.c \
+	kx.h \
+	common.c \
+	encdata.c \
+	$(XauWriteAuth_c)
+
+EXTRA_kxd_SOURCES = writeauth.c
+
+EXTRA_DIST = rxterm.in rxtelnet.in tenletxr.in
 
 rxterm: rxterm.in
 	sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@
@@ -37,4 +47,16 @@ tenletxr: tenletxr.in
 	sed -e "s!%bindir%!$(bindir)!" $(srcdir)/tenletxr.in > $@
 	chmod +x $@
 
-LDADD = -L$(top_builddir)/lib/krb5 -lkrb5 $(LIB_otp) -L$(top_builddir)/lib/des -ldes $(LIB_krb4) -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken $(XLIBS)
+encdata.c:
+	$(LN_S) $(srcdir)/../kauth/encdata.c .
+kauth.h:
+	$(LN_S) $(srcdir)/../kauth/kauth.h .
+
+$(OBJECTS): kauth.h
+
+LDADD = \
+	$(LIB_kafs)				\
+	$(LIB_krb4)				\
+	$(top_builddir)/lib/des/libdes.la	\
+	$(top_builddir)/lib/roken/libroken.la	\
+	$(LIB_XauReadAuth) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am
index 4d10a3f23..f8727e201 100644
--- a/appl/popper/Makefile.am
+++ b/appl/popper/Makefile.am
@@ -1,10 +1,8 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4)
-
-CFLAGS = @CFLAGS@ $(WFLAGS)
+INCLUDES += $(INCLUDE_krb4)
 
 noinst_PROGRAMS = pop_debug
 
@@ -17,12 +15,15 @@ popper_SOURCES = \
 	pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
 	pop_rset.c pop_send.c pop_stat.c pop_updt.c \
 	pop_user.c pop_uidl.c pop_xover.c popper.c \
-	maildir.c
+	maildir.c popper.h version.h
 
-LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+EXTRA_DIST = pop3.rfc1081 pop3e.rfc1082 \
+	popper.README.release README-FIRST README-KRB4
+
+LDADD = \
 	$(LIB_otp) \
+	$(LIB_krb5) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB)
diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am
index 62b112b3d..53510f574 100644
--- a/appl/push/Makefile.am
+++ b/appl/push/Makefile.am
@@ -1,22 +1,25 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) @HESIODINCLUDE@
+INCLUDES += $(INCLUDE_krb4) $(HESIODINCLUDE)
 
 bin_SCRIPTS		= pfrom
 
 libexec_PROGRAMS	= push
 
-push_SOURCES		= push.c
+push_SOURCES = push.c push_locl.h
 
 pfrom: pfrom.in
 	sed -e "s!%bindir%!$(bindir)!" $(srcdir)/pfrom.in > $@
 	chmod +x $@
 
-LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+man_MANS = push.8
+
+EXTRA_DIST = pfrom.in $(man_MANS)
+
+LDADD = $(LIB_krb5) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/roken/libroken.la
-	@HESIODLIB@
+	$(HESIODLIB)
diff --git a/appl/telnet/Makefile.am b/appl/telnet/Makefile.am
index 42b5647a8..88493594d 100644
--- a/appl/telnet/Makefile.am
+++ b/appl/telnet/Makefile.am
@@ -1,5 +1,11 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
 SUBDIRS = libtelnet telnet telnetd
+
+dist-hook:
+	$(mkinstalldirs) $(distdir)/arpa
+	$(INSTALL_DATA) $(srcdir)/arpa/telnet.h $(distdir)/arpa
+
+EXTRA_DIST = README.ORIG telnet.state
diff --git a/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am
index dec6df74a..0cecfc139 100644
--- a/appl/telnet/libtelnet/Makefile.am
+++ b/appl/telnet/libtelnet/Makefile.am
@@ -1,10 +1,24 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include -I$(srcdir)/.. $(INCLUDE_krb4)
+INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4)
 
 noinst_LIBRARIES = libtelnet.a
 
-libtelnet_a_SOURCES = auth.c encrypt.c genget.c enc_des.c misc.c kerberos.c \
-		      kerberos5.c
+libtelnet_a_SOURCES = \
+	auth-proto.h	\
+	auth.c		\
+	auth.h		\
+	enc-proto.h	\
+	enc_des.c	\
+	encrypt.c	\
+	encrypt.h	\
+	genget.c	\
+	kerberos.c	\
+	kerberos5.c	\
+	misc-proto.h	\
+	misc.c		\
+	misc.h
+
+EXTRA_DIST = krb4encpwd.c rsaencpwd.c spx.c
diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am
index d2b08d559..bf5abd3a0 100644
--- a/appl/telnet/telnet/Makefile.am
+++ b/appl/telnet/telnet/Makefile.am
@@ -1,19 +1,18 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include -I$(srcdir)/..
+INCLUDES += -I$(srcdir)/..
 
 bin_PROGRAMS = telnet
 
 telnet_SOURCES  = authenc.c commands.c main.c network.c ring.c \
 		  sys_bsd.c telnet.c terminal.c \
-		  utilities.c
+		  utilities.c defines.h externs.h ring.h telnet_locl.h types.h
 
 LDADD = ../libtelnet/libtelnet.a \
-	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_krb5) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
-	@LIB_tgetent@ \
+	$(LIB_tgetent) \
 	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am
index b45b2bb63..ee7f3021a 100644
--- a/appl/telnet/telnetd/Makefile.am
+++ b/appl/telnet/telnetd/Makefile.am
@@ -1,20 +1,19 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include -I$(srcdir)/.. $(INCLUDE_krb4)
+INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4)
 
 libexec_PROGRAMS = telnetd
 
 telnetd_SOURCES  = telnetd.c state.c termstat.c slc.c sys_term.c \
-		   utility.c global.c authenc.c
+		   utility.c global.c authenc.c defs.h ext.h telnetd.h
 
 LDADD = \
 	../libtelnet/libtelnet.a \
-	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_krb5) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
-	@LIB_tgetent@ \
-	@LIB_logwtmp@ \
+	$(LIB_tgetent) \
+	$(LIB_logwtmp) \
 	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am
index 75c527e8b..5a2e16225 100644
--- a/appl/xnlock/Makefile.am
+++ b/appl/xnlock/Makefile.am
@@ -1,24 +1,23 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-XINCS = @X_CFLAGS@
-XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) -DBINDIR=\"$(bindir)\"
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) $(X_CFLAGS) -DBINDIR=\"$(bindir)\"
+WFLAGS += $(WFLAGS_NOIMPLICITINT)
 
 bin_PROGRAMS = xnlock
-if KRB4
-AFSLIB=$(top_builddir)/lib/kafs/libkafs.a 
-else
-AFSLIB=
-endif
+xnlock_SOURCES = xnlock.c
+
+man1_MANS = xnlock.man
+
+EXTRA_DIST = $(man1_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \
+	nose.down nose.front nose.left.front nose.right.front
 
 LDADD = \
-	$(top_builddir)/lib/kafs/libkafs.a \
-	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_kafs) \
+	$(LIB_krb5) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/des/libdes.la \
-	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/roken/libroken.la \
-	$(XLIBS)
+	$(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
diff --git a/lib/com_err/Makefile.am b/lib/com_err/Makefile.am
index db48caf43..8546e231c 100644
--- a/lib/com_err/Makefile.am
+++ b/lib/com_err/Makefile.am
@@ -1,21 +1,21 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
 YFLAGS = -d
 
-INCLUDES = -I$(top_builddir)/include -I$(srcdir)
-
 lib_LTLIBRARIES = libcom_err.la
 
 bin_PROGRAMS = compile_et
 
-compile_et_SOURCES = compile_et.c parse.y lex.l
+include_HEADERS = com_err.h com_right.h
 
-libcom_err_la_SOURCES = error.c com_err.c
+compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l
+
+libcom_err_la_SOURCES = error.c com_err.c roken_rename.h
 
 CLEANFILES = lex.c parse.c parse.h
 
 $(compile_et_OBJECTS): parse.h
 
-compile_et_LDADD = ../roken/libroken.la @LEXLIB@
+compile_et_LDADD = ../roken/libroken.la $(LEXLIB)
diff --git a/lib/des/Makefile.am b/lib/des/Makefile.am
index fffac911e..01d7ebffb 100644
--- a/lib/des/Makefile.am
+++ b/lib/des/Makefile.am
@@ -1,17 +1,18 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include
-
-#lib_LIBRARIES = libdes.a
 lib_LTLIBRARIES = libdes.la
-include_HEADERS = des.h
+include_HEADERS = des.h md4.h md5.h sha.h
+
+build_HEADERZ = $(include_HEADERS)
 
 noinst_PROGRAMS = destest mdtest
 
 bin_PROGRAMS = des rpw speed
 
+des_SOURCES = des.c des_ver.h
+
 LDADD = $(lib_LTLIBRARIES)
 
 libdes_la_SOURCES = \
@@ -21,4 +22,61 @@ libdes_la_SOURCES = \
 	enc_writ.c fcrypt.c key_par.c md4.c md5.c \
 	ncbc_enc.c ofb64ede.c ofb64enc.c ofb_enc.c \
 	pcbc_enc.c qud_cksm.c read_pwd.c rnd_keys.c \
-	set_key.c sha.c str2key.c xcbc_enc.c
+	set_key.c sha.c str2key.c xcbc_enc.c des_locl.h podd.h sk.h spr.h
+
+EXTRA_libdes_la_SOURCES = dllmain.c passwd_dialog.aps passwd_dialog.clw \
+	passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h
+
+## this is an awful lot of junk, but it's just as well to include everything
+EXTRA_DIST =		\
+	COPYRIGHT	\
+	DES.pm		\
+	DES.pod		\
+	DES.xs		\
+	FILES		\
+	Imakefile	\
+	KERBEROS	\
+	MODES.DES	\
+	Makefile.PL	\
+	Makefile.ssl	\
+	Makefile.uni	\
+	PC1		\
+	PC2		\
+	VERSION		\
+	des.def		\
+	des.dsp		\
+	des.doc		\
+	des.mak		\
+	des.man		\
+	des.org		\
+	des.pl		\
+	des_crypt.man	\
+	des_locl.org	\
+	des_opts.c	\
+	doIP		\
+	doPC1		\
+	doPC2		\
+	makefile.bc	\
+	rand_key.c	\
+	rpc_des.h	\
+	rpc_enc.c	\
+	shifts.pl	\
+	supp.c		\
+	testdes.pl	\
+	times		\
+	typemap		\
+	version.h	\
+	vms.com
+
+asm_files = des-som2.pl des-som3.pl des586.pl des686.pl desboth.pl \
+	dx86-cpp.s dx86unix.cpp readme win32.asm win32.obj win32.uu x86ms.pl \
+	x86unix.pl
+
+dist-hook:
+	$(mkinstalldirs) $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/perl $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/test $(distdir)/t
+	$(mkinstalldirs) $(distdir)/asm
+	(cd $(srcdir)/asm && tar cf - $(asm_files)) \
+		| (cd $(distdir)/asm; tar xf -)
+	
diff --git a/lib/editline/Makefile.am b/lib/editline/Makefile.am
index 96ca9aaed..ff9d8c92f 100644
--- a/lib/editline/Makefile.am
+++ b/lib/editline/Makefile.am
@@ -1,8 +1,8 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include
+man_MANS = editline.3
 
 lib_LIBRARIES = libeditline.a
 if el_compat
@@ -11,5 +11,9 @@ else
 noinst_LIBRARIES =
 endif
 
-libeditline_a_SOURCES = complete.c editline.c sysunix.c
+include_HEADERS = editline.h
+
+libeditline_a_SOURCES = complete.c editline.c sysunix.c editline.h roken_rename.h unix.h
 libel_compat_a_SOURCES = edit_compat.c
+
+EXTRA_DIST = $(man_MANS) testit.c
diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am
index 78d77178b..075a43fc3 100644
--- a/lib/kafs/Makefile.am
+++ b/lib/kafs/Makefile.am
@@ -1,15 +1,11 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = \
-	-I$(top_builddir)/include	\
-	$(INCLUDE_krb4)			\
-	-DLIBDIR=\"$(libdir)\"		\
-	$(AFS_EXTRA_DEFS)
+INCLUDES += $(INCLUDE_krb4) -DLIBDIR=\"$(libdir)\" $(AFS_EXTRA_DEFS)
 
 if KRB4
-AFSLIBS = libkafs.a
+AFSLIBS = libkafs.la
 else
 AFSLIBS = 
 endif
@@ -43,16 +39,26 @@ AIX_SRC =
 endif # AIX
 
 
-lib_LIBRARIES = $(AFSLIBS)
+lib_LTLIBRARIES = $(AFSLIBS)
 foodir = $(libdir)
 foo_DATA = $(AFS_EXTRA_LIBS)
 # EXTRA_DATA = afslib.so
 
 CLEANFILES= $(AFS_EXTRA_LIBS)
 
-libkafs_a_SOURCES = afssys.c afskrb.c afskrb5.c common.c $(AIX_SRC)
+include_HEADERS = kafs.h
+
+if KRB5
+afskrb5_c = afskrb5.c
+endif
+
+libkafs_la_SOURCES = afssys.c afskrb.c $(afskrb5_c) common.c $(AIX_SRC) kafs_locl.h afssysdefs.h
 #afslib_so_SOURCES = afslib.c
 
+EXTRA_libkafs_la_SOURCES = afskrb5.c dlfcn.c afslib.c dlfcn.h
+
+EXTRA_DIST = README.dlfcn afsl.exp afslib.exp
+
 
 # AIX: this almost works with gcc, but somehow it fails to use the
 # correct ld, use ld instead
diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am
index b2330eaf2..75748ba55 100644
--- a/lib/otp/Makefile.am
+++ b/lib/otp/Makefile.am
@@ -1,8 +1,6 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-INCLUDES = -I$(top_builddir)/include
+include $(top_srcdir)/Makefile.am.common
 
 noinst_PROGRAMS = otptest
 
@@ -11,6 +9,8 @@ otptest_LDADD = libotp.la \
 	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB)
 
+include_HEADERS = otp.h
+
 lib_LTLIBRARIES = libotp.la
 
 libotp_la_SOURCES = \
@@ -20,4 +20,7 @@ libotp_la_SOURCES = \
 	otp_md.c \
 	otp_parse.c \
 	otp_print.c \
-	otp_verify.c
+	otp_verify.c \
+	otp_locl.h \
+	otp_md.h \
+	roken_rename.h
diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 629440e2a..2f5ef9b6e 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -1,8 +1,6 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-INCLUDES = -I$(top_builddir)/include
+include $(top_srcdir)/Makefile.am.common
 
 CLEANFILES = roken.h make-roken.c print_version.h
 
@@ -10,7 +8,9 @@ lib_LTLIBRARIES = libroken.la
 
 noinst_PROGRAMS = make-roken make-print-version
 
-make_print_version_LDADD = $(LIB_krb4)
+if KRB5
+make_print_version_LDADD += $(LIB_krb4)
+endif
 
 libroken_la_SOURCES =		\
 	base64.c		\
@@ -29,31 +29,109 @@ libroken_la_SOURCES =		\
 	net_write.c		\
 	parse_time.c		\
 	parse_units.c		\
+	parse_units.h		\
 	print_version.c		\
 	resolve.c		\
 	roken_gethostby.c	\
 	signal.c		\
+	simple_exec.c		\
 	snprintf.c		\
 	strcat_truncate.c	\
 	strcpy_truncate.c	\
+	tm2time.c		\
 	verify.c		\
-	warnerr.c
+	warnerr.c		\
+	xdbm.h
+
+EXTRA_libroken_la_SOURCES =	\
+	chown.c			\
+	daemon.c		\
+	err.c			\
+	err.h			\
+	errx.c			\
+	fchown.c		\
+	flock.c			\
+	fnmatch.c		\
+	fnmatch.h		\
+	getdtablesize.c		\
+	getegid.c		\
+	geteuid.c		\
+	getgid.c		\
+	gethostname.c		\
+	getopt.c		\
+	gettimeofday.c		\
+	getuid.c		\
+	getusershell.c		\
+	glob.h			\
+	hstrerror.c		\
+	inet_aton.c		\
+	initgroups.c		\
+	innetgr.c		\
+	iruserok.c		\
+	lstat.c			\
+	memmove.c		\
+	mkstemp.c		\
+	putenv.c		\
+	rcmd.c			\
+	readv.c			\
+	recvmsg.c		\
+	sendmsg.c		\
+	setegid.c		\
+	setenv.c		\
+	seteuid.c		\
+	strcasecmp.c		\
+	strdup.c		\
+	strerror.c		\
+	strftime.c		\
+	strlwr.c		\
+	strncasecmp.c		\
+	strnlen.c		\
+	strsep.c		\
+	strtok_r.c		\
+	strupr.c		\
+	swab.c			\
+	unsetenv.c		\
+	verr.c			\
+	verrx.c			\
+	vsyslog.c		\
+	vwarn.c			\
+	vwarnx.c		\
+	warn.c			\
+	warnx.c			\
+	writev.c
+
+EXTRA_DIST = resource.h roken.awk roken.def roken.dsp roken.h.in \
+	roken.mak roken.rc
+
+
 
 libroken_la_LIBADD = @LTLIBOBJS@
 
 $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h
 
-incdir = $(includedir)
-inc_DATA = roken.h
-idir = $(top_builddir)/include
+include_HEADERS = base64.h getarg.h parse_time.h resolve.h roken-common.h
 
-all-local: $(inc_DATA)
-	@for i in $(inc_DATA); do \
-		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
-			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
-			$(INSTALL_DATA) $$i $(idir)/$$i; \
-		fi ; \
-	done
+include__DATA = roken.h
+
+build_HEADERZ = $(err_h) $(fnmatch_h) $(glob_h) xdbm.h
+
+if have_err_h
+err_h =
+else
+err_h = err.h
+endif
+
+if have_fnmatch_h
+fnmatch_h =
+else
+fnmatch_h = fnmatch.h
+endif
+
+if have_glob_h
+glob_h =
+else
+glob_h = glob.h
+endif
 
 roken.h: make-roken
 	@./make-roken > tmp.h ;\
diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am
index 07d646010..0d9fd9ae8 100644
--- a/lib/sl/Makefile.am
+++ b/lib/sl/Makefile.am
@@ -1,22 +1,31 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
+
+INCLUDES += -DROKEN_RENAME
 
 YFLAGS = -d
 
-INCLUDES = -I$(top_builddir)/include
+include_HEADERS = sl.h
 
-lib_LIBRARIES = libsl.a
+lib_LTLIBRARIES = libsl.la
 
-libsl_a_SOURCES = sl.c ss.c
+libsl_la_SOURCES = sl_locl.h sl.c ss.c ss.h roken_rename.h strtok_r.c snprintf.c
 
 # install these?
-noinst_PROGRAMS = mk_cmds
-#incdir = $(includedir)/ss
-#inc_DATA = ss.h
 
-mk_cmds_SOURCES = make_cmds.c parse.y lex.l
+noinst_PROGRAMS = mk_cmds
+
+mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l snprintf.c
+
+ssincludedir = $(includedir)/ss
+#ssinclude_DATA = ss.h
 
 $(mk_cmds_OBJECTS): parse.h
 
-LDADD = ../roken/libroken.la @LEXLIB@
+LDADD = ../roken/libroken.la $(LEXLIB)
+
+strtok_r.c:
+	$(LN_S) $(srcdir)/../roken/strtok_r.c .
+snprintf.c:
+	$(LN_S) $(srcdir)/../roken/snprintf.c .