objdir-build-cleanup-20030808

FIXES 1833

so objdir builds can work on aix

diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in
index 99a7d38..07bfbc2 100644 (file)
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@@ -194,13 +194,13 @@ osi_assem.s: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_assem32.s $(TOP_SRCDIR)/afs/$
 
 
 # Build rules for iauth objects.
-afs_call_iauth.o:      $(AFS)/afs_call.c
+afs_call_iauth.o:      $(TOP_SRCDIR)/afs/afs_call.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o
-afs_nfsclnt_iauth.o:   $(AFS)/afs_nfsclnt.c
+afs_nfsclnt_iauth.o:   $(TOP_SRCDIR)/afs/afs_nfsclnt.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o
-afs_pioctl_iauth.o:    $(AFS)/afs_pioctl.c
+afs_pioctl_iauth.o:    $(TOP_SRCDIR)/afs/afs_pioctl.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o
-osi_vfsops_iauth.o: $(AFS)/osi_vfsops.c
+osi_vfsops_iauth.o: $(TOP_SRCDIR)/afs/osi_vfsops.c
        $(CRULE1) -DAFS_NONFSTRANS  -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o
-osi_vnodeops_iauth.o:  $(AFS)/osi_vnodeops.c
+osi_vnodeops_iauth.o:  $(TOP_SRCDIR)/afs/osi_vnodeops.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index fe1a4ab..1521b77 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -13,7 +13,7 @@ BUTMLIBS    =libbutm.a
 BUTMINCLS   =${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
 
 CC      = ${MT_CC}
-CFLAGS  = ${COMMON_CFLAGS} -I${TOP_SRCDIR}/volser ${MT_CFLAGS} @XBSA_CFLAGS@ -I../bucoord -I../volser
+CFLAGS  = ${COMMON_CFLAGS} -I${TOP_SRCDIR}/volser ${MT_CFLAGS} @XBSA_CFLAGS@ -I${BUCOORD} -I${VOLSER} -I../bucoord -I../volser
 
 LWP     = ${srcdir}/../lwp
 BUTM    = ${srcdir}/../butm