improve clean rules

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

25 files changed, 121 insertions, 0 deletions

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 697f852..dedbbbf 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -17,6 +17,8 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB)
@@ -33,3 +35,10 @@ kdb5_anadd: kdb5_anadd.o $(DEPLIBS)
 install::
 	$(INSTALLPROG) kdb5_anadd ${DESTDIR}$(ADMIN_BINDIR)/kdb5_anadd
 	$(INSTALLPROG) kdb5_anadd.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_anadd.$(ADMIN_MANSUFFIX)
+
+clean::
+	$(RM) $(OBJS)
+
+clean::
+	$(RM) kdb5_anadd
+
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 479a54f..f01202a 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -20,6 +20,8 @@ KDBLIB=$(TOPLIBD)/libkdb5.a
 KDB4LIB=$(KRB4)/lib/libkdb.a
 KRB4LIB=$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB)
@@ -37,3 +39,10 @@ kdb5_convert: kdb5_convert.o $(DEPLIBS)
 install::
 	$(INSTALLPROG) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert
 	$(INSTALLPROG) kdb5_convert.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_convert.$(ADMIN_MANSUFFIX)
+
+clean::
+	$(RM) $(OBJS)
+
+clean::
+	$(RM) kdb5_convert
+
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 0cb9513..c778c96 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -17,6 +17,8 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB)
@@ -33,3 +35,10 @@ kdb5_create: kdb5_create.o $(DEPLIBS)
 install::
 	$(INSTALLPROG) kdb5_create ${DESTDIR}$(ADMIN_BINDIR)/kdb5_create
 	$(INSTALLPROG) kdb5_create.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_create.$(ADMIN_MANSUFFIX)
+
+clean::
+	$(RM) kdb5_create
+
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index 1909d41..fb4058f 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -17,6 +17,8 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB)
@@ -33,3 +35,9 @@ kdb5_destroy: kdb5_destroy.o $(DEPLIBS)
 install::
 	$(INSTALLPROG) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy
 	$(INSTALLPROG) kdb5_destroy.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_destroy.$(ADMIN_MANSUFFIX)
+
+clean::
+	$(RM) $(OBJS)
+
+clean::
+	$(RM) kdb5_destroy
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 2cf8ec3..f07d427 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -18,6 +18,8 @@ SSLIB=$(BUILDTOP)/util/ss/libss.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(SSLIB) $(COMERRLIB) $(DBMLIB)
@@ -48,3 +50,10 @@ clean::
 
 depend:: kdb5_ed_ct.c
 
+clean::
+	$(RM) $(OBJS)
+
+clean::
+	$(RM) kdb5_edit
+
+
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index f246af4..1f8f093 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -17,6 +17,8 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB)
@@ -33,3 +35,9 @@ kdb5_stash: kdb5_stash.o $(DEPLIBS)
 install::
 	$(INSTALLPROG) kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash
 	$(INSTALLPROG) kdb5_stash.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_stash.$(ADMIN_MANSUFFIX)
+
+clean::
+	$(RM) $(OBJS)
+
+clean::
+	$(RM) kdb5_stash
diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in
index 953e283..b699cf4 100644
--- a/src/kadmin/client/Makefile.in
+++ b/src/kadmin/client/Makefile.in
@@ -18,6 +18,8 @@ SSLIB=$(BUILDTOP)/util/ss/libss.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(SSLIB) $(COMERRLIB) $(DBMLIB)
@@ -60,4 +62,8 @@ install::
 	$(INSTALLPROG) kadmin.M ${DESTDIR}$(CLIENT_MANDIR)/kadmin.$(CLIENT_MANSUFFIX)
 
 clean::
+	$(RM) kadmin
+
+clean::
+	$(RM) $(OBJS)
 
diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index 2bbeb91..c39ee1e 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -18,6 +18,8 @@ SSLIB=$(BUILDTOP)/util/ss/libss.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
+RM = rm -f
+
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(SSLIB) $(COMERRLIB) $(DBMLIB)
@@ -44,5 +46,8 @@ install::
 	$(INSTALLPROG) kpasswd.M ${DESTDIR}$(CLIENT_MANDIR)/kpasswd.$(CLIENT_MANSUFFIX)
 
 clean::
+	$(RM) kpasswd
 
+clean::
+	$(RM) $(OBJS)
 
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index ed41438..941295c 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -79,3 +79,6 @@ install::
 clean::
 	$(RM) kdc5_err.h kdc5_err.c
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index cefa8eb..b69dd1c 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -28,3 +28,7 @@ SRCS=	$(srcdir)/crc.c $(srcdir)/crctest.c
 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 c9d97b2..6158a10 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -85,3 +85,6 @@ 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 e8e9e2c..40f0150 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -26,3 +26,6 @@ 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 44a56bb..7f62e95 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -26,3 +26,6 @@ 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 91bf94c..00ebd43 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -39,3 +39,6 @@ memmove.c: ../../krb5/posix/memmove.c
 
 
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 24ad33b..fe26dc0 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -71,3 +71,7 @@ install:: libdes425.a
 	$(RM) $(KRB5_LIBDIR)/lib/libdes425.a
 	$(CP) libdes425.a $(KRB5_LIBDIR)/lib/libdes425.a
 	$(RANLIB) $(KRB5_LIBDIR)/lib/libdes425.a
+
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 805fc55..ec2221d 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -85,3 +85,6 @@ includes::
 
 depend:: $(ETSRCS)
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index f87692b..75ec3b1 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -106,3 +106,6 @@ depend:: $(ETSRCS)
 
 includes:: 
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 2932b16..4005a37 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -54,3 +54,7 @@ install:: libkdb5.a
 	$(RM) $(KRB5_LIBDIR)/lib/libkdb5.a
 	$(CP) libkdb5.a $(KRB5_LIBDIR)/lib/libkdb5.a
 	$(RANLIB) $(KRB5_LIBDIR)/lib/libkdb5.a
+
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in
index 841915e..97bd914 100644
--- a/src/lib/krb425/Makefile.in
+++ b/src/lib/krb425/Makefile.in
@@ -87,3 +87,7 @@ install:: libkrb425.a
 	$(RM) $(KRB5_LIBDIR)/lib/libkrb425.a
 	$(CP) libkrb425.a $(KRB5_LIBDIR)/lib/libkrb425.a
 	$(RANLIB) $(KRB5_LIBDIR)/lib/libkrb425.a
+
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 5b2918a..4ec0ea1 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -85,3 +85,5 @@ SRCS=	\
 	$(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 ad8b71a..0dffa71 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -37,3 +37,6 @@ SRCS=	\
 	$(srcdir)/ktremove.c	\
 	$(srcdir)/read_servi.c
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index fae8408..d5aa5ac 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -79,3 +79,6 @@ SRCS= \
 	$(srcdir)/ustime.c	\
 	$(srcdir)/write_msg.c
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index bf827c4..71b53a7 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -21,3 +21,6 @@ all:: $(OBJS)
 
 OBJS = @LIBOBJS@
 
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 5c64bc2..e2aa503 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -32,3 +32,7 @@ SRCS=	\
 	$(srcdir)/rc_io.c	\
 	$(srcdir)/rcdef.c	\
 	$(srcdir)/rc_conv.c
+
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index ba7dbe9..0a2ca18 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -52,3 +52,9 @@ install::
 	$(INSTALLPROG) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd
 	$(INSTALLPROG) kpropd.M ${DESTDIR}$(SERVER_MANDIR)/kpropd.$(SERVER_MANSUFFIX)
 
+clean::
+	$(RM) $(OBJS)
+
+clean::
+	$(RM) kprop kpropd
+