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 69d301123088c0d7b89786033ef454443b68be2f..bd04aaef707b917023963004ba7d3768abbb2460 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 1b25891349141dc4b33a186842de9779360ec2ba..d70d52375972c38298fd235f3b38727306670dec 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 56897e05e817dcd8ea1e450554414babfed92989..9b930a8c642cc6677c837a6cb4df9edb3d242364 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 2d4ed95d68247b7119e174b0dc3424526c058eb0..73cfb5785ca8187c7af8d92c2ff4ec41911c1877 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 07759f6e4d4edc7df54dc6ff2dfeb99881d51e05..7162deb7ba5ea7bd4c9b746ecabcf5169e9b6b65 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 d52ce7d87516e27b19c0bf068833d3941bef521a..5a43750c94cde75f2cf1bd98e786fc2b8086e364 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 9049f8496b8ea25bb17ad334818a44bef15c0b7b..3f24b4f1e2dbd6425d5b2a02823ad8f90cda097d 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 c5e84a810f2a011f4a404600d2ccc9aa63ba3c40..e23af76890b5c6d0acae6723c8c3985514adf89d 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 1c7847d0f46e3fcc18cd79adf40d6aebf4da8b4f..6f77eff13fcc4675036f6d3a5bf4b192b4ab9457 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 c57974a28ffb99796f566c72b16ca39d4d9304e2..ef62b29d075616e58c35be900984380752d91e9a 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 df8d0a1095da3549659401c22538f02e346080d6..ff5654db02258589f574e65100b5c336928b4043 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 e11103f0f7e077be7b58bf1427c2082685a8b577..f5072413d39136bd30ecb97060039ec7e5c962d6 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 fcac0571d3b1dd45b1647b77531bd914b9d82c5e..e6cb8f37211c4f6a91a266b4b2292945631157c4 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 d493755b2e37ce573d8cc2e9534f935989b74b82..5086f2dcc5d181323f6e919bbfa431523cbd8a7c 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 22738350fdfd597733dff76072a41c053aba8e9d..136c2b89e72f219ca626d824ffc59517691d8f56 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 66b06d07d4098381f3fc6f69483b5c764f90d1bb..9f9aae97bfaf78c4d2d0f16008502bce97b9612a 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 b2523c0ee2d10b542244a8bed609cd65967a1784..02ac4d75390b065849c7a7ca7fdccf3290f847ad 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 43875f359fc864d47d5d0acf4d4fc29edc207b72..3127fc50d7c0735e65308e8f5b63d6113eb95949 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