Fix make clean and make distclean

Fix these make targets so they actually clean the tree. Reorder the list
of file deletions in distclean so that it exactly mirrors the creation
order in configure.in, which should hopefully make it easier to keep
this all in sync in future. Add all of the missing files in packaging,
and the shared library build tools, to this list.

Make kauth and vol clean remove ka-forwarder and fssync-debug,
respectively.

Change-Id: Iae13419f1cb21058882c0b0e0c283e3c947e33c9
Reviewed-on: http://gerrit.openafs.org/1829
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/Makefile.in b/Makefile.in
index d0ef3bea09f3716a23844a482645428f17ed2c93..758e5d7bd88262082252998e208d6f5467567d09 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -745,18 +745,19 @@ distclean: clean
        /bin/rm -rf lib include
        /bin/rm -f config.log config.cache config.status \
        src/config/afsconfig.h src/config/stamp-h1 \
+       src/libafs/Makefile \
+       src/libuafs/Makefile \
        Makefile \
        src/afs/Makefile \
        src/afsd/Makefile \
-       src/afsd/afs.ppc_darwin.plist \
        src/afsmonitor/Makefile \
        src/afsweb/Makefile \
        src/aklog/Makefile \
        src/audit/Makefile \
-       src/auth/test/Makefile \
        src/auth/Makefile \
-       src/bozo/test/Makefile \
+       src/auth/test/Makefile \
        src/bozo/Makefile \
+       src/bozo/test/Makefile \
        src/bu_utils/Makefile \
        src/bubasics/Makefile \
        src/bucoord/Makefile \
@@ -764,53 +765,62 @@ distclean: clean
        src/tbudb/Makefile \
        src/butc/Makefile \
        src/butm/Makefile \
-       src/cmd/test/Makefile \
        src/cmd/Makefile \
-       src/comerr/test/Makefile \
+       src/cmd/test/Makefile \
        src/comerr/Makefile \
+       src/comerr/test/Makefile \
        src/config/Makefile \
+       src/config/Makefile.config \
        src/config/Makefile.version \
+       src/config/Makefile.version-CML \
        src/config/Makefile.version-NOCML \
-       src/config/Makefile.config \
-       src/des/test/Makefile \
+       src/config/shlib-build \
+       src/config/shlib-install \
        src/des/Makefile \
-       src/dir/test/Makefile \
+       src/des/test/Makefile \
        src/dir/Makefile \
+       src/dir/test/Makefile \
        src/export/Makefile \
        src/finale/Makefile \
        src/fsint/Makefile \
        src/fsprobe/Makefile \
        src/gtx/Makefile \
-       src/kauth/test/Makefile \
+       src/JAVA/libjafs/Makefile \
        src/kauth/Makefile \
+       src/kauth/test/Makefile \
        src/kopenafs/Makefile \
-       src/libacl/test/Makefile \
        src/libacl/Makefile \
-       src/libadmin/adminutil/Makefile \
+       src/libacl/test/Makefile \
        src/libadmin/Makefile \
+       src/libadmin/adminutil/Makefile \
        src/libadmin/bos/Makefile \
-       src/libadmin/cfg/test/Makefile \
        src/libadmin/cfg/Makefile \
+       src/libadmin/cfg/test/Makefile \
        src/libadmin/client/Makefile \
        src/libadmin/kas/Makefile \
        src/libadmin/pts/Makefile \
        src/libadmin/samples/Makefile \
        src/libadmin/test/Makefile \
        src/libadmin/vos/Makefile \
-       src/JAVA/libjafs/Makefile \
-       src/libafs/Makefile \
        src/libafs/Makefile.common \
        src/libafs/MakefileProto.${MKAFS_OSTYPE} \
-       src/libafs/afs.${MKAFS_OSTYPE}.plist \
+       ${DARWIN_PLIST} \
        src/libafsauthent/Makefile \
        src/libafsrpc/Makefile \
-       src/libuafs/Makefile \
        src/libuafs/Makefile.common \
        src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
-       src/log/test/Makefile \
        src/log/Makefile \
-       src/lwp/test/Makefile \
+       src/log/test/Makefile \
        src/lwp/Makefile \
+       src/lwp/test/Makefile \
+       src/packaging/Debian/changelog \
+       src/packaging/MacOS/OpenAFS-debug.Description.plist \
+       src/packaging/MacOS/OpenAFS-debug.Info.plist \
+       src/packaging/MacOS/OpenAFS.Description.plist \
+       src/packaging/MacOS/OpenAFS.Info.plist \
+       src/packaging/MacOS/OpenAFS.info \
+       src/packaging/MacOS/buildpkg.sh \
+       src/packaging/RedHat/openafs.spec \
        src/pam/Makefile \
        src/platform/Makefile \
        src/platform/${MKAFS_OSTYPE}/Makefile \
@@ -834,7 +844,6 @@ distclean: clean
        src/sgistuff/Makefile \
        src/shlibafsauthent/Makefile \
        src/shlibafsrpc/Makefile \
-       src/sia/Makefile \
        src/sys/Makefile \
        src/tbutc/Makefile \
        src/tests/Makefile \
@@ -846,13 +855,13 @@ distclean: clean
        src/ubik/Makefile \
        src/tubik/Makefile \
        src/update/Makefile \
-       src/usd/test/Makefile \
        src/usd/Makefile \
+       src/usd/test/Makefile \
        src/uss/Makefile \
        src/util/Makefile \
        src/util/test/Makefile \
-       src/venus/test/Makefile \
        src/venus/Makefile \
+       src/venus/test/Makefile \
        src/vfsck/Makefile \
        src/viced/Makefile \
        src/vlserver/Makefile \

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 4c7d1b54669230a5bc8957f8bff32d69569332cc..ae28340b1fda932c6c4fb55778f619fa7c46f06c 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -304,7 +304,9 @@ dest: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
 clean:
        $(RM) -f *.o *.a *.xdr.c *.cs.c *.ss.c core \
                kaserver kas klog multiklog kpasswd klogin rebuild \
-               kauth.h kautils.h kaerrors.c kpwvalid AFS_component_version_number.c \
+               ka-forwarder \
+               kauth.h kautils.h kaerrors.c kpwvalid \
+               AFS_component_version_number.c \
                klog.krb knfs klogin.krb kdb Kkauth.h
 
 include ../config/Makefile.version

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 1afeabd564f529c351dea5d4f332a1381f6a82d1..6d184356b426dd0b2c76dc06668f89793b7a405b 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -239,7 +239,7 @@ xfs_size_check: xfs_size_check.c
 #
 clean:
        $(RM) -f *.o *.a AFS_component_version_number.c
-       $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi
+       $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fssync-debug
 
 test:
        cd test; $(MAKE)