usr.sbin/afs BSDOBJDIR dependency

[itojun_(_at_)_iijlab_(_dot_)_net]

	the following patch should decrease dependency to BSDOBJDIR.

itojun

? afsd/obj
? fs/obj
? libarla/obj
? libroken/obj
? pts/obj
? vos/obj
? ydr/obj
Index: Applflags.inc
===================================================================
RCS file: /cvs/src/usr.sbin/afs/Applflags.inc,v
retrieving revision 1.3
diff -c -r1.3 Applflags.inc
*** Applflags.inc	1999/04/30 01:59:02	1.3
--- Applflags.inc	1999/12/08 13:45:04
***************
*** 1,8 ****
! LDADD	+= -lkrb -ldes ../libarla/libarla.a -ltermcap ../libroken/libroken.a -lreadline -lcurses -lkafs
! DPADD	+= ../libroken/libroken.a ../libarla/libarla.a ${LIBKRB} ${LIBDES} ${LIBREADLINE} ${LIBTERMCAP} ${LIBCURSES} ${LIBKAFS}
  CFLAGS	+= -I${.CURDIR}/../src/util -I${.CURDIR}/../src/lib/roken \
  	   -I${.CURDIR}/../src/include -I${.CURDIR}/../libroken \
! 	   -I${.CURDIR}/../src/rxdef -I${.CURDIR}/../src/lwp -I../libarla \
  	   -I${.CURDIR}/../src/arlad -I${.CURDIR}/../src \
  	   -I${.CURDIR}/../src/lib/ko -I${.CURDIR}/../src/rxkad \
  	   -I${.CURDIR}/../src/lib/sl -I/usr/include/kerberosIV
--- 1,26 ----
! .if defined(OBJMACHINE)
! OBJDIR= obj.${MACHINE}
! .else
! OBJDIR= obj
! .endif
! LIBROKEN!=	if test -d ${.CURDIR}/../libroken/${OBJDIR}; then \
! 			echo ${.CURDIR}/../libroken/${OBJDIR}/libroken.a; \
! 		else \
! 			echo ${.CURDIR}/../libroken/libroken.a; \
! 		fi
! LIBARLA_OBJDIR!=\
! 		if test -d ${.CURDIR}/../libarla/${OBJDIR}; then \
! 			echo ${.CURDIR}/../libarla/${OBJDIR}; \
! 		else \
! 			echo ${.CURDIR}/../libarla; \
! 		fi
! 
! LDADD	+= -lkrb -ldes ${LIBARLA_OBJDIR}/libarla.a -ltermcap ${LIBROKEN} -lreadline -lcurses -lkafs
! DPADD	+= ${LIBROKEN} ${LIBARLA_OBJDIR}/libarla.a ${LIBKRB} ${LIBDES} ${LIBREADLINE} ${LIBTERMCAP} ${LIBCURSES} ${LIBKAFS}
  CFLAGS	+= -I${.CURDIR}/../src/util -I${.CURDIR}/../src/lib/roken \
  	   -I${.CURDIR}/../src/include -I${.CURDIR}/../libroken \
! 	   -I${.CURDIR}/../src/rxdef -I${.CURDIR}/../src/lwp \
! 	   -I${LIBARLA_OBJDIR} \
  	   -I${.CURDIR}/../src/arlad -I${.CURDIR}/../src \
  	   -I${.CURDIR}/../src/lib/ko -I${.CURDIR}/../src/rxkad \
  	   -I${.CURDIR}/../src/lib/sl -I/usr/include/kerberosIV
Index: libarla/Makefile.ko.inc
===================================================================
RCS file: /cvs/src/usr.sbin/afs/libarla/Makefile.ko.inc,v
retrieving revision 1.2
diff -c -r1.2 Makefile.ko.inc
*** libarla/Makefile.ko.inc	1999/04/30 01:59:02	1.2
--- libarla/Makefile.ko.inc	1999/12/08 13:45:04
***************
*** 6,15 ****
  CLEANFILES	+= sysname.c gensysname
  CFLAGS		+= -I${.CURDIR}/../src/lib/ko
  
  .PATH: ${.CURDIR}/../src/lib/ko
  
  sysname.c: gensysname
  	./gensysname -c > sysname.c
  
  gensysname: gensysname.c
! 	${CC} ${CFLAGS} -o gensysname ${.CURDIR}/../src/lib/ko/gensysname.c ../libroken/libroken.a
--- 6,26 ----
  CLEANFILES	+= sysname.c gensysname
  CFLAGS		+= -I${.CURDIR}/../src/lib/ko
  
+ .if defined(OBJMACHINE)
+ OBJDIR= obj.${MACHINE}
+ .else
+ OBJDIR= obj
+ .endif
+ LIBROKEN!=	if test -d ${.CURDIR}/../libroken/${OBJDIR}; then \
+ 			echo ${.CURDIR}/../libroken/${OBJDIR}/libroken.a; \
+ 		else \
+ 			echo ${.CURDIR}/../libroken/libroken.a; \
+ 		fi
+ 
  .PATH: ${.CURDIR}/../src/lib/ko
  
  sysname.c: gensysname
  	./gensysname -c > sysname.c
  
  gensysname: gensysname.c
! 	${CC} ${CFLAGS} -o gensysname ${.CURDIR}/../src/lib/ko/gensysname.c ${LIBROKEN}
Index: libarla/Makefile.rxdef.inc
===================================================================
RCS file: /cvs/src/usr.sbin/afs/libarla/Makefile.rxdef.inc,v
retrieving revision 1.2
diff -c -r1.2 Makefile.rxdef.inc
*** libarla/Makefile.rxdef.inc	1999/04/30 01:59:02	1.2
--- libarla/Makefile.rxdef.inc	1999/12/08 13:45:04
***************
*** 13,19 ****
  
  CFLAGS		+= -I${.CURDIR}/../src/rxdef -I${.CURDIR}/../src/arlad
  
! YDR		= ../ydr/ydr
  YDRFLAGS	= -I${.CURDIR}
  .PATH: ${.CURDIR}/../src/rxdef
  
--- 13,28 ----
  
  CFLAGS		+= -I${.CURDIR}/../src/rxdef -I${.CURDIR}/../src/arlad
  
! .if defined(OBJMACHINE)
! OBJDIR= obj.${MACHINE}
! .else
! OBJDIR= obj
! .endif
! YDR		!= if test -d ${.CURDIR}/../ydr/$(OBJDIR); then \
! 			echo ${.CURDIR}/../ydr/$(OBJDIR)/ydr; \
! 		else \
! 			echo ${.CURDIR}/../ydr/ydr; \
! 		fi
  YDRFLAGS	= -I${.CURDIR}
  .PATH: ${.CURDIR}/../src/rxdef
  
Index: ydr/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/afs/ydr/Makefile,v
retrieving revision 1.3
diff -c -r1.3 Makefile
*** ydr/Makefile	1999/05/26 13:52:58	1.3
--- ydr/Makefile	1999/12/08 13:45:07
***************
*** 7,14 ****
  MAN		=
  BINDIR		= ${DESTDIR}/usr/bin
  PROG		= ydr
! LDADD		+= ../libroken/libroken.a
! DPADD		+= ../libroken/libroken.a
  
  .PATH:	${.CURDIR}/../src/ydr
  
--- 7,25 ----
  MAN		=
  BINDIR		= ${DESTDIR}/usr/bin
  PROG		= ydr
! 
! .if defined(OBJMACHINE)
! OBJDIR= obj.${MACHINE}
! .else
! OBJDIR= obj
! .endif
! LIBROKEN!=	if test -d ${.CURDIR}/../libroken/${OBJDIR}; then \
! 			echo ${.CURDIR}/../libroken/${OBJDIR}/libroken.a; \
! 		else \
! 			echo ${.CURDIR}/../libroken/libroken.a; \
! 		fi
! LDADD		+= ${LIBROKEN}
! DPADD		+= ${LIBROKEN}
  
  .PATH:	${.CURDIR}/../src/ydr