Reduced Makefile.in, using pre/post

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3944 dc483132-0cff-0310-8789-dd5450dbe970

22 files changed, 3 insertions, 532 deletions

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 0e50cb649..9811e73cf 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,26 +1,6 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-SUBDIRS = @SUBDIRS@
-
-RM = rm -f
-CP  = cp
-RANLIB = @RANLIB@
-ARCHIVE = @ARCHIVE@
-LN = @LN_S@
-
-KRB5ROOT = @KRB5ROOT@
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-
 all::
 
 install:: libkrb425.a
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 4b7f5528e..59c254dc4 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,44 +1,8 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-ARCHIVE = @ARCHIVE@
-ARADD = @ARADD@
-
-SUBDIRS = @SUBDIRS@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-KRB5ROOT = @KRB5ROOT@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
-ADMIN_MANDIR = $(KRB5MANROOT)/man8
-SERVER_MANDIR = $(KRB5MANROOT)/man8
-CLIENT_MANDIR = $(KRB5MANROOT)/man1
-FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)/krb5 \
-	$(KRB5_INCDIR)/asn.1 \
-	$(KRB5_INCDIR)/kerberosIV
-
-RM = rm -f
-CP = cp
-RANLIB = @RANLIB@
-
 TST=if test -n "`cat DONE`" ; then
 
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 OBJS=	cryptoconf.o
 SRCS=	$(srcdir)/cryptoconf.c
 
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index b69dd1cf3..b62914d4e 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -29,6 +13,3 @@ crctest: crctest.o $(OBJS)
 	$(RM) crctest
 	$(CC) -o $@ crctest.o $(LDFLAGS) $(OBJS)
 
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 6158a1043..196ffc91f 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 OTHERSRCS=$(srcdir)/f_cbc.c $(srcdir)/f_cksum.c $(srcdir)/f_pcbc.c \
@@ -84,7 +68,3 @@ destest: destest.o libdes.o
 
 clean::
 	$(RM) destest
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 40f0150b7..192730009 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -24,8 +8,3 @@ all:: $(OBJS)
 OBJS=	md4.o md4glue.o md4crypto.o
 
 SRCS=	$(srcdir)/md4.c $(srcdir)/md4glue.c $(srcdir)/md4crypto.c
-
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 7f62e95e7..d5d990014 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -24,8 +8,3 @@ all:: $(OBJS)
 OBJS=	md5.o md5glue.o md5crypto.o
 
 SRCS=	$(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
-
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 00ebd435a..813a7df41 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -1,25 +1,8 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-LN = @LN_S@
-
 LIBOBJS = @LIBOBJS@
 
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -36,9 +19,3 @@ ustime.c: ../../krb5/os/ustime.c
 
 memmove.c: ../../krb5/posix/memmove.c
 	-$(LN) $(srcdir)/../../krb5/posix/memmove.c $@
-
-
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 4e62c5f6b..ce8f3e3f7 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,42 +1,6 @@
-BUILDTOP=@BUILDTOP@
-RANLIB = @RANLIB@
-ARCHIVE = @ARCHIVE@
-ARADD = @ARADD@
-
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-KRB5ROOT = @KRB5ROOT@
-
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
-ADMIN_MANDIR = $(KRB5MANROOT)/man8
-SERVER_MANDIR = $(KRB5MANROOT)/man8
-CLIENT_MANDIR = $(KRB5MANROOT)/man1
-FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)/krb5 \
-	$(KRB5_INCDIR)/asn.1 \
-	$(KRB5_INCDIR)/kerberosIV
-
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 OBJS=	cksum.o		\
@@ -89,7 +53,5 @@ install:: libdes425.a
 	$(RANLIB) $(KRB5_LIBDIR)/libdes425.a
 
 clean::
-	$(RM) $(OBJS)
-
-clean::
 	$(RM) libdes425.a
+
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 1f2adc08e..3a9e2c572 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,34 +1,3 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-ARCHIVE = @ARCHIVE@
-ARADD = @ARADD@
-CC = @CC@
-CCOPTS = @CCOPTS@
-SUBDIRS = @SUBDIRS@
-KRB5ROOT = @KRB5ROOT@
-
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
-ADMIN_MANDIR = $(KRB5MANROOT)/man8
-SERVER_MANDIR = $(KRB5MANROOT)/man8
-CLIENT_MANDIR = $(KRB5MANROOT)/man1
-FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)/krb5 \
-	$(KRB5_INCDIR)/asn.1 \
-	$(KRB5_INCDIR)/kerberosIV
-
-
-RM = rm -f
-CP = cp
-RANLIB = @RANLIB@
-
 TST=if test -n "`cat DONE`" ; then
 
 all::
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index ec2221d49..fd2766dd8 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,24 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-AWK = @AWK@
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 ETSRCS= gssapi_generic_err.c
@@ -84,7 +66,3 @@ includes::
 	@-mkdir $(EHDRDIR)
 
 depend:: $(ETSRCS)
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 75ec3b164..bd7397a2b 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,24 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-AWK = @AWK@
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 ETSRCS= gssapi_krb5_err.c
@@ -105,7 +87,3 @@ clean::
 depend:: $(ETSRCS)
 
 includes:: 
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index c32da1fac..4ef0069de 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,40 +1,6 @@
-BUILDTOP=@BUILDTOP@
-RANLIB = @RANLIB@
-ARCHIVE = @ARCHIVE@
-ARADD = @ARADD@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-KRB5ROOT = @KRB5ROOT@
- 
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
-ADMIN_MANDIR = $(KRB5MANROOT)/man8
-SERVER_MANDIR = $(KRB5MANROOT)/man8
-CLIENT_MANDIR = $(KRB5MANROOT)/man1
-FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)/krb5 \
-	$(KRB5_INCDIR)/asn.1 \
-	$(KRB5_INCDIR)/kerberosIV
-
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -56,8 +22,6 @@ OBJS= \
 	setup_mkey.o \
 	store_mkey.o
 
-TOPLIBD = $(BUILDTOP)/lib
-
 libkdb5.a: $(OBJS)
 	$(RM) $@
 	$(ARADD) $@ $(OBJS)
@@ -72,7 +36,4 @@ install:: libkdb5.a
 	$(RANLIB) $(KRB5_LIBDIR)/libkdb5.a
 
 clean::
-	$(RM) $(OBJS)
-
-clean::
 	$(RM) libkdb5.a
diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in
index ae900598f..3448ca0bb 100644
--- a/src/lib/krb425/Makefile.in
+++ b/src/lib/krb425/Makefile.in
@@ -1,44 +1,8 @@
-BUILDTOP=@BUILDTOP@
-RANLIB = @RANLIB@
-ARCHIVE = @ARCHIVE@
-ARADD = @ARADD@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-KRB5ROOT = @KRB5ROOT@
- 
 CFLAGS = $(CCOPTS) $(DEFS) -I$(SRCTOP)/include/kerberosIV
 LDFLAGS = -g
 
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
-ADMIN_MANDIR = $(KRB5MANROOT)/man8
-SERVER_MANDIR = $(KRB5MANROOT)/man8
-CLIENT_MANDIR = $(KRB5MANROOT)/man1
-FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)/krb5 \
-	$(KRB5_INCDIR)/asn.1 \
-	$(KRB5_INCDIR)/kerberosIV
-
 EHDRDIR = $(BUILDTOP)/include/kerberosIV
 
-RM = rm -f
-CP = cp
-
-AWK = @AWK@
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: krb_err.h includes $(OBJS)
 
 OBJS=	425data.o \
@@ -105,9 +69,6 @@ install:: libkrb425.a
 	$(RANLIB) $(KRB5_LIBDIR)/libkrb425.a
 
 clean::
-	$(RM) $(OBJS)
-
-clean::
 	$(RM) libkrb425.a
 
 clean::
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index e59307a56..698f89860 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,34 +1,3 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-ARCHIVE = @ARCHIVE@
-ARADD = @ARADD@
-CC = @CC@
-CCOPTS = @CCOPTS@
-
-SUBDIRS = @SUBDIRS@
-KRB5ROOT = @KRB5ROOT@
-
-RM = rm -f
-CP = cp
-KRB5MANROOT = $(KRB5ROOT)/man
-ADMIN_BINDIR = $(KRB5ROOT)/admin
-SERVER_BINDIR = $(KRB5ROOT)/sbin
-CLIENT_BINDIR = $(KRB5ROOT)/bin
-ADMIN_MANDIR = $(KRB5MANROOT)/man8
-SERVER_MANDIR = $(KRB5MANROOT)/man8
-CLIENT_MANDIR = $(KRB5MANROOT)/man1
-FILE_MANDIR = $(KRB5MANROOT)/man5
-KRB5_LIBDIR = $(KRB5ROOT)/lib
-KRB5_INCDIR = $(KRB5ROOT)/include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)/krb5 \
-	$(KRB5_INCDIR)/asn.1 \
-	$(KRB5_INCDIR)/kerberosIV
-
-RANLIB = @RANLIB@
-
 TST=if test -n "`cat DONE`" ; then
 
 all::
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 9cc41a841..dcf8bb294 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 OBJS=	ccbase.o \
@@ -26,6 +10,3 @@ OBJS=	ccbase.o \
 SRCS=	$(srcdir)/ccbase.c \
 	$(srcdir)/ccdefault.c \
 	$(srcdir)/ccdefops.c
-
-clean::
-	$(RM) $(OBJS)
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 43dc9df3f..1650eb8ad 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -1,25 +1,8 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
-clean::
-	$(RM) $(OBJS)
-
 OBJS 	= fcc_close.o fcc_destry.o fcc_eseq.o \
 	fcc_gennew.o fcc_getnam.o fcc_gprin.o fcc_init.o \
 	fcc_nseq.o fcc_read.o fcc_reslv.o fcc_retrv.o \
diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index e13ba5b60..9c2f2e541 100644
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -1,25 +1,6 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
-all:: $(OBJS)
-
-clean::
-	$(RM) $(OBJS)
-
 OBJS 	= scc_close.o scc_destry.o scc_eseq.o \
 	scc_gennew.o scc_getnam.o scc_gprin.o scc_init.o \
 	scc_nseq.o scc_read.o scc_reslv.o scc_retrv.o \
@@ -35,6 +16,8 @@ SRCS 	= $(srcdir)/scc_close.c $(srcdir)/scc_destry.c $(srcdir)/scc_eseq.c \
 	$(srcdir)/scc_errs.c $(srcdir)/scc_maybe.c
 
 
+all:: $(OBJS)
+
 test: ${OBJS} scc_test.o
 	${CC} -o test ${OBJS} scc_test.o
 
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 2a5ccd66b..d3904349e 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,11 +1,3 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
- 
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
 ASN1_HDRS=@ASN1_HDRS@
 ASN1_OBJS=@ASN1_OBJS@
 ASN1_SRCS=@ASN1_SRCS@
@@ -14,12 +6,6 @@ BOGUS=@BOGUS@
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-AWK = @AWK@
-
-
 EHDRDIR=$(BUILDTOP)/include/krb5
 
 HDRS=$(ASN1_SRCS) kdb5_err.h krb5_err.h adm_err.h
@@ -43,6 +29,3 @@ $(BOGUS)::
 
 clean::
 	$(RM) $(HDRS) $(ETSRCS)
-
-clean::
-	$(RM) $(OBJS)
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 4ec0ea1b7..cf6a69d2d 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 OBJS=	\
@@ -84,6 +68,3 @@ SRCS=	\
 	$(srcdir)/f_pwd_seq.c	\
 	$(srcdir)/f_cred.c	\
 	$(srcdir)/f_cred_enc.c
-
-clean::
-	$(RM) $(OBJS)
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 0dffa7154..5fccd3ec9 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -36,7 +20,3 @@ SRCS=	\
 	$(srcdir)/ktfr_entry.c	\
 	$(srcdir)/ktremove.c	\
 	$(srcdir)/read_servi.c
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index c8a6add68..6cd37130a 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,27 +1,8 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
-clean::
-	$(RM) $(OBJS)
-
-
-
 SRCS= \
 	$(srcdir)/ktf_add.c \
 	$(srcdir)/ktf_endget.c \
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 1ccb8624a..2570abcb4 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,22 +1,6 @@
-BUILDTOP=@BUILDTOP@
-SUBDIRS = @SUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-RM = rm -f
-CP = cp
-
-SRCTOP = $(srcdir)/$(BUILDTOP)
-
 all:: $(OBJS)
 
 
@@ -138,6 +122,3 @@ SRCS=	$(srcdir)/addr_comp.c	\
 	$(srcdir)/tgtname.c	\
 	$(srcdir)/unparse.c	\
 	$(srcdir)/walk_rtree.c
-
-clean::
-	$(RM) $(OBJS)