improve clean rules

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

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 697f852b70d885b1c8aedb28b7aa572c1b4d68b1..dedbbbf25035b2d4fd643d56c164d3ef11799fd5 100644 (file)
--- 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 479a54fa416b4fcc8c8a8868f50dc22170b7d4b8..f01202a9a59af19170c17997166272b7d0352f83 100644 (file)
--- 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 0cb9513dc10a868465c5698090e0be02520c2a4b..c778c966a3cd19e75415962e3d678753406341ff 100644 (file)
--- 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 1909d4184c4f01c42cd570439b9eff97e6cda472..fb4058fdcf9ca5d221ef63d36a5c1377562d052c 100644 (file)
--- 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 2cf8ec3fd3286ae0866c7bfb3ddb8511ae1d0a67..f07d427621204294108a8f8f43fe283037c0de81 100644 (file)
--- 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 f246af449cd5b97a8a6ab95c20b83828e0a0d225..1f8f0937f04916908bc324676c1a4d8ef266d046 100644 (file)
--- 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 953e28355d4833c9430885ab217542679b968a12..b699cf4bdd4f349fd6ddbaf1351d6403b323d019 100644 (file)
--- 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 2bbeb919e582f75f82383ab7380f2c4740b49361..c39ee1e447fca87d4a32bb43826862b33fd610fb 100644 (file)
--- 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 ed41438b88619e9b4e75513c9781567ea97386c9..941295c81a927b0083c66f2cab7145d3ca5fe4af 100644 (file)
--- 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 cefa8eb4d10db53b2b22a5ca92d63177f5a209e6..b69dd1cf3f317c309f70f368de79ea65de517c6e 100644 (file)
--- 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 c9d97b22cb599597222cffde00fa0030852d61d6..6158a1043e5d5e722ea2303e0e5ccc2833049d27 100644 (file)
--- 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 e8e9e2c6513eb207703d4af6101e38f223cb3367..40f0150b73c3856ef1cc45b452fcb4a7754b9a3f 100644 (file)
--- 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 44a56bb38341a4dfacae9be6620c9dde87d21670..7f62e95e75dde8b232cd22080099cc485953520f 100644 (file)
--- 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 91bf94ce6c19701bb627bae56e75c5fad6f329c5..00ebd435aa4b706bed202db4104103bca12c26f7 100644 (file)
--- 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 24ad33bd6959c498cd51054ceda9d154ec4c158f..fe26dc0fd857d393d2c8f61d979888f14d6ab3bc 100644 (file)
--- 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 805fc55a6bef7467fd3d0e0a4055b0ab65397520..ec2221d4900542063b1655b4488186fdc05b9663 100644 (file)
--- 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 f87692b471ddde73a6ee2691629508664c080ef8..75ec3b164e153925f227066d489ab7aaf84839a0 100644 (file)
--- 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 2932b16af0d567eaa70851df82f49bc67f4f63d8..4005a372c7d77c303bbf18eb27a1d5400e007c1e 100644 (file)
--- 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 841915ec829766828f762aa22a979b609c5a75d1..97bd914cb3cbe8c12a147da76a25d9a47b04eca7 100644 (file)
--- 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 5b2918af7bdb24a50c66647824516b7e4d5e6f38..4ec0ea1b718bd67392dae3cb5334b5d0bd058fb2 100644 (file)
--- 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 ad8b71a8689f8773a4ae32ce507bcd07a4b61d51..0dffa71540ba84924b80005cabe792c149a8498a 100644 (file)
--- 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 fae84086d442ea10f3b6a735c8ba24f41493406a..d5aa5ac7b7ba6a7e6062cc7a0ebae0a4926b0428 100644 (file)
--- 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 bf827c4b194112c57bb3318ca4852bb64ff06b82..71b53a75a42090946438ddc096d638d90e0fc3ba 100644 (file)
--- 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 5c64bc2e0be88904ff3c3645c7eff9dc1abd8bb7..e2aa5034444944ef6a0acabd5f5225917bfdf6a7 100644 (file)
--- 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 ba7dbe96bc0d1a2c1632120db27613bd8a50efef..0a2ca18645ba55ab9f6daa766691d77ec8f6045e 100644 (file)
--- 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
+