From 2a8a12e94bc350457acb632722c3540e22e84776 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Fri, 18 May 2001 02:22:10 +0000 Subject: [PATCH] update-makefiles-for-afsconfig-h-20010517 more updates so afsconfig.h can be included --- src/auth/Makefile | 2 +- src/dir/Makefile | 2 +- src/libafsauthent/Makefile | 2 +- src/ptserver/Makefile | 2 +- src/rx/Makefile | 2 +- src/rxkad/Makefile | 2 +- src/tviced/Makefile | 2 +- src/ubik/Makefile | 2 +- src/usd/Makefile | 2 +- src/viced/Makefile | 3 ++- src/vlserver/Makefile | 2 +- src/vol/Makefile | 2 +- src/volser/Makefile | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/auth/Makefile b/src/auth/Makefile index 2df3698..7621e8c 100644 --- a/src/auth/Makefile +++ b/src/auth/Makefile @@ -18,7 +18,7 @@ OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \ KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o -CFLAGS=-g -I${SRCDIR}include ${XCFLAGS} +CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} LDIRS= LIBS= libauth.a ${DESTDIR}lib/afs/libsys.a \ ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \ diff --git a/src/dir/Makefile b/src/dir/Makefile index 69e9aa3..e28dad7 100644 --- a/src/dir/Makefile +++ b/src/dir/Makefile @@ -13,7 +13,7 @@ KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 -INCDIRS= -I${DESTDIR}include ${XINCLS} +INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} OBJS=buffer.o dir.o salvage.o diff --git a/src/libafsauthent/Makefile b/src/libafsauthent/Makefile index 33be0bc..2fe9f04 100644 --- a/src/libafsauthent/Makefile +++ b/src/libafsauthent/Makefile @@ -12,7 +12,7 @@ COMPONENT=libafsauthent include ../config/Makefile.${SYS_NAME} CC=${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? AUDIT= ../audit diff --git a/src/ptserver/Makefile b/src/ptserver/Makefile index 716f888..7e15f87 100644 --- a/src/ptserver/Makefile +++ b/src/ptserver/Makefile @@ -14,7 +14,7 @@ RXGEN=${SRCDIR}bin/rxgen COMPILE_ET = ${SRCDIR}bin/compile_et MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 -CFLAGS = $(DBUG) -I${SRCDIR}include ${XCFLAGS} +CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} INCLS=${SRCDIR}include/ubik.h \ ${SRCDIR}include/lock.h \ ${SRCDIR}include/lwp.h \ diff --git a/src/rx/Makefile b/src/rx/Makefile index 2a67552..ec83898 100644 --- a/src/rx/Makefile +++ b/src/rx/Makefile @@ -14,7 +14,7 @@ UKERNELDIR = ../libuafs/ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 #CC=pcc -CFLAGS = ${OPTMZ} -I${SRCDIR}include -DRXDEBUG ${XCFLAGS} +CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include -DRXDEBUG ${XCFLAGS} # # Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx). diff --git a/src/rxkad/Makefile b/src/rxkad/Makefile index be08e3d..7d02aa6 100644 --- a/src/rxkad/Makefile +++ b/src/rxkad/Makefile @@ -17,7 +17,7 @@ UKERNELDIR = ../libuafs/ COMPILE_ET = ${SRCDIR}bin/compile_et MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 -CFLAGS = ${OPTMZ} -I${SRCDIR}include ${XCFLAGS} +CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} INCLS= ${SRCDIR}include/rx/rx.h \ ${SRCDIR}include/rx/xdr.h \ rxkad.h diff --git a/src/tviced/Makefile b/src/tviced/Makefile index a7bab2a..5049e95 100644 --- a/src/tviced/Makefile +++ b/src/tviced/Makefile @@ -10,7 +10,7 @@ COMPONENT=tviced include ../config/Makefile.${SYS_NAME} CC=${MT_CC} -INCLUDES=-I. -I.. -I${SRCDIR}include -I${SRCDIR}include/afs +INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${SRCDIR}include -I${SRCDIR}include/afs CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG LDFLAGS=${DBG} ${XLDFLAGS} diff --git a/src/ubik/Makefile b/src/ubik/Makefile index bd16f80..bf24a19 100644 --- a/src/ubik/Makefile +++ b/src/ubik/Makefile @@ -10,7 +10,7 @@ COMPONENT=ubik include ../config/Makefile.${SYS_NAME} MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 -CFLAGS=${OPTMZ} -I./ -I${SRCDIR}include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}include ${XCFLAGS} UKERNELDIR=../libuafs/ LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ diff --git a/src/usd/Makefile b/src/usd/Makefile index fa04852..a6cdad6 100644 --- a/src/usd/Makefile +++ b/src/usd/Makefile @@ -12,7 +12,7 @@ include ../config/Makefile.${SYS_NAME} RXGEN=${SRCDIR}bin/rxgen COMPILE_ET = ${SRCDIR}bin/compile_et -CFLAGS = $(DBG) -I${SRCDIR}include ${XCFLAGS} +CFLAGS = $(DBG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} ##################################################################### # include files diff --git a/src/viced/Makefile b/src/viced/Makefile index d9f42f7..13b38d7 100644 --- a/src/viced/Makefile +++ b/src/viced/Makefile @@ -10,7 +10,8 @@ COMPONENT=viced include ../config/Makefile.${SYS_NAME} DBUG = -g -CFLAGS = -DNINTERFACE ${DBUG} -I. -I${SRCDIR}include -I${SRCDIR}include/afs \ +CFLAGS = -DNINTERFACE ${DBUG} \ + -I${TOP_SRCDIR}/config -I. -I${SRCDIR}include -I${SRCDIR}include/afs \ ${XCFLAGS} ${DBG_DEFS} -DRXDEBUG LDFLAGS = ${DBUG} ${XLDFLAGS} diff --git a/src/vlserver/Makefile b/src/vlserver/Makefile index 7e674c1..62dba44 100644 --- a/src/vlserver/Makefile +++ b/src/vlserver/Makefile @@ -14,7 +14,7 @@ KERNELDIR=../libafs/ UKERNELDIR=../libuafs/ COMPILE_ET = ${SRCDIR}bin/compile_et -CFLAGS = ${DBUG} -I. -I.. -I${SRCDIR}include ${XCFLAGS} +CFLAGS = ${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} INCLS=${SRCDIR}include/ubik.h \ ${SRCDIR}include/lwp.h \ ${SRCDIR}include/lock.h \ diff --git a/src/vol/Makefile b/src/vol/Makefile index 7259209..45fc004 100644 --- a/src/vol/Makefile +++ b/src/vol/Makefile @@ -10,7 +10,7 @@ COMPONENT=vol include ../config/Makefile.${SYS_NAME} include ../config/Makefile.version -INCDIRS= -I. -I${DESTDIR}include ${FSINCLUDES} +INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}include ${FSINCLUDES} LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} LIBS= ${DESTDIR}lib/afs/libcmd.a vlib.a ${SRCDIR}lib/afs/util.a \ diff --git a/src/volser/Makefile b/src/volser/Makefile index fb63eb6..bc6811a 100644 --- a/src/volser/Makefile +++ b/src/volser/Makefile @@ -13,7 +13,7 @@ COMPILE_ET=${SRCDIR}bin/compile_et CFLAGS=${DBG} ${OPTMZ} -I${SRCDIR}include ${XCFLAGS} ${DBG_DEFS} LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS} -INCDIRS= -I${SRCDIR}include/afs -I${SRCDIR}include +INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs -I${SRCDIR}include INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib VINCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \ -- 1.9.4