makefile-cleanup-remove-extraneous-semicolons-and-other-unused-bits-20010910

rationalize away some more crap

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index bcef968..04d8ba6 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -61,13 +61,13 @@ ktc.krb.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
 
 libauth.a: $(OBJS) AFS_component_version_number.o
        -$(RM) -f libauth.a
-       ar rv libauth.a $(OBJS) AFS_component_version_number.o
+       $(AR) crv $@ $(OBJS) AFS_component_version_number.o
        $(RANLIB) libauth.a
 
 libauth.krb.a: $(KOBJS) AFS_component_version_number.o
-       -$(RM) -f libauth.krb.a
-       ar rv libauth.krb.a $(KOBJS) AFS_component_version_number.o
-       $(RANLIB) libauth.krb.a
+       -$(RM) -f $@
+       $(AR) crv $@ $(KOBJS) AFS_component_version_number.o
+       $(RANLIB) $@
 
 copyauth: copyauth.o
        $(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS}

diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in
index fc01361..ce29b96 100644 (file)
--- a/src/cmd/test/Makefile.in
+++ b/src/cmd/test/Makefile.in
@@ -12,14 +12,12 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-
-BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. L${BACKDIR}/lib -L${BACKDIR}/lib/afs
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
 LIBS=-lcmd -lcom_err -lafsutil
 
-INCDIRS=  -I${SRCDIR}/include -I${SRCDIR}/include/afs -I.. -I${BACKDIR}/include -I${BACKDIR}/include/afs
+INCDIRS=  -I${SRCDIR}/include -I${SRCDIR}/include/afs -I..
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
 

diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
index 5a36263..1e57db5 100644 (file)
--- a/src/config/Makefile.version-NOCML.in
+++ b/src/config/Makefile.version-NOCML.in
@@ -11,5 +11,5 @@ VERSION=@VERSION@
 AFS_component_version_number.o: AFS_component_version_number.c
 
 AFS_component_version_number.c: 
-       echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
-       echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c;
+       echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c
+       echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c

diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in
index 970aef4..cc27fee 100644 (file)
--- a/src/dir/Makefile.in
+++ b/src/dir/Makefile.in
@@ -44,9 +44,9 @@ cmdall: all test
 all: kinstall ukinstall ${TOP_LIBDIR}/libdir.a ${TOP_INCDIR}/afs/dir.h
 
 libdir.a: ${OBJS} AFS_component_version_number.o
-       $(RM) -f libdir.a
-       ar rv libdir.a $(OBJS) AFS_component_version_number.o
-       $(RANLIB) libdir.a
+       $(RM) -f $@
+       $(AR) crv $@ $(OBJS) AFS_component_version_number.o
+       $(RANLIB) $@
 
 kinstall:
        ${INSTALL} dir.h ${KERNELDIR}/afs

diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in
index 956ed6d..3f6865f 100644 (file)
--- a/src/gtx/Makefile.in
+++ b/src/gtx/Makefile.in
@@ -173,7 +173,7 @@ object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS}
 #
 libgtx.a: ${LIBOBJS} AFS_component_version_number.o
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS} AFS_component_version_number.o
+       $(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o
        ${RANLIB} $@
 
 install: libgtx.a

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index d8d9548..d30fc49 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -129,15 +129,15 @@ Kkauth.h: kauth.rg
        ${RXGEN} -x -k -h -o Kkauth.h kauth.rg
 
 libkauth.a: $(OBJS) AFS_component_version_number.o
-       -$(RM) -f libkauth.a
-       ar rv libkauth.a $(OBJS) AFS_component_version_number.o
-       $(RANLIB) libkauth.a
+       -$(RM) -f $@
+       $(AR) crv $@ $(OBJS) AFS_component_version_number.o
+       $(RANLIB) $@
 
 
 libkauth.krb.a: $(KOBJS) AFS_component_version_number.o
-       -$(RM) -f libkauth.krb.a
-       ar rv libkauth.krb.a $(KOBJS) AFS_component_version_number.o
-       $(RANLIB) libkauth.krb.a
+       -$(RM) -f $@
+       $(AR) crv $@ $(KOBJS) AFS_component_version_number.o
+       $(RANLIB) $@
 
 
 read_passwd.o: read_passwd.c

diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in
index e05ae53..016a3ee 100644 (file)
--- a/src/kauth/test/Makefile.in
+++ b/src/kauth/test/Makefile.in
@@ -10,13 +10,10 @@ SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
-
-
-BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
-LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs
+INCDIRS= -I${DESTDIR}/include -I..
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
 LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}

diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in
index 30dfdfd..08371f6 100644 (file)
--- a/src/libacl/Makefile.in
+++ b/src/libacl/Makefile.in
@@ -41,10 +41,10 @@ include ../config/Makefile.version
 
 all: kinstall ukinstall ${TOP_LIBDIR}/libacl.a ${TOP_INCDIR}/afs/acl.h ${TOP_INCDIR}/afs/prs_fs.h
 
-libacl.a: $(LIBOBJS)  AFS_component_version_number.o
-       $(RM) -f libacl.a
-       ar rv libacl.a $(LIBOBJS) AFS_component_version_number.o
-       $(RANLIB) libacl.a
+libacl.a: $(LIBOBJS) AFS_component_version_number.o
+       $(RM) -f $@
+       $(AR) crv $@ $(LIBOBJS) AFS_component_version_number.o
+       $(RANLIB) $@
 
 aclprocs.o: aclprocs.c acl.h
 

diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in
index 495119b..8f9dc88 100644 (file)
--- a/src/libadmin/adminutil/Makefile.in
+++ b/src/libadmin/adminutil/Makefile.in
@@ -138,7 +138,7 @@ ${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h
 
 libafsadminutil.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 afs_utilAdmin.o: afs_utilAdmin.h

diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in
index fd7edeb..38e9cce 100644 (file)
--- a/src/libadmin/bos/Makefile.in
+++ b/src/libadmin/bos/Makefile.in
@@ -67,7 +67,7 @@ ${DESTDIR}${libdir}/afs/libbosadmin.a: libbosadmin.a
 
 libbosadmin.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 afs_bosAdmin.o: afs_bosAdmin.h

diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in
index 3654d18..adbd6af 100644 (file)
--- a/src/libadmin/cfg/Makefile.in
+++ b/src/libadmin/cfg/Makefile.in
@@ -72,7 +72,7 @@ ${DEST}/lib/afs/libcfgadmin.a: libcfgadmin.a
 
 libcfgadmin.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 UBIKDIR=../../ubik

diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in
index a81c1ef..bd0865a 100644 (file)
--- a/src/libadmin/client/Makefile.in
+++ b/src/libadmin/client/Makefile.in
@@ -60,7 +60,7 @@ ${DEST}/lib/afs/libclientadmin.a: libclientadmin.a
 
 libclientadmin.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 afs_clientAdmin.o: afs_clientAdmin.h

diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in
index 4bb527e..7bb794b 100644 (file)
--- a/src/libadmin/kas/Makefile.in
+++ b/src/libadmin/kas/Makefile.in
@@ -68,19 +68,19 @@ ${DEST}/lib/afs/libkasadmin.a: libkasadmin.a
 
 libkasadmin.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 afs_kasAdmin.o: afs_kasAdmin.h
 
 kauth.cs.o: ${KAUTH}/kauth.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 kauth.xdr.o: ${KAUTH}/kauth.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 kaaux.o: ${KAUTH}/kaaux.c
-       ${CCRULE};
+       ${CCRULE}
 
 clean:
        $(RM) -f *.o libkasadmin*

diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in
index 390a9e7..256b0c4 100644 (file)
--- a/src/libadmin/pts/Makefile.in
+++ b/src/libadmin/pts/Makefile.in
@@ -68,16 +68,16 @@ ${DEST}/lib/afs/libptsadmin.a: libptsadmin.a
 
 libptsadmin.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 afs_ptsAdmin.o: afs_ptsAdmin.h
 
 ptint.xdr.o: ${PTSERVER}/ptint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 ptint.cs.o: ${PTSERVER}/ptint.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 clean:
        $(RM) -f *.o libptsadmin*

diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in
index 5746b82..5e0bdad 100644 (file)
--- a/src/libadmin/vos/Makefile.in
+++ b/src/libadmin/vos/Makefile.in
@@ -85,28 +85,28 @@ ${DEST}/lib/afs/libvosadmin.a: libvosadmin.a
 
 libvosadmin.a: ${LIBOBJS}
        -$(RM) -f $@
-       ar rv $@ ${LIBOBJS}
+       $(AR) crv $@ ${LIBOBJS}
        ${RANLIB} $@
 
 afs_vosAdmin.o: afs_vosAdmin.h
 
 vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 volint.xdr.o: ${VOLSER}/volint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 volint.cs.o: ${VOLSER}/volint.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 afsint.xdr.o: ${FSINT}/afsint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 clean:
        $(RM) -f *.o libvosadmin*

diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common
index 31646c3..dc869c2 100644 (file)
--- a/src/libafs/Makefile.common
+++ b/src/libafs/Makefile.common
@@ -9,19 +9,9 @@
 #
 SHELL=/bin/sh
 INCLUDE= -I.  -I/usr/include -I${TOP_SRCDIR}/config
-Aobj=COMMON
-Dobj=DYNEL
-Cobj=CLIENT
-Sobj=SERVER
-Nobj=COMMON_NONFS
-Xobj=COMMON_NFS11
-NDobj=DYNEL_NONFS
 AFS    =../afs
-ADIR   =../dir
 RX     =../rx
 AFSINT =../afsint
-DKLOAD =../dkload
-
 
 # Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
 .c.i:

diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in
index e723185..7f33a94 100644 (file)
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@@ -158,45 +158,45 @@ dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH)
 # Object build rules:
 # Common objects
 xdr.o: $(RX)/xdr.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
+       $(CRULE1)
 
 xdr_array.o: $(RX)/xdr_array.c
-       $(CRULE1);
+       $(CRULE1)
 
 osi_assem.o:   ${AFS}/osi_assem.s
        ${AS} -o osi_assem.o ${AFS}/osi_assem.s
 osi_config.o: $(AFS)/osi_config.c
-       $(CRULE1);
+       $(CRULE1)
 osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
+       $(CRULE1)
 osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1);
+       $(CRULE1)
 osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1);
+       $(CRULE1)
 osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1);
+       $(CRULE1)
 osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1);
+       $(CRULE1)
 osi_timeout.o: $(AFS)/osi_timeout.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
+       $(CRULE1)
 
 
 # Build rules for iauth objects.
 afs_call_iauth.o:      $(AFS)/afs_call.c
-       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o;
+       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o
 afs_nfsclnt_iauth.o:   $(AFS)/afs_nfsclnt.c
-       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o;
+       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o
 afs_pioctl_iauth.o:    $(AFS)/afs_pioctl.c
-       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o;
+       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o
 osi_vfsops_iauth.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS  -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o;
+       $(CRULE1) -DAFS_NONFSTRANS  -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o
 osi_vnodeops_iauth.o:  $(AFS)/osi_vnodeops.c
-       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o;
+       $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index 59396e0..16b4e0d 100644 (file)
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -139,8 +139,8 @@ osi_vnodeops.o: $(AFS)/osi_vnodeops.c
 osi_module.o: $(AFS)/osi_module.c
        $(CRULE1)
 xdr.o: $(RX)/xdr.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_array.o: $(RX)/xdr_array.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
+       $(CRULE1)

diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in
index a712b12..c2e0403 100644 (file)
--- a/src/libafs/MakefileProto.IRIX.in
+++ b/src/libafs/MakefileProto.IRIX.in
@@ -478,26 +478,26 @@ dest_LINKFILES:
 # Object build rules:
 # Common objects
 afs_base64.o: $(AFS)/afs_base64.c
-       $(CRULE1);
+       $(CRULE1)
 osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
+       $(CRULE1)
 osi_idbg.o: $(AFS)/osi_idbg.c
-       $(CRULE1);
+       $(CRULE1)
 osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1);
+       $(CRULE1)
 osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1);
+       $(CRULE1)
 osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1);
+       $(CRULE1)
 osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o;
+       $(CRULE1) -o osi_vfsops_nfs.o
 osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS;
+       $(CRULE1) -DAFS_NONFSTRANS
 osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
+       $(CRULE1)

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 99b4589..9d60786 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -224,30 +224,30 @@ $(DEST_LIBAFS_MP): $(LIBAFS_MP)
 
 # Linux specific objects
 osi_alloc.o: $(AFS)/osi_alloc.c
-       $(CRULE1);
+       $(CRULE1)
 osi_cred.o: $(AFS)/osi_cred.c
-       $(CRULE1);
+       $(CRULE1)
 osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
+       $(CRULE1)
 osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1);
+       $(CRULE1)
 osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1);
+       $(CRULE1)
 osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1);
+       $(CRULE1)
 osi_module.o: $(AFS)/osi_module.c
-       $(CRULE1);
+       $(CRULE1)
 osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
+       $(CRULE1)
 xdr.o: $(RX)/xdr.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_array.o: $(RX)/xdr_array.c
-       $(CRULE1);
+       $(CRULE1)

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index d0feffa..a6dee29 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -183,20 +183,20 @@ dest_libafs: ${LIBAFSNONFS}
 
 # Solaris specific objects
 osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
+       $(CRULE1)
 osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1);
+       $(CRULE1)
 osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1);
+       $(CRULE1)
 osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o;
+       $(CRULE1) -o osi_vfsops_nfs.o
 osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS;
+       $(CRULE1) -DAFS_NONFSTRANS
 osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
+       $(CRULE1)

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 8e502b4..d894f06 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -145,97 +145,97 @@ libafsrpc.a: ${LIBOBJS}
         esac
 
 rx_event.o: ${RX}/rx_event.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_user.o: ${RX}/rx_user.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_pthread.o: ${RX}/rx_pthread.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx.o: ${RX}/rx.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_conncache.o: ${RX}/rx_conncache.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_null.o: ${RX}/rx_null.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_globals.o: ${RX}/rx_globals.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_getaddr.o: ${RX}/rx_getaddr.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_misc.o: ${RX}/rx_misc.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_packet.o: ${RX}/rx_packet.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_rdwr.o: ${RX}/rx_rdwr.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_trace.o: ${RX}/rx_trace.c
-       ${CCRULE};
+       ${CCRULE}
 
 rx_multi.o: ${RX}/rx_multi.c
-       ${CCRULE};
+       ${CCRULE}
 
 rxkad_client.o: ${RXKAD}/rxkad_client.c
-       ${CCRULE};
+       ${CCRULE}
 
 rxkad_server.o: ${RXKAD}/rxkad_server.c
-       ${CCRULE};
+       ${CCRULE}
 
 rxkad_common.o: ${RXKAD}/rxkad_common.c
-       ${CCRULE};
+       ${CCRULE}
 
 ticket.o: ${RXKAD}/ticket.c
-       ${CCRULE};
+       ${CCRULE}
 
 fcrypt.o: ${RXKAD}/fcrypt.c
-       ${CCRULE};
+       ${CCRULE}
 
 crypt_conn.o: ${RXKAD}/crypt_conn.c
-       ${CCRULE};
+       ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr.o: ${RX}/xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_int64.o: ${RX}/xdr_int64.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_array.o: ${RX}/xdr_array.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_arrayn.o: ${RX}/xdr_arrayn.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_float.o: ${RX}/xdr_float.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_mem.o: ${RX}/xdr_mem.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_rec.o: ${RX}/xdr_rec.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_refernce.o: ${RX}/xdr_refernce.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_rx.o: ${RX}/xdr_rx.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_update.o: ${RX}/xdr_update.c
-       ${CCRULE};
+       ${CCRULE}
 
 xdr_afsuuid.o: ${RX}/xdr_afsuuid.c
-       ${CCRULE};
+       ${CCRULE}
 
 # Note that the special case statement for compiling des.c is present
 # simply to work around a compiler bug on HP-UX 11.0.  The symptom of
@@ -276,58 +276,58 @@ des.o: ${DES}/des.c
        esac
 
 crypt.o: ${DES}/crypt.c
-       ${CCRULE};
+       ${CCRULE}
 
 cbc_encrypt.o: ${DES}/cbc_encrypt.c
-       ${CCRULE};
+       ${CCRULE}
 
 pcbc_encrypt.o: ${DES}/pcbc_encrypt.c
-       ${CCRULE};
+       ${CCRULE}
 
 cksum.o: ${DES}/cksum.c
-       ${CCRULE};
+       ${CCRULE}
 
 new_rnd_key.o: ${DES}/new_rnd_key.c
-       ${CCRULE};
+       ${CCRULE}
 
 key_sched.o: ${DES}/key_sched.c
-       ${CCRULE};
+       ${CCRULE}
 
 debug_decl.o: ${DES}/debug_decl.c
-       ${CCRULE};
+       ${CCRULE}
 
 quad_cksum.o: ${DES}/quad_cksum.c
-       ${CCRULE};
+       ${CCRULE}
 
 key_parity.o: ${DES}/key_parity.c
-       ${CCRULE};
+       ${CCRULE}
 
 weak_key.o: ${DES}/weak_key.c
-       ${CCRULE};
+       ${CCRULE}
 
 strng_to_key.o: ${DES}/strng_to_key.c
-       ${CCRULE};
+       ${CCRULE}
 
 misc.o: ${DES}/misc.c
-       ${CCRULE};
+       ${CCRULE}
 
 util.o: ${DES}/util.c
-       ${CCRULE};
+       ${CCRULE}
 
 error_msg.o: ${COMERR}/error_msg.c
-       ${CCRULE};
+       ${CCRULE}
 
 et_name.o: ${COMERR}/et_name.c
-       ${CCRULE};
+       ${CCRULE}
 
 com_err.o: ${COMERR}/com_err.c
-       ${CCRULE};
+       ${CCRULE}
 
 casestrcpy.o: ${UTIL}/casestrcpy.c
-       ${CCRULE};
+       ${CCRULE}
 
 base64.o: ${UTIL}/base64.c
-       ${CCRULE};
+       ${CCRULE}
 
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
@@ -350,31 +350,31 @@ syscall.o: ${SYS}/syscall.s
        esac
 
 rxstat.o: ${RXSTAT}/rxstat.c
-       ${CCRULE};
+       ${CCRULE}
 
 rxstat.cs.o: ${RXSTAT}/rxstat.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 rxstat.ss.o: ${RXSTAT}/rxstat.ss.c
-       ${CCRULE};
+       ${CCRULE}
 
 rxstat.xdr.o: ${RXSTAT}/rxstat.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 afsint.cs.o: ${FSINT}/afsint.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 afsint.xdr.o: ${FSINT}/afsint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 afscbint.cs.o: ${FSINT}/afscbint.cs.c
-       ${CCRULE};
+       ${CCRULE}
 
 afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
-       ${CCRULE};
+       ${CCRULE}
 
 afsaux.o: ${FSINT}/afsaux.c
-       ${CCRULE};
+       ${CCRULE}
 
 clean:
        $(RM) -f *.o libafsrpc*

diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index 1a67c6c..967267f 100644 (file)
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -73,13 +73,13 @@ login:      ${OBJS} ${LIBS}
        case ${SYS_NAME} in \
        sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\
        *) ${CC} -g -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
-       esac ;
+       esac 
 
 login.krb: ${KOBJS} ${KLIBS}
        case ${SYS_NAME} in \
        sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\
        *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\
-       esac ;
+       esac 
 
 libutil.a : ${UTILOBJS}
        $(RM) -f $@

diff --git a/src/null/Makefile.in b/src/null/Makefile.in
index deb0b92..298c28c 100644 (file)
--- a/src/null/Makefile.in
+++ b/src/null/Makefile.in
@@ -41,7 +41,7 @@ null.o: null.c AFS_component_version_number.o
 
 libnull.a: null.o
        -$(RM) -f $@
-       ar rv $@ null.o
+       $(AR) crv $@ null.o
        $(RANLIB) $@
 
 clean:

diff --git a/src/rlogind/Makefile.in b/src/rlogind/Makefile.in
index 89f087d..52c819d 100644 (file)
--- a/src/rlogind/Makefile.in
+++ b/src/rlogind/Makefile.in
@@ -69,7 +69,7 @@ rlogind: ${OBJS} ${LIBS} ../login/libutil.a
        hp_ux110) \
                ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -lsec ;; \
        *) ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
-       esac ;
+       esac 
 
 rlogind.o: rlogind.c AFS_component_version_number.c
 
@@ -80,7 +80,7 @@ rexecd: rexecd.o ${ALIBS}
        rs_aix*) \
                ${CC} -o $@ ${CFLAGS} rexecd.o ${ALIBS} ${XLIBS} -ls ;; \
        *) ${CC} -o $@ ${CFLAGS} rexecd.o ${ALIBS} ${XLIBS} ;;\
-       esac ;
+       esac 
 
 
 ../login/libutil.a : ../login/util_login.c ../login/util_logout.c ../login/util_logwtmp.c

diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
index 277dee2..96d5257 100644 (file)
--- a/src/rxkad/test/Makefile.in
+++ b/src/rxkad/test/Makefile.in
@@ -10,12 +10,11 @@ SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
-BACKDIR=../../../../PARENT/dest/
 include ../../config/Makefile.${SYS_NAME}
 
 OPTIMIZE=-g
 
-INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
+INCDIRS= -I${DESTDIR}/include -I..
 
 HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h
 

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 355ad97..d52a873 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -300,7 +300,7 @@ pre:
                else \
                        echo 'Will use XBSA header files from "'$$hdrdir'" (XBSA_HDRDIR)'; \
                fi; \
-       fi;
+       fi
 
 all: butc
 

diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in
index 84b00ee..68a7d21 100644 (file)
--- a/src/usd/test/Makefile.in
+++ b/src/usd/test/Makefile.in
@@ -12,13 +12,12 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
-#include ../../config/Makefile.version
 
 INSTALL=${SRCDIR}/bin/install
 RXGEN=${SRCDIR}/bin/rxgen
 COMPILE_ET = ${SRCDIR}/bin/compile_et
 
-INCDIRS= -I${DESTDIR}/include  -I.. -I${BACKDIR}/include
+INCDIRS= -I${DESTDIR}/include  -I..
 CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS}
 LIBUSD=DEST/lib/afs/libusd.a
 

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 07495f1..5c54456 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -85,9 +85,9 @@ volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a
                ${LDFLAGS} $(LIBS) ${XLIBS}
 
 libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
-       -$(RM) -f libvolser.a
-       ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o 
-       $(RANLIB) libvolser.a
+       -$(RM) -f $@
+       $(AR) crv $@ volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o 
+       $(RANLIB) $@
 
 volser.h volerr.c: volerr.et volser.p.h
        $(RM) -f volser.h volerr.c