Rationalise our include paths

Our include paths are a bit of a mess. Fix these so that they're
more rational, and more in line with normal coding style.

In particular:
   *) Don't include all of the subdirectories of our top level
      include directory. If a file wants afs/file.h, it should
      include that, not "file.h"
   *) Try to avoid including '.' in the search path (although
      objdir builds make this harder)
   *) Don't blindly include other directories from the code tree
      in the search path. If a package wants another packages header,
      then it should get it from the include directory
   *) Use the convention that quoted includes ("") pick up local
      headers. Bracketed includes (<>) pick up ones from the top level
      include dir
   *) In directories which pull in files from multiple packages, don't
      blindly put all of the package directories in the search path.
      Specifically include the file's package directory when required

The big change here is that it's no longer possible to hide a system
include by placing a header of the same name in include/afs. The most
common case where this was happening was for 'assert.h'

Change-Id: I0796fabcf83ffcd74e533624c64e138a160dd632
Reviewed-on: http://gerrit.openafs.org/834
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/Makefile.in b/Makefile.in
index aadb9799fc678cf96e11ccec30406e5463636fa4..cd7046d917b9086ddf3060806d1209277e64de1f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,16 +31,16 @@ COMPILE_PART2  = ${COMPILE_PART2A} ${COMPILE_PART2B}
 COMPILE_CLEAN  = ${COMPILE_PART2A} clean
 COMPILE_DEPINSTALL  = ${COMPILE_PART2A} depinstall
 
-all: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+all: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_LIBDIR}
        $(MAKE) build
 
-all_nolibafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+all_nolibafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_LIBDIR}
        $(MAKE) build TARGET=finale_nolibafs
 
-only_libafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+only_libafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_LIBDIR}
        $(MAKE) build TARGET=libafs
 
-only_libafs_tree: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+only_libafs_tree: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_LIBDIR}
        $(MAKE) build TARGET=libafs_tree
 
 install: all install_dirs
@@ -84,7 +84,7 @@ packages: dest
                echo Not building packages for ${SYS_NAME} ;; \
        esac
 
-${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_LIBDIR} ${TOP_JLIBDIR}:
        mkdir -p $@
 
 install_dirs: force
@@ -123,7 +123,7 @@ config: prelude
 procmgmt: config
        +${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: procmgmt des lwp_depinstall
+util: procmgmt des lwp_depinstall rx_depinstall
        +${COMPILE_PART1} util ${COMPILE_PART2}
 
 audit: util rx rxkad fsint

diff --git a/src/afsmonitor/afsmon-win.c b/src/afsmonitor/afsmon-win.c
index 62d40bbcfdd10c9eebe660e6f84a5605999f0306..946f9a90feebe6b5ebaedb5091efa8f421d6d1d7 100644 (file)
--- a/src/afsmonitor/afsmon-win.c
+++ b/src/afsmonitor/afsmon-win.c
@@ -19,23 +19,23 @@
 #include <stdio.h>
 #include <signal.h>
 #include <math.h>
-#include <cmd.h>
+#include <afs/cmd.h>
 #include <string.h>
 #undef IN
 #include <time.h>
 
-#include <gtxwindows.h>                /*Generic window package */
-#include <gtxobjects.h>                /*Object definitions */
-#include <gtxkeymap.h>
+#include <afs/gtxwindows.h>            /*Generic window package */
+#include <afs/gtxobjects.h>            /*Object definitions */
+#include <afs/gtxkeymap.h>
 #if 0
-#include <gtxtextcb.h>         /*Text object circular buffer interface */
-#include <gtxtextobj.h>                /*Text object interface */
+#include <afs/gtxtextcb.h>             /*Text object circular buffer interface */
+#include <afs/gtxtextobj.h>            /*Text object interface */
 #endif
-#include <gtxlightobj.h>       /*Light object interface */
-#include <gtxcurseswin.h>      /*Curses window package */
-#include <gtxdumbwin.h>                /*Dumb terminal window package */
-#include <gtxX11win.h>         /*X11 window package */
-#include <gtxframe.h>          /*Frame package */
+#include <afs/gtxlightobj.h>   /*Light object interface */
+#include <afs/gtxcurseswin.h>  /*Curses window package */
+#include <afs/gtxdumbwin.h>            /*Dumb terminal window package */
+#include <afs/gtxX11win.h>             /*X11 window package */
+#include <afs/gtxframe.h>              /*Frame package */
 
 #include <afs/xstat_fs.h>
 #include <afs/xstat_cm.h>

diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c
index a8ce63e9b495630c1bbe0a8e987f19064e8facb1..848c44d2cf85e23e3e1f825216ea72770d7c2be0 100644 (file)
--- a/src/afsmonitor/afsmonitor.c
+++ b/src/afsmonitor/afsmonitor.c
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <string.h>
 #include <errno.h>
-#include <cmd.h>
+#include <afs/cmd.h>
 #include <signal.h>
 #undef IN
 #include <sys/types.h>
@@ -32,14 +32,14 @@
 #include <netdb.h>
 #include <ctype.h>
 
-#include <gtxwindows.h>                /*Generic window package */
-#include <gtxobjects.h>                /*Object definitions */
-#include <gtxlightobj.h>       /*Light object interface */
-#include <gtxcurseswin.h>      /*Curses window package */
-#include <gtxdumbwin.h>                /*Dumb terminal window package */
-#include <gtxX11win.h>         /*X11 window package */
-#include <gtxframe.h>          /*Frame package */
-#include <gtxinput.h>
+#include <afs/gtxwindows.h>            /*Generic window package */
+#include <afs/gtxobjects.h>            /*Object definitions */
+#include <afs/gtxlightobj.h>   /*Light object interface */
+#include <afs/gtxcurseswin.h>  /*Curses window package */
+#include <afs/gtxdumbwin.h>            /*Dumb terminal window package */
+#include <afs/gtxX11win.h>             /*X11 window package */
+#include <afs/gtxframe.h>              /*Frame package */
+#include <afs/gtxinput.h>
 
 #include <afs/xstat_fs.h>
 #include <afs/xstat_cm.h>

diff --git a/src/aklog/skipwrap.c b/src/aklog/skipwrap.c
index 6d3723f4da43b4e2f58503cf0a70d2a0096d0b0e..75c63fd63d7a8bfa2f29fbd8f7fcc314d1ea28fe 100644 (file)
--- a/src/aklog/skipwrap.c
+++ b/src/aklog/skipwrap.c
@@ -32,7 +32,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 #include <stdio.h>
-#include <aklog.h>
+#include "aklog.h"
 #include <krb5.h>
 #include "skipwrap.h"
 

diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index 2eed8e1407a71fba482fc95ffc8116982cc5a885..083bf20e436739c11c38ddad427b7538c80cd567 100644 (file)
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -19,7 +19,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
 
 all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
 

diff --git a/src/bucoord/volstub.c b/src/bucoord/volstub.c
index 7efbca5a86710001f1236a2b1c7f7c19f267087b..31218ab9e0626b845a87e73a77dc3a48ef39ea2c 100644 (file)
--- a/src/bucoord/volstub.c
+++ b/src/bucoord/volstub.c
@@ -22,7 +22,7 @@
 #include <rx/xdr.h>
 #include <afs/vlserver.h>      /*Misc server-side Volume Location stuff */
 #include <ubik.h>
-#include "volser.h"
+#include <afs/volser.h>
 #include "bc.h"
 #include <afs/volint.h>
 #include <afs/volser.h>

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index e43ea5d7d2066c230bfbdd0e619072c4bd2a70c3..d3b4a49e1041b97338334b32eeb62ca1b0349cb0 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -43,12 +43,11 @@ libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
        $(RANLIB) $@
 
 #
-# Files with errors
+# When we build this file, we're using a .c file that's in the object directory,
+# so we need to add the source directory to the includes to pick up local headers.
 #
-# The autogenerated file from bison has an unused label
-
 error_table.o: error_table.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) -I${srcdir} @CFLAGS_NOERROR@ -c $<
 
 #
 # Installation targets

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index aafd46a745cff4086c8bc3511ff2cc6d8d9bfb52..c19fb461f42c020cbcc6ae6ebc4782a3d1044e1c 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -123,7 +123,10 @@ SHELL = /bin/sh
 # Common/standard cflags/paths/etc
 # Cflags defaults, will be overridden later if necessary
 #
-COMMON_INCL=-I${TOP_OBJDIR}/src/config -I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -I${TOP_INCDIR}/rx -I${TOP_OBJDIR} -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src
+# -I. and -I${srcdir} are only needed for objdir builds - we should
+# conditionalise them on that.
+
+COMMON_INCL=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${srcdir} -I.
 COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL}
 
 CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR)

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index fdc17d74a361fbc3f9655400f7a3d4a11f7ab97c..bfb3295054c0322472286698fd8991b153d0be76 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -12,7 +12,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} -I. ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
 
 INST=$(RM) -f $@; $(CP) $? $@
 
@@ -49,7 +49,7 @@ mkvers: ${srcdir}/mkvers.c
        $(CC) $(CFLAGS) -o mkvers ${srcdir}/mkvers.c
 
 mc.o: ${srcdir}/mc.c
-       $(CC) $(CFLAGS) -c ${srcdir}/mc.c
+       $(CC) $(CFLAGS) -I. -c ${srcdir}/mc.c
 
 config.o: ${srcdir}/config.c AFS_component_version_number.c
        $(CC) $(CFLAGS) -I. -c ${srcdir}/config.c

diff --git a/src/config/mc.c b/src/config/mc.c
index 9e451ba0d166b07dd1c20cff8733143060d3c2fd..d877ff695b8a2a7794a450c014178837b1855c60 100644 (file)
--- a/src/config/mc.c
+++ b/src/config/mc.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <afsconfig.h>
+#include "afsconfig.h"
 #include <string.h>
 
 #define TOK_DONTUSE 1          /* Don't copy if match and this flag is set. */

diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index 8c9d813b21202c5dc6759bb4b85eb1e9b8d8e44f..998ad64c29084d310d5849706e1d90cd9b2a416d 100644 (file)
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@@ -49,6 +49,7 @@ OBJS = \
 all: \
        ${TOP_LIBDIR}/libdes.a \
        ${TOP_INCDIR}/des.h \
+       ${TOP_INCDIR}/des/stats.h \
        ${TOP_INCDIR}/des_prototypes.h \
        ${TOP_INCDIR}/des_conf.h \
        ${TOP_INCDIR}/mit-cpyright.h \
@@ -60,6 +61,9 @@ ${TOP_LIBDIR}/libdes.a: libdes.a
 ${TOP_INCDIR}/des.h: des.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/des/stats.h: stats.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/des_prototypes.h: des_prototypes.h
        ${INSTALL_DATA} $? $@
 

diff --git a/src/des/cbc_encrypt.c b/src/des/cbc_encrypt.c
index 65bbd3a923d96c0f28295abc6ee1b409b7eae87d..c987e7ab952a0a5924eece1f78ba231c729f9347 100644 (file)
--- a/src/des/cbc_encrypt.c
+++ b/src/des/cbc_encrypt.c
@@ -17,7 +17,7 @@
  * Originally written 8/85 by Steve Miller, MIT Project Athena.
  */
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <afsconfig.h>
 #include <afs/param.h>
 
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #endif
 
-#include <des.h>
+#include "des.h"
 #include "des_prototypes.h"
 
 

diff --git a/src/des/cksum.c b/src/des/cksum.c
index 1764ce1c7b659e0f652891ebe7a80ad784ebac02..4faf547a11df523f176245a6aefef5c44ff9bf68 100644 (file)
--- a/src/des/cksum.c
+++ b/src/des/cksum.c
@@ -21,7 +21,7 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #ifndef KERNEL
 #include <stdio.h>
 #endif
@@ -33,7 +33,7 @@
 #endif
 #endif
 
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/conf.h b/src/des/conf.h
index 4c64df8e0e3cbb9de8666aa0fdba6af45959d5d6..48191cca3f39087c648304c39dd5cc8a93a0d9a9 100644 (file)
--- a/src/des/conf.h
+++ b/src/des/conf.h
@@ -15,7 +15,7 @@
 
 #ifndef _CONF_H_
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 
 #include "andrew-conf.h"
 

diff --git a/src/des/debug_decl.c b/src/des/debug_decl.c
index 1a4a5b55912fc1eb6869e637651cb9e21f864014..4b37a6108ca2069443f4668aa61e2d827b8eef08 100644 (file)
--- a/src/des/debug_decl.c
+++ b/src/des/debug_decl.c
@@ -11,5 +11,5 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 int des_debug = 0;

diff --git a/src/des/des.c b/src/des/des.c
index 0c0b069f6cfe53b4872db681d0604f155b920647..95cd72e47a22064a40d75abedbd810fe0944cd8f 100644 (file)
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -31,7 +31,7 @@
  *
  * originally written by Steve Miller, MIT Project Athena
  */
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 
 #include <afsconfig.h>
 #include <afs/param.h>
@@ -44,7 +44,7 @@
 #ifdef AFS_PTHREAD_ENV
 #include <pthread.h>
 #endif /* AFS_PTHREAD_ENV */
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "s_table.h"
 #ifdef BIG

diff --git a/src/des/des.h b/src/des/des.h
index 9ad21d4a2f8cb2a41baace3a574b5c802d7c9fae..2b4b768c94767e9b22807ca054496590b9b358a1 100644 (file)
--- a/src/des/des.h
+++ b/src/des/des.h
@@ -14,7 +14,7 @@
 #if defined(UKERNEL)
 #include "des/mit-cpyright.h"
 #else /* defined(UKERNEL) */
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #endif /* defined(UKERNEL) */
 
 typedef unsigned char des_cblock[8];   /* crypto-block size */

diff --git a/src/des/enc.c b/src/des/enc.c
index 5dc8dbaa3000011fd7bba7732aa8620e632769e9..ac264400ef1724ab13daeb690d14bd64821cc4d0 100644 (file)
--- a/src/des/enc.c
+++ b/src/des/enc.c
@@ -9,8 +9,8 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
-#include <des.h>
+#include "mit-cpyright.h"
+#include "des.h"
 #ifdef BSDUNIX
 #include <sys/file.h>
 #endif

diff --git a/src/des/key_parity.c b/src/des/key_parity.c
index 1f0217d32ed430d94ccad2fe815fef842cf12543..0ff9acd5790538e07b4182dd1146bc519d8f0b41 100644 (file)
--- a/src/des/key_parity.c
+++ b/src/des/key_parity.c
@@ -18,9 +18,9 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/key_sched.c b/src/des/key_sched.c
index 25127b3ab39445d0ae0bbf92ce2fce36ef5f8e5f..131577f3fa81cd67480e572150c55980b8324aef 100644 (file)
--- a/src/des/key_sched.c
+++ b/src/des/key_sched.c
@@ -31,7 +31,7 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include "des_internal.h"
 #include <stdio.h>
 

diff --git a/src/des/main.c b/src/des/main.c
index 13cadc7948d3e5faa0c87485ba86ae2f1621ce9d..132c4c64e183b3d993069bc31f29f5a7aa73d4a5 100644 (file)
--- a/src/des/main.c
+++ b/src/des/main.c
@@ -14,7 +14,7 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -26,7 +26,7 @@
 #endif
 #endif
 
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/make_e.c b/src/des/make_e.c
index 11be53740541472f892bb50a7a63f24d8f09eb31..c06be79a93d9792bf28480378dc6d0b7580b0c85 100644 (file)
--- a/src/des/make_e.c
+++ b/src/des/make_e.c
@@ -12,7 +12,7 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
 #include "tables.h"
 

diff --git a/src/des/make_fp.c b/src/des/make_fp.c
index 211e0f96316269dbb3dffe10249af0276e01f34f..3a9cb8bf441cf2a510f7eb6088d161e824723ab8 100644 (file)
--- a/src/des/make_fp.c
+++ b/src/des/make_fp.c
@@ -12,9 +12,9 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/make_ip.c b/src/des/make_ip.c
index 2fed60e509d6435d088f8742c2b1b35d83101c9d..174141ad9e87ae48944b009a6bd3ea3d2fc2718e 100644 (file)
--- a/src/des/make_ip.c
+++ b/src/des/make_ip.c
@@ -12,10 +12,10 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 
 #define WANT_IP_TABLE

diff --git a/src/des/make_keyperm.c b/src/des/make_keyperm.c
index a83be8fdc0e5b3124fd26f4167a7b3e430bce034..f240431989189fc178371d4f9a62616ee679bf95 100644 (file)
--- a/src/des/make_keyperm.c
+++ b/src/des/make_keyperm.c
@@ -16,10 +16,10 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
 #include <errno.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/make_odd.c b/src/des/make_odd.c
index e5239073f31432f08132443127257da0ec63dee7..8c1e3a43fa2d45143af81b9e7853eb3ed33b2184 100644 (file)
--- a/src/des/make_odd.c
+++ b/src/des/make_odd.c
@@ -11,7 +11,7 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
 
 void

diff --git a/src/des/make_p.c b/src/des/make_p.c
index 1e61e483ac3ec11e52479c12ba8e5039d3f193b7..d430679e6151b3e11985022a897a4e4d733fdd3a 100644 (file)
--- a/src/des/make_p.c
+++ b/src/des/make_p.c
@@ -11,9 +11,9 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "tables.h"
 #include "des_prototypes.h"

diff --git a/src/des/make_p_table.c b/src/des/make_p_table.c
index d162917974b53f8e870415070b93755861087e86..0858ac44d8f35db38c451936381c8a0880f5a9aa 100644 (file)
--- a/src/des/make_p_table.c
+++ b/src/des/make_p_table.c
@@ -10,9 +10,9 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/make_s.c b/src/des/make_s.c
index be25405e49e810fda4ead6bc447add820adcd89f..00aa31ffc81c6a134eb5859198d839356e7ef664 100644 (file)
--- a/src/des/make_s.c
+++ b/src/des/make_s.c
@@ -9,7 +9,7 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
 #include "des_internal.h"
 #include "s_table.h"

diff --git a/src/des/make_s_table.c b/src/des/make_s_table.c
index 5f2f314c9d94fff2388c3e409aeeb1dfcc52ee32..f0c233de00f0ac9cb46982cabc67330fa345e444 100644 (file)
--- a/src/des/make_s_table.c
+++ b/src/des/make_s_table.c
@@ -9,9 +9,9 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <stdio.h>
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/misc.c b/src/des/misc.c
index 7d0e129c056909f8fc203ad6f8106e784998f709..f39d2d60d18ae1cc7fec3ebea3339192b0d22238 100644 (file)
--- a/src/des/misc.c
+++ b/src/des/misc.c
@@ -14,11 +14,11 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #ifndef KERNEL
 #include <stdio.h>
 #endif
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index 8044c26dd51e95c86a9ee3e110e355ce215ac115..81b7cd0efe414447b57a5674be8c674d7507137c 100644 (file)
--- a/src/des/new_rnd_key.c
+++ b/src/des/new_rnd_key.c
@@ -13,7 +13,7 @@
  * without license from the U.S. Commerce department.
  */
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 
 #include <afsconfig.h>
 #include <afs/param.h>
@@ -22,7 +22,7 @@
 #ifndef KERNEL
 #include <stdio.h>
 #endif
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/pcbc_encrypt.c b/src/des/pcbc_encrypt.c
index 8f8cd6ef463984e3529ddbc64f5a9daba4522a1c..fd88793db5dd9fcde289774a5877d8cbd327e3e4 100644 (file)
--- a/src/des/pcbc_encrypt.c
+++ b/src/des/pcbc_encrypt.c
@@ -20,14 +20,14 @@
  * spm 8/85    MIT project athena
  */
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #ifndef KERNEL
 #include <stdio.h>
 #include <string.h>
 #endif
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <des.h>
+#include "des.h"
 #include "des_prototypes.h"
 
 

diff --git a/src/des/quad_cksum.c b/src/des/quad_cksum.c
index 58af958af376664e3887d8176d8a05d72532fdb5..e3f183943c035ca393843b449cd93ab6dac77bd6 100644 (file)
--- a/src/des/quad_cksum.c
+++ b/src/des/quad_cksum.c
@@ -68,7 +68,7 @@
 #include <afs/stds.h>
 
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 
 /* System include files */
 #ifndef KERNEL
@@ -77,7 +77,7 @@
 #include <errno.h>
 
 /* Application include files */
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c
index de4b43a472b061507c8ac7b30f2c304c1136cc8f..6b1841de31fd350242e6967426972fc050b691a1 100644 (file)
--- a/src/des/read_pssword.c
+++ b/src/des/read_pssword.c
@@ -15,8 +15,8 @@
 #include <afs/param.h>
 
 
-#include <mit-cpyright.h>
-#include <des.h>
+#include "mit-cpyright.h"
+#include "des.h"
 #include "conf.h"
 
 #include <stdio.h>

diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index 93233b416d73531ea382e2044a201777212b5f82..65abd9bbbabccb77f60674a4526ef06533c94548 100644 (file)
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -20,7 +20,7 @@
  *     spm     8/85    MIT project athena
  */
 
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
 #include <afsconfig.h>
 #include <afs/param.h>
 
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #endif
 
-#include <des.h>
+#include "des.h"
 #include "des_internal.h"
 #include "des_prototypes.h"
 

diff --git a/src/des/util.c b/src/des/util.c
index 9490d36c7f122caba9c599eee3d8c967b15f1794..3408f7b5054d42c3dfdfea0e02d45bca7ca2934b 100644 (file)
--- a/src/des/util.c
+++ b/src/des/util.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #endif
 #include <sys/types.h>
-#include <des.h>
+#include "des.h"
 #include "des_prototypes.h"
 
 int

diff --git a/src/fsprobe/fsprobe.c b/src/fsprobe/fsprobe.c
index 34ec2c11893122e96d7579b432a13ad314d2c014..a2d9a06409abe32d4bf1d9943def4ff7b20d82d5 100644 (file)
--- a/src/fsprobe/fsprobe.c
+++ b/src/fsprobe/fsprobe.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include <fsprobe.h>           /*Interface for this module */
+#include "fsprobe.h"           /*Interface for this module */
 #include <lwp.h>               /*Lightweight process package */
 #include <afs/cellconfig.h>
 #include <afs/afsint.h>

diff --git a/src/fsprobe/fsprobe_test.c b/src/fsprobe/fsprobe_test.c
index eaa015d40d0ebc3c1fa728a9c7edaf72caed2098..73ca6f8965e538c65867a42f662f489b0e8f9e88 100644 (file)
--- a/src/fsprobe/fsprobe_test.c
+++ b/src/fsprobe/fsprobe_test.c
@@ -18,7 +18,7 @@
 
 
 #include <string.h>
-#include <fsprobe.h>           /*Interface for fsprobe module */
+#include "fsprobe.h"           /*Interface for fsprobe module */
 #include <afs/afsutil.h>
     
 /*------------------------------------------------------------------------

diff --git a/src/kauth/kaaux.c b/src/kauth/kaaux.c
index bffc7677ea1536dff66a2f4df65adaf22aec2262..bf673a0003415dd3b143c5c1884d163c8978be9b 100644 (file)
--- a/src/kauth/kaaux.c
+++ b/src/kauth/kaaux.c
@@ -16,7 +16,7 @@
 #include "afs/kauth.h"
 #else /* defined(UKERNEL) */
 #include <rx/xdr.h>
-#include "kauth.h"
+#include <afs/kauth.h>
 #endif /* defined(UKERNEL) */
 
 #define MAXBS  2048            /* try to avoid horrible allocs */

diff --git a/src/kauth/user.c b/src/kauth/user.c
index 3c511551ffc66151dab1655f028933a17fa34f44..380b39feca20651ebe549ab684ffe0f576d44f78 100644 (file)
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -37,7 +37,7 @@
 #include "afs/ptuser.h"
 #include "des.h"
 #include "des_prototypes.h"
-#include "ktc.h"
+#include "afs/ktc.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <signal.h>
@@ -65,7 +65,7 @@
 #include <rx/rxkad.h>          /* max ticket lifetime */
 #include "kauth.h"
 #include "kautils.h"
-#include "ktc.h"
+#include <afs/ktc.h>
 #endif /* defined(UKERNEL) */
 
 

diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in
index 2a0f2e43db7f430cab27bdaab1d3df359a1d42e9..fc63bee66f82715c3b53c22f83b538bc7352dfa1 100644 (file)
--- a/src/libadmin/kas/Makefile.in
+++ b/src/libadmin/kas/Makefile.in
@@ -13,7 +13,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC = ${MT_CC}
-CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -I../../kauth -I${srcdir}/../../kauth
+CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 KAUTH= ${srcdir}/../../kauth

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index 6b11521d701003378a2d78f1fa0601d9601ba8e7..7bf1f2ecf8ea8eb2a540a5c35b082b2bd237c9d1 100644 (file)
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -15,7 +15,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC=${MT_CC}
-CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -I../auth -I../kauth -I../ptserver -I../sys
+CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 AUDIT= ../audit
@@ -119,19 +119,19 @@ audit-sysvmq.o: ${AUDIT}/audit-sysvmq.c
        ${CCRULE}
 
 cellconfig.o: ${AUTH}/cellconfig.c
-       ${CCRULE}
+       ${CCRULE} -I../auth
 
 ktc.o: ${AUTH}/ktc.c
        ${CCRULE}
 
 userok.o: ${AUTH}/userok.c
-       ${CCRULE}
+       ${CCRULE} -I../auth
 
 writeconfig.o: ${AUTH}/writeconfig.c
-       ${CCRULE}
+       ${CCRULE} -I../auth
 
 authcon.o: ${AUTH}/authcon.c
-       ${CCRULE}
+       ${CCRULE} -I../auth
 
 ktc_errors.o: ${AUTH}/ktc_errors.c
        ${CCRULE}
@@ -146,28 +146,28 @@ kauth.cs.o: ${KAUTH}/kauth.cs.c
        ${CCRULE}
 
 kaaux.o: ${KAUTH}/kaaux.c
-       ${CCRULE}
+       ${CCRULE} -I../kauth
 
 client.o: ${KAUTH}/client.c
-       ${CCRULE}
+       ${CCRULE} -I../kauth
 
 authclient.o: ${KAUTH}/authclient.c
-       ${CCRULE}
+       ${CCRULE} -I../kauth
 
 token.o: ${KAUTH}/token.c
-       ${CCRULE}
+       ${CCRULE} -I../kauth
 
 kautils.o: ${KAUTH}/kautils.c
-       ${CCRULE}
+       ${CCRULE} -I../kauth
 
 kalocalcell.o: ${KAUTH}/kalocalcell.c
-       ${CCRULE}
+       ${CCRULE} -I ../kauth
 
 kaerrors.o: ${KAUTH}/kaerrors.c
        ${CCRULE}
 
 user.o: ${KAUTH}/user.c
-       ${CCRULE}
+       ${CCRULE} -I ../kauth
 
 read_passwd.o: ${KAUTH}/read_passwd.c
        ${CCRULE}
@@ -215,7 +215,7 @@ rxkad_errs.o: ${RXKAD}/rxkad_errs.c
        ${CCRULE}
 
 ptclient.o: ${PTSERVER}/ptclient.c
-       ${CCRULE}
+       ${CCRULE} -I../ptserver
 
 # The special treatment of this file for hp_ux110 is because of a bug
 # in version A.11.01.00 of the HP C compiler.  This bug appears to be
@@ -228,16 +228,16 @@ ptuser.o: ${PTSERVER}/ptuser.c
        set -x; \
        case ${SYS_NAME} in \
        hp_ux11*) \
-               set X `echo ${CCRULE} | sed s/-g//`; shift; \
+               set X `echo ${CCRULE} -I../ptserver | sed s/-g//`; shift; \
                "$$@" \
                ;; \
        *) \
-               ${CCRULE} \
+               ${CCRULE} -I../ptserver\
                ;; \
        esac
 
 display.o: ${PTSERVER}/display.c
-       ${CCRULE}
+       ${CCRULE} -I../ptserver
 
 ptint.cs.o: ${PTSERVER}/ptint.cs.c
        ${CCRULE}
@@ -249,7 +249,7 @@ pterror.o: ${PTSERVER}/pterror.c
        ${CCRULE}
 
 rmtsysc.o: ${SYS}/rmtsysc.c
-       ${CCRULE}
+       ${CCRULE} -I../sys
 
 rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c
        ${CCRULE}
@@ -261,7 +261,7 @@ afssyscalls.o: ${SYS}/afssyscalls.c
        ${CCRULE}
 
 rmtsysnet.o: ${SYS}/rmtsysnet.c
-       ${CCRULE}
+       ${CCRULE} -I../sys
 
 glue.o: ${SYS}/glue.c
        ${CCRULE}

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 31a4f1752091d0a199d3d2040cc9c42a37bf5439..df31c9383951e29ad83af9f8b902e875d341703a 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -18,8 +18,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 
 CC=${MT_CC}
-CFLAGS = ${COMMON_CFLAGS} -I${srcdir}/../des -I../des -I../rxkad -I${srcdir}/../rxkad \
-       -I../fsint -DRXDEBUG ${MT_CFLAGS}
+CFLAGS = ${COMMON_CFLAGS} -DRXDEBUG ${MT_CFLAGS}
 
 SFLAGS=-P -I${TOP_INCDIR}
 RX = ${srcdir}/../rx
@@ -190,34 +189,34 @@ rx_multi.o: ${RX}/rx_multi.c
 ${RXOBJS}: ${RX}/rx.h ${RX}/rx_user.h ${RX}/rx_globals.h ${RX}/rx_clock.h ${RX}/rx_queue.h ${RX}/rx_event.h
 
 rxkad_client.o: ${RXKAD}/rxkad_client.c
-       ${CCRULE} ${RXKAD}/rxkad_client.c
+       ${CCRULE} -I../rxkad ${RXKAD}/rxkad_client.c
 
 rxkad_server.o: ${RXKAD}/rxkad_server.c
-       ${CCRULE} ${RXKAD}/rxkad_server.c
+       ${CCRULE} -I../rxkad ${RXKAD}/rxkad_server.c
 
 rxkad_common.o: ${RXKAD}/rxkad_common.c
-       ${CCRULE} ${RXKAD}/rxkad_common.c
+       ${CCRULE} -I../rxkad ${RXKAD}/rxkad_common.c
 
 ticket.o: ${RXKAD}/ticket.c
-       ${CCRULE} ${RXKAD}/ticket.c
+       ${CCRULE} -I../rxkad ${RXKAD}/ticket.c
 
 ticket5.o: ${RXKAD}/ticket5.c
-       ${CCRULE} ${RXKAD}/ticket5.c
+       ${CCRULE} -I../rxkad -I${RXKAD} ${RXKAD}/ticket5.c
 
 crc.o: ${RXKAD}/crc.c
-       ${CCRULE} ${RXKAD}/crc.c
+       ${CCRULE} -I../rxkad ${RXKAD}/crc.c
 
 md4.o: ${RXKAD}/md4.c
-       ${CCRULE} ${RXKAD}/md4.c
+       ${CCRULE} -I../rxkad ${RXKAD}/md4.c
 
 md5.o: ${RXKAD}/md5.c
-       ${CCRULE} ${RXKAD}/md5.c
+       ${CCRULE} -I../rxkad ${RXKAD}/md5.c
 
 fcrypt.o: ${RXKAD}/domestic/fcrypt.c
-       ${CCRULE} ${RXKAD}/domestic/fcrypt.c
+       ${CCRULE} -I../rxkad ${RXKAD}/domestic/fcrypt.c
 
 crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
-       ${CCRULE} ${RXKAD}/domestic/crypt_conn.c
+       ${CCRULE} -I../rxkad ${RXKAD}/domestic/crypt_conn.c
 
 AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
        ${CCRULE} ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
@@ -288,11 +287,11 @@ des.o: ${DES}/des.c
        set -x; \
        case ${SYS_NAME} in \
        hp_ux11*) \
-               set X `echo ${CCRULE} ${DES}/des.c | sed s/-g//`; shift; \
+               set X `echo ${CCRULE} -I../des ${DES}/des.c | sed s/-g//`; shift; \
                "$$@" \
                ;; \
        *) \
-               ${CCRULE} ${DES}/des.c \
+               ${CCRULE} -I../des ${DES}/des.c \
                ;; \
        esac
 
@@ -312,7 +311,7 @@ new_rnd_key.o: ${DES}/new_rnd_key.c
        ${CCRULE} ${DES}/new_rnd_key.c
 
 key_sched.o: ${DES}/key_sched.c
-       ${CCRULE} ${DES}/key_sched.c
+       ${CCRULE} -I../des ${DES}/key_sched.c
 
 debug_decl.o: ${DES}/debug_decl.c
        ${CCRULE} ${DES}/debug_decl.c
@@ -321,7 +320,7 @@ quad_cksum.o: ${DES}/quad_cksum.c
        ${CCRULE} ${DES}/quad_cksum.c
 
 key_parity.o: ${DES}/key_parity.c
-       ${CCRULE} ${DES}/key_parity.c
+       ${CCRULE} -I../des ${DES}/key_parity.c
 
 weak_key.o: ${DES}/weak_key.c
        ${CCRULE} ${DES}/weak_key.c
@@ -410,7 +409,7 @@ afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
        ${CCRULE} ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
 
 afsaux.o: ${FSINT}/afsaux.c
-       ${CCRULE} ${FSINT}/afsaux.c
+       ${CCRULE} -I../fsint ${FSINT}/afsaux.c
 
 install: libafsrpc.a
        ${INSTALL} -d ${DESTDIR}${libdir}

diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c
index 273a49abeac237520e15b2a5cbb1b592aaed6352..de2f4336ae8060e2b9516e80c8414207e707860a 100644 (file)
--- a/src/rxdebug/rxdebug.c
+++ b/src/rxdebug/rxdebug.c
@@ -38,11 +38,11 @@
 
 #include <stdio.h>
 
-#include "rx_user.h"
-#include "rx_clock.h"
-#include "rx_queue.h"
-#include "rx.h"
-#include "rx_globals.h"
+#include <rx/rx_user.h>
+#include <rx/rx_clock.h>
+#include <rx/rx_queue.h>
+#include <rx/rx.h>
+#include <rx/rx_globals.h>
 
 
 #define        TIMEOUT     20

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index c03a4c1365539321cba2e8b452aca9223b1ac575..f3962a8b2a317f01db203ba54c590048da42d9db 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -77,7 +77,7 @@ ticket.o: ticket.c lifetimes.h ${INCLS}
        $(CC) $(CFLAGS) -c $<
 
 ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) -I${srcdir} $(CFLAGS) @CFLAGS_NOERROR@ -c $<
 
 crc.o: crc.c ${INCLS}
 

diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c
index cf570a7d9e6826c39af5b9439e8cec4547e69e0e..ab2d44ba536b8b164d2f3ddd7ee5e51b589b2164 100644 (file)
--- a/src/rxkad/domestic/crypt_conn.c
+++ b/src/rxkad/domestic/crypt_conn.c
@@ -45,7 +45,7 @@
 #endif /* KERNEL */
 
 #include <des/stats.h>
-#include "private_data.h"
+#include "../private_data.h"
 #define XPRT_RXKAD_CRYPT
 
 afs_int32

diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c
index 281209a88f30d5f94c711b0e7d1f885603e0d285..6b2f88b13f045d6ba66b18971ce5ab7544c69c95 100644 (file)
--- a/src/rxkad/domestic/fcrypt.c
+++ b/src/rxkad/domestic/fcrypt.c
@@ -54,7 +54,7 @@
 
 #include "sboxes.h"
 #include "fcrypt.h"
-#include "rxkad.h"
+#include <rxkad.h>
 #include <des/stats.h>
 
 #ifdef TCRYPT

diff --git a/src/rxkad/rxkad.p.h b/src/rxkad/rxkad.p.h
index ce052dfd07e0fb46e59f537818161c8d97201a44..c57b0616fe090b6c145392baa7944bdf90c278d4 100644 (file)
--- a/src/rxkad/rxkad.p.h
+++ b/src/rxkad/rxkad.p.h
@@ -93,6 +93,6 @@ typedef char rxkad_level;
 
 extern int rxkad_EpochWasSet;  /* TRUE => we called rx_SetEpoch */
 
-#include "rxkad_prototypes.h"
+#include <rx/rxkad_prototypes.h>
 
 #endif /* OPENAFS_RXKAD_RXKAD_H */

diff --git a/src/rxkad/v5gen.c b/src/rxkad/v5gen.c
index 13cacaa46e0cdadb1cd62c3048500443fd1a216a..b6087c47ee50a785fe317d8a5fe93d64eaf11ea0 100644 (file)
--- a/src/rxkad/v5gen.c
+++ b/src/rxkad/v5gen.c
@@ -6,7 +6,7 @@
 #include <time.h>
 #include <string.h>
 #include <errno.h>
-#include <asn1_err.h>
+#include "asn1_err.h"
 
 #define BACK if (e) return e; p -= l; len -= l; ret += l
 

diff --git a/src/scout/scout.c b/src/scout/scout.c
index 4ce9013d4c9dd0436cb646a601d429bdc6383b1d..676e66c3b7a35b2b7d4c6314217855ddb55744fd 100644 (file)
--- a/src/scout/scout.c
+++ b/src/scout/scout.c
@@ -21,18 +21,18 @@
 #endif
 #include <string.h>
 #undef IN
-#include <gtxwindows.h>                /*Generic window package */
-#include <gtxobjects.h>                /*Object definitions */
-#include <gtxtextobj.h>                /*Text object interface */
-#include <gtxlightobj.h>       /*Light object interface */
-#include <gtxcurseswin.h>      /*Curses window package */
-#include <gtxdumbwin.h>                /*Dumb terminal window package */
-#include <gtxX11win.h>         /*X11 window package */
-#include <gtxframe.h>          /*Frame package */
-#include <gtxinput.h>
+#include <afs/gtxwindows.h>            /*Generic window package */
+#include <afs/gtxobjects.h>            /*Object definitions */
+#include <afs/gtxtextobj.h>            /*Text object interface */
+#include <afs/gtxlightobj.h>   /*Light object interface */
+#include <afs/gtxcurseswin.h>  /*Curses window package */
+#include <afs/gtxdumbwin.h>            /*Dumb terminal window package */
+#include <afs/gtxX11win.h>             /*X11 window package */
+#include <afs/gtxframe.h>              /*Frame package */
+#include <afs/gtxinput.h>
 #include <stdio.h>             /*Standard I/O stuff */
-#include <cmd.h>               /*Command interpretation library */
-#include <fsprobe.h>           /*Interface for fsprobe module */
+#include <afs/cmd.h>           /*Command interpretation library */
+#include <afs/fsprobe.h>               /*Interface for fsprobe module */
 #include <errno.h>
 #include <afs/afsutil.h>
 #include <netdb.h>

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 0c5db238f062a8ad6258e9b870510111e35adab5..04c240fa874e1a02ef5fd8050c6a7a385653bc1b 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -22,9 +22,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC=${MT_CC}
-INCLUDES=-I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \
-       -I../rxkad -I${srcdir}/../rxkad -I../rxstat -I../fsint
-CFLAGS = ${COMMON_CFLAGS} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} ${SHLIB_CFLAGS}
+CFLAGS = ${COMMON_CFLAGS} -DRXDEBUG ${MT_CFLAGS} ${SHLIB_CFLAGS}
 SFLAGS=-P -I${TOP_INCDIR}
 
 RX = ../rx
@@ -221,7 +219,7 @@ ticket.o: ${RXKAD}/ticket.c
        ${CCRULE}
 
 ticket5.o: ${RXKAD}/ticket5.c
-       ${CCRULE}
+       ${CCRULE} -I../rxkad -I${RXKAD}
 
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
@@ -233,7 +231,7 @@ md5.o: ${RXKAD}/md5.c
        ${CCRULE}
 
 fcrypt.o: ${RXKAD}/domestic/fcrypt.c
-       ${CCRULE}
+       ${CCRULE} -I../rxkad -I${RXKAD}
 
 crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
        ${CCRULE}

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index e10751304076eaf6f3e1851e3a9c36a94d14d947..db397c8af9b177692bf09f957eaec8ce6afe0557 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=${DBUG} ${COMMON_INCL} ${XCFLAGS} ${ARCHFLAGS}
 SFLAGS=-I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
 

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 4843b5e99e2aeb3e34e55502f29a8f81d54e0a6e..464b6ce084adf568e22cf73fdc86944fdc345c28 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -87,7 +87,7 @@ flipbase64.o: ${UTIL}/flipbase64.c
        ${CCRULE}
 
 netutils.o: ${UTIL}/netutils.c
-       ${CCRULE}
+       ${CCRULE} -I ../util
 
 dirpath.o: ${UTIL}/dirpath.c
        ${CCRULE}

diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c
index 027e36167fecc0fbb55985da2ea09617fff5aebe..3a91cf5226720f567d95acf4ad15e26d3cff50a0 100644 (file)
--- a/src/tsalvaged/salvsync-debug.c
+++ b/src/tsalvaged/salvsync-debug.c
@@ -51,15 +51,15 @@
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
 
-#include "nfs.h"
-#include "lwp.h"
-#include "lock.h"
-#include "ihandle.h"
-#include "vnode.h"
-#include "volume.h"
-#include "partition.h"
-#include "daemon_com.h"
-#include "salvsync.h"
+#include <afs/nfs.h>
+#include <lwp.h>
+#include <lock.h>
+#include <afs/ihandle.h>
+#include <afs/vnode.h>
+#include <afs/volume.h>
+#include <afs/partition.h>
+#include <afs/daemon_com.h>
+#include <afs/salvsync.h>
 #ifdef AFS_NT40_ENV
 #include <pthread.h>
 #endif

diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in
index b749078eadb9e65b77ec3a67e6df84b65d5e9c01..f6ece4ecbadde1a0d629233e68414f36cb1ecf85 100644 (file)
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@@ -15,7 +15,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC=${MT_CC}
-CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT
+CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT
 
 CCRULE=${CC} ${CFLAGS} -c $?
 
@@ -98,7 +98,7 @@ flipbase64.o: ${UTIL}/flipbase64.c
        ${CCRULE}
 
 netutils.o: ${UTIL}/netutils.c
-       ${CCRULE}
+       ${CCRULE} -I../util
 
 dirpath.o: ${UTIL}/dirpath.c
        ${CCRULE}
@@ -119,10 +119,10 @@ netprocs.o: ${LIBACL}/netprocs.c
        ${CCRULE}
 
 vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
-       ${CCRULE}
+       ${CCRULE} -I${srcdir}/../vlserver
 
 vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
-       ${CCRULE}
+       ${CCRULE} -I${srcdir}/../vlserver
 
 buffer.o: ${DIR}/buffer.c
        ${CCRULE}
@@ -183,7 +183,7 @@ namei_ops.o: ${VOL}/namei_ops.c
        ${CCRULE}
 
 afsaux.o: ${FSINT}/afsaux.c
-       ${CCRULE}
+       ${CCRULE} -I../fsint
 
 afscbint.cs.o: ${FSINT}/afscbint.cs.c
        ${CCRULE}

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 747118de624224890f8c433881fcd25e5b6d5af1..5b65d19889400dba22bf6c5ee1b50b6b9432392a 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
 CC=${MT_CC}
-CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT
+CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT
 
 CCRULE=${CC} ${CFLAGS} -c $?
 
@@ -72,21 +72,21 @@ COMPILE=${CC} ${CFLAGS} -c $?
 rx_pthread.o: ${RX}/rx_pthread.c
        ${COMPILE} -DDPF_FSLOG
 volmain.o: ${VOLSER}/volmain.c
-       ${COMPILE}
+       ${COMPILE} -I../volser
 vol_split.o: ${VOLSER}/vol_split.c
-       ${COMPILE}
+       ${COMPILE} -I../volser
 volprocs.o: ${VOLSER}/volprocs.c
-       ${COMPILE}
+       ${COMPILE} -I../volser
 physio.o: ${VOLSER}/physio.c
        ${COMPILE}
 voltrans.o: ${VOLSER}/voltrans.c
-       ${COMPILE}
+       ${COMPILE} -I../volser
 volerr.o: ${VOLSER}/volerr.c
        ${COMPILE}
 volint.cs.o: ${VOLSER}/volint.cs.c
        ${COMPILE}
 dumpstuff.o: ${VOLSER}/dumpstuff.c
-       ${COMPILE}
+       ${COMPILE} -I../volser
 volint.ss.o: ${VOLSER}/volint.ss.c
        ${COMPILE}
 volint.xdr.o: ${VOLSER}/volint.xdr.c
@@ -117,7 +117,7 @@ flipbase64.o: ${UTIL}/flipbase64.c
        ${COMPILE}
 
 netutils.o: ${UTIL}/netutils.c
-       ${COMPILE}
+       ${COMPILE} -I../util
 
 dirpath.o: ${UTIL}/dirpath.c
        ${COMPILE}

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index fd7377848feee3ccf01da549f40de427f12cf868..f22041957343cb7553b9dee25162e18739fd1e95 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -100,7 +100,7 @@ utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c
 utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c
 
 udebug.o: udebug.c ${INCLS} AFS_component_version_number.c
-       ${CC} ${CFLAGS} -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c
+       ${CC} ${CFLAGS} -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c
 
 uerrors.o: uerrors.c
 

diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in
index 35ef79e0d2148966ca1b07089f2a7704c8dc61d3..4ceafa77819480bcc27aa4d1ba88e587df1171fc 100644 (file)
--- a/src/usd/Makefile.in
+++ b/src/usd/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 
 
-CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
 
 all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h
 

diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index 20fca39ab8257a487f10b838a028f536ad2c4e41..dffc21a1d30ff405efc1b025742c1bc39cc5919d 100644 (file)
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -14,8 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 all: uss
 
-CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \
-       -I${TOP_INCDIR} -I. ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=${DBUG} ${COMMON_INCL} ${XCFLAGS} ${ARCHFLAGS}
 
 #
 # Build targets

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index ad587edc5e86e9ed4165a328ddad45fbeaaa34c9..d4c1d4d723a032582110264d631fb59ceea9cfe5 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -16,9 +16,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
 
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} \
-       -I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\
-        ${XCFLAGS} ${ARCHFLAGS} -DNINTERFACE
+CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \
+       ${XCFLAGS} ${ARCHFLAGS} -DNINTERFACE
 
 LDFLAGS = ${DBUG} ${XLDFLAGS} ${ARCHFLAGS}
 

diff --git a/src/viced/callback.c b/src/viced/callback.c
index e49d400663d3af3db8cc8c828ea03f4d8764e033..9ff0fb12281b7499ec4247057c45aed260abc3e0 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -104,7 +104,7 @@
 #include <afs/nfs.h>           /* yuck.  This is an abomination. */
 #include <lwp.h>
 #include <rx/rx.h>
-#include <afscbint.h>
+#include <afs/afscbint.h>
 #include <afs/afsutil.h>
 #include <lock.h>
 #include <afs/ihandle.h>

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 9d3eef870cfce6970e6c7a9082c6313f396f3ccd..e034ef414ace65fed150b00e7b37bb67aa68d245 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -85,7 +85,7 @@
 #include "viced.h"
 #include "host.h"
 #ifdef AFS_PTHREAD_ENV
-#include "softsig.h"
+#include <afs/softsig.h>
 #endif
 #if defined(AFS_SGI_ENV)
 #include "sys/schedctl.h"

diff --git a/src/vlserver/vldbint.xg b/src/vlserver/vldbint.xg
index 54530d74b065ba130dcaebb159975461f0a7042b..35614f35ceed45370bb73e3a84a7bfd6c0e33461 100644 (file)
--- a/src/vlserver/vldbint.xg
+++ b/src/vlserver/vldbint.xg
@@ -12,7 +12,7 @@ prefix S
 statindex 15
 
 #include       "vl_opcodes.h"
-%#include      "vl_opcodes.h"  /* directly to other places */
+%#include      <afs/vl_opcodes.h>      /* directly to other places */
 
 %#ifdef KERNEL
 %#define       afs_xdr_array(a,b,c,d,e,f)      afs_xdr_arrayN(a,b,c,d,e,f)

diff --git a/src/vol/nuke.c b/src/vol/nuke.c
index 76ca13be4b2fdae9567275d12038ded005bda5a4..a5f74cbbd942274f1ecb35afb6bb864499804b30 100644 (file)
--- a/src/vol/nuke.c
+++ b/src/vol/nuke.c
@@ -33,7 +33,6 @@
 
 #include <afs/afsutil.h>
     
-#include <afs/assert.h>
 #include "nfs.h"
 #include "lwp.h"
 #include "lock.h"

diff --git a/src/vol/physio.c b/src/vol/physio.c
index 4136bde42478ce0301e5fc2017997d92dd675da9..76795673de2ecb9e30db5883e37e9e2f8142f594 100644 (file)
--- a/src/vol/physio.c
+++ b/src/vol/physio.c
@@ -38,8 +38,8 @@
 #include "nfs.h"
 #include "ihandle.h"
 #include "salvage.h"
-#include "afs/assert.h"
-#include "afs/dir.h"
+#include <afs/dir.h>
+#include <assert.h>
 #include "vol_internal.h"
 
 /* returns 0 on success, errno on failure */

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 28bb943a5ce414269f6b6174900fb7cca50f16b4..47fc80e0a1ca211aa0d1fb2ffed3a5de4684274a 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -130,7 +130,7 @@
 #endif /* AFS_PTHREAD_ENV */
 #include "vutils.h"
 #ifndef AFS_NT40_ENV
-#include <dir/dir.h>
+#include <afs/dir.h>
 #include <unistd.h>
 #endif
 

diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c
index 29b9431e7b481c8b299cde7d13681a30aa9940a3..4dff10bb521320545a2e9bc4b0f21cecb97af8bf 100644 (file)
--- a/src/volser/vol-dump.c
+++ b/src/volser/vol-dump.c
@@ -39,18 +39,18 @@
 
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include "nfs.h"
+#include <afs/nfs.h>
 #include <afs/errors.h>
-#include "lock.h"
-#include "lwp.h"
+#include <lock.h>
+#include <lwp.h>
 #include <afs/afssyscalls.h>
-#include "ihandle.h"
-#include "vnode.h"
-#include "volume.h"
-#include "partition.h"
-#include "viceinode.h"
+#include <afs/ihandle.h>
+#include <afs/vnode.h>
+#include <afs/volume.h>
+#include <afs/partition.h>
+#include <afs/viceinode.h>
 #include <afs/afssyscalls.h>
-#include "acl.h"
+#include <afs/acl.h>
 #include <afs/dir.h>
 #include <afs/com_err.h>
 
@@ -72,9 +72,9 @@
 
 #include <dirent.h>
 
-#include "volser/volser.h"
-#include "volser/volint.h"
-#include "volser/dump.h"
+#include "volser.h"
+#include "volint.h"
+#include "dump.h"
 
 #define putint32(p, v)  *p++ = v>>24, *p++ = v>>16, *p++ = v>>8, *p++ = v
 #define putshort(p, v) *p++ = v>>8, *p++ = v

diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index 2ea92f257abb6fa518536b6d00970d6b39ba9f28..186772a555a358806eb10b36cd51fc5bfd9c827c 100644 (file)
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -40,15 +40,15 @@
 #include <afs/dir.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include "nfs.h"
-#include "lwp.h"
-#include "lock.h"
+#include <afs/nfs.h>
+#include <lwp.h>
+#include <lock.h>
 #include <afs/afssyscalls.h>
-#include "ihandle.h"
-#include "vnode.h"
-#include "volume.h"
-#include "partition.h"
-#include "viceinode.h"
+#include <afs/ihandle.h>
+#include <afs/vnode.h>
+#include <afs/volume.h>
+#include <afs/partition.h>
+#include <afs/viceinode.h>
 #include "vol.h"
 #include "volint.h"
 #include "volser.h"

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index 244688fb08a29d7cffa2e83055281fc0a45bb672..5bf46cb0d8dae100e2a95539175f3f7a3bce8126 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -56,7 +56,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include "volser.h"
 #include <errno.h>
 #include <afs/audit.h>
 #include <afs/afsutil.h>

diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
index cf00cb67a95e8a84f5746a725b62dd5258127950..a5583983526eac663a2671110239d0f9dce00161 100644 (file)
--- a/src/xstat/xstat_cm_test.c
+++ b/src/xstat/xstat_cm_test.c
@@ -18,7 +18,7 @@
 
 
 #include "xstat_cm.h"          /*Interface for xstat_cm module */
-#include <cmd.h>               /*Command line interpreter */
+#include <afs/cmd.h>           /*Command line interpreter */
 #include <time.h>
 #include <string.h>
 #include <afs/afsutil.h>

diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
index 63377b33a514cef9294b67e20ed71236653074b5..22182f544051a3ee922bd2ef4fdac07839d10046 100644 (file)
--- a/src/xstat/xstat_fs_test.c
+++ b/src/xstat/xstat_fs_test.c
@@ -18,7 +18,7 @@
 
 
 #include "xstat_fs.h"          /*Interface for xstat_fs module */
-#include <cmd.h>               /*Command line interpreter */
+#include <afs/cmd.h>           /*Command line interpreter */
 #include <time.h>
 #include <string.h>
 #include <afs/afsutil.h>