libafs-libuafs-makefile-updates-for-afsconfig-20010605

so afsconfig.h inclusion can be done

diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common
index 69d3011..bd04aae 100644 (file)
--- a/src/libafs/Makefile.common
+++ b/src/libafs/Makefile.common
@@ -10,7 +10,7 @@
 SHELL=/bin/sh
 DESTDIR = DEST/
 SRCDIR = DEST/
-INCLUDE= -I.  -I/usr/include
+INCLUDE= -I.  -I/usr/include -I${TOP_SRCDIR}/config
 Aobj=COMMON
 Dobj=DYNEL
 Cobj=CLIENT

diff --git a/src/libafs/MakefileProto.AIX b/src/libafs/MakefileProto.AIX
index 1b25891..d70d523 100644 (file)
--- a/src/libafs/MakefileProto.AIX
+++ b/src/libafs/MakefileProto.AIX
@@ -59,7 +59,7 @@ LDSTUFF= -b"binder:/usr/lib/bind glink:/usr/lib/glink.o" -bnoentry -b h:4 \
 LDFLAGS = -m -eafs_config -bexport:${DESTDIR}/lib/afs/afs.exp ${IMPORTS} \
         -lsys -lcsys 
 
-CFLAGS=-I. -I.. ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 KOBJ = MODLOAD

diff --git a/src/libafs/MakefileProto.DARWIN b/src/libafs/MakefileProto.DARWIN
index 56897e0..9b930a8 100644 (file)
--- a/src/libafs/MakefileProto.DARWIN
+++ b/src/libafs/MakefileProto.DARWIN
@@ -36,7 +36,7 @@ OPTF2=${OPT2}
 KOPTS=-traditional-cpp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
 #CFLAGS=-Werror-implicit-function-declaration -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 #CFLAGS=-framework Kernel -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
-CFLAGS=-I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
 # Name of directory to hold object files and libraries.

diff --git a/src/libafs/MakefileProto.DUX b/src/libafs/MakefileProto.DUX
index 2d4ed95..73cfb57 100644 (file)
--- a/src/libafs/MakefileProto.DUX
+++ b/src/libafs/MakefileProto.DUX
@@ -39,7 +39,7 @@ DBUG = -O2 -g3
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
 # Name of directory to hold object files and libraries.

diff --git a/src/libafs/MakefileProto.FBSD b/src/libafs/MakefileProto.FBSD
index 07759f6..7162deb 100644 (file)
--- a/src/libafs/MakefileProto.FBSD
+++ b/src/libafs/MakefileProto.FBSD
@@ -35,7 +35,7 @@ DBUG = -O2
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
 # Name of directory to hold object files and libraries.

diff --git a/src/libafs/MakefileProto.HPUX b/src/libafs/MakefileProto.HPUX
index d52ce7d..5a43750 100644 (file)
--- a/src/libafs/MakefileProto.HPUX
+++ b/src/libafs/MakefileProto.HPUX
@@ -60,7 +60,7 @@ KDEFS_64 = +DA2.0W +DS2.0 +M2 +W 478,530
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT -DHPONCPLUS
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I../h -I../nfs ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I../h -I../nfs -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 KOBJ=STATIC

diff --git a/src/libafs/MakefileProto.IRIX b/src/libafs/MakefileProto.IRIX
index 9049f84..3f24b4f 100644 (file)
--- a/src/libafs/MakefileProto.IRIX
+++ b/src/libafs/MakefileProto.IRIX
@@ -190,7 +190,7 @@ LDFLAGS_32 = -n32
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) -G 0 $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) -G 0 $(KDEFS) $(KOPTS) ${DBUG}
 
 # This tells Makefile.common to use it's single directory build target.
 #COMPDIRS = single_compdir
@@ -214,13 +214,12 @@ KOBJ = STATIC MODLOAD
 
 
 setup:
-       -rm -f  h net netinet rpc ufs nfs  machine sys sgiefs
+       -rm -f  h net netinet rpc ufs nfs  machine sys 
        -ln -s /usr/include/sys h
        -ln -s /usr/include/net /usr/include/netinet .
        -ln -s /usr/include/rpc /usr/include/sys .
        -ln -s /usr/include/sys/fs .
        -mkdir ${DESTDIR}root.client/bin
-       -mkdir ${DESTDIR}root.client/usr/vice/etc/sgiload
 <all -sgi_65>
        BUILDPROCS="${PROCESSORS}" ; \
        BUILDMPS="${MPS}" ; \

diff --git a/src/libafs/MakefileProto.LINUX b/src/libafs/MakefileProto.LINUX
index c5e84a8..e23af76 100644 (file)
--- a/src/libafs/MakefileProto.LINUX
+++ b/src/libafs/MakefileProto.LINUX
@@ -65,7 +65,7 @@ CCFLAGS =   -O2 -fomit-frame-pointer -fno-strength-reduce \
        -fno-builtin -ffixed-r2
 DEFINES = -D__KERNEL__  -D__powerpc__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
 <all>
-INCLUDES = -I. -I../
+INCLUDES = -I. -I../ -I${TOP_SRCDIR}/config
 
 CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES)
 

diff --git a/src/libafs/MakefileProto.SOLARIS b/src/libafs/MakefileProto.SOLARIS
index 1c7847d..6f77eff 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS
+++ b/src/libafs/MakefileProto.SOLARIS
@@ -40,7 +40,7 @@ KDEFS_32 =
 KDEFS_64 = -xarch=v9
 
 <all>
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 <all -sun4x_57 -sun4x_58>

diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common
index c57974a..ef62b29 100644 (file)
--- a/src/libuafs/Makefile.common
+++ b/src/libuafs/Makefile.common
@@ -9,7 +9,7 @@
 #
 
 SHELL=/bin/sh
-INCLUDE=  -I. -I/usr/include
+INCLUDE=  -I. -I/usr/include -I${TOP_SRCDIR}/config
 UOBJ   =../UAFS
 WEBOBJ =../AFSWEB
 AFS    =../afs

diff --git a/src/libuafs/MakefileProto.AIX b/src/libuafs/MakefileProto.AIX
index df8d0a1..ff5654d 100644 (file)
--- a/src/libuafs/MakefileProto.AIX
+++ b/src/libuafs/MakefileProto.AIX
@@ -14,7 +14,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 # System specific build commands and flags
 DEFINES= -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 AR = /usr/bin/ar
 ARFLAGS = -r
 RANLIB = /bin/ranlib

diff --git a/src/libuafs/MakefileProto.DARWIN b/src/libuafs/MakefileProto.DARWIN
index e11103f..f507241 100644 (file)
--- a/src/libuafs/MakefileProto.DARWIN
+++ b/src/libuafs/MakefileProto.DARWIN
@@ -16,7 +16,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 CC = cc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
 KOPTS=
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.DUX b/src/libuafs/MakefileProto.DUX
index fcac057..e6cb8f3 100644 (file)
--- a/src/libuafs/MakefileProto.DUX
+++ b/src/libuafs/MakefileProto.DUX
@@ -19,7 +19,7 @@ DEFINES=-DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE -D_NO_PROTO -DOSF
 KOPTS=
 DBUG=
 OPTF=-O
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF

diff --git a/src/libuafs/MakefileProto.FBSD b/src/libuafs/MakefileProto.FBSD
index d493755..5086f2d 100644 (file)
--- a/src/libuafs/MakefileProto.FBSD
+++ b/src/libuafs/MakefileProto.FBSD
@@ -11,7 +11,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 CC = gcc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
 KOPTS=
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.HPUX b/src/libuafs/MakefileProto.HPUX
index 2273835..136c2b8 100644 (file)
--- a/src/libuafs/MakefileProto.HPUX
+++ b/src/libuafs/MakefileProto.HPUX
@@ -16,7 +16,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 CC = /opt/ansic/bin/cc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
 KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.IRIX b/src/libuafs/MakefileProto.IRIX
index 66b06d0..9f9aae9 100644 (file)
--- a/src/libuafs/MakefileProto.IRIX
+++ b/src/libuafs/MakefileProto.IRIX
@@ -15,7 +15,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 # System specific build commands and flags
 CC = cc
 DEFINES=-D_SGI_MP_SOURCE -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.LINUX b/src/libuafs/MakefileProto.LINUX
index b2523c0..02ac4d7 100644 (file)
--- a/src/libuafs/MakefileProto.LINUX
+++ b/src/libuafs/MakefileProto.LINUX
@@ -16,7 +16,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 CC = gcc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
 KOPTS=
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.SOLARIS b/src/libuafs/MakefileProto.SOLARIS
index 43875f3..3127fc5 100644 (file)
--- a/src/libuafs/MakefileProto.SOLARIS
+++ b/src/libuafs/MakefileProto.SOLARIS
@@ -16,7 +16,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 # Redundant
 # CC = /opt/SUNWspro/bin/cc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD