From 36524b2ed73a2774ee1f6242208a1395be7736a8 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 13 Nov 2009 09:50:29 +0000 Subject: [PATCH] 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 Tested-by: Derrick Brashear --- Makefile.in | 12 +++++------ src/afsmonitor/afsmon-win.c | 22 ++++++++++---------- src/afsmonitor/afsmonitor.c | 18 ++++++++--------- src/aklog/skipwrap.c | 2 +- src/audit/Makefile.in | 2 +- src/bucoord/volstub.c | 2 +- src/comerr/Makefile.in | 7 +++---- src/config/Makefile.config.in | 5 ++++- src/config/Makefile.in | 4 ++-- src/config/mc.c | 2 +- src/des/Makefile.in | 4 ++++ src/des/cbc_encrypt.c | 4 ++-- src/des/cksum.c | 4 ++-- src/des/conf.h | 2 +- src/des/debug_decl.c | 2 +- src/des/des.c | 4 ++-- src/des/des.h | 2 +- src/des/enc.c | 4 ++-- src/des/key_parity.c | 4 ++-- src/des/key_sched.c | 2 +- src/des/main.c | 4 ++-- src/des/make_e.c | 2 +- src/des/make_fp.c | 4 ++-- src/des/make_ip.c | 4 ++-- src/des/make_keyperm.c | 4 ++-- src/des/make_odd.c | 2 +- src/des/make_p.c | 4 ++-- src/des/make_p_table.c | 4 ++-- src/des/make_s.c | 2 +- src/des/make_s_table.c | 4 ++-- src/des/misc.c | 4 ++-- src/des/new_rnd_key.c | 4 ++-- src/des/pcbc_encrypt.c | 4 ++-- src/des/quad_cksum.c | 4 ++-- src/des/read_pssword.c | 4 ++-- src/des/strng_to_key.c | 4 ++-- src/des/util.c | 2 +- src/fsprobe/fsprobe.c | 2 +- src/fsprobe/fsprobe_test.c | 2 +- src/kauth/kaaux.c | 2 +- src/kauth/user.c | 4 ++-- src/libadmin/kas/Makefile.in | 2 +- src/libafsauthent/Makefile.in | 36 ++++++++++++++++----------------- src/libafsrpc/Makefile.in | 33 +++++++++++++++--------------- src/rxdebug/rxdebug.c | 10 ++++----- src/rxkad/Makefile.in | 2 +- src/rxkad/domestic/crypt_conn.c | 2 +- src/rxkad/domestic/fcrypt.c | 2 +- src/rxkad/rxkad.p.h | 2 +- src/rxkad/v5gen.c | 2 +- src/scout/scout.c | 22 ++++++++++---------- src/shlibafsrpc/Makefile.in | 8 +++----- src/sys/Makefile.in | 2 +- src/tsalvaged/Makefile.in | 2 +- src/tsalvaged/salvsync-debug.c | 18 ++++++++--------- src/tviced/Makefile.in | 10 ++++----- src/tvolser/Makefile.in | 14 ++++++------- src/ubik/Makefile.in | 2 +- src/usd/Makefile.in | 2 +- src/uss/Makefile.in | 3 +-- src/viced/Makefile.in | 5 ++--- src/viced/callback.c | 2 +- src/viced/viced.c | 2 +- src/vlserver/vldbint.xg | 2 +- src/vol/nuke.c | 1 - src/vol/physio.c | 4 ++-- src/vol/volume.c | 2 +- src/volser/vol-dump.c | 24 +++++++++++----------- src/volser/vol_split.c | 16 +++++++-------- src/volser/volmain.c | 1 - src/xstat/xstat_cm_test.c | 2 +- src/xstat/xstat_fs_test.c | 2 +- 72 files changed, 207 insertions(+), 208 deletions(-) diff --git a/Makefile.in b/Makefile.in index aadb9799f..cd7046d91 100644 --- 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 62d40bbcf..946f9a90f 100644 --- a/src/afsmonitor/afsmon-win.c +++ b/src/afsmonitor/afsmon-win.c @@ -19,23 +19,23 @@ #include #include #include -#include +#include #include #undef IN #include -#include /*Generic window package */ -#include /*Object definitions */ -#include +#include /*Generic window package */ +#include /*Object definitions */ +#include #if 0 -#include /*Text object circular buffer interface */ -#include /*Text object interface */ +#include /*Text object circular buffer interface */ +#include /*Text object interface */ #endif -#include /*Light object interface */ -#include /*Curses window package */ -#include /*Dumb terminal window package */ -#include /*X11 window package */ -#include /*Frame package */ +#include /*Light object interface */ +#include /*Curses window package */ +#include /*Dumb terminal window package */ +#include /*X11 window package */ +#include /*Frame package */ #include #include diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index a8ce63e9b..848c44d2c 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #undef IN #include @@ -32,14 +32,14 @@ #include #include -#include /*Generic window package */ -#include /*Object definitions */ -#include /*Light object interface */ -#include /*Curses window package */ -#include /*Dumb terminal window package */ -#include /*X11 window package */ -#include /*Frame package */ -#include +#include /*Generic window package */ +#include /*Object definitions */ +#include /*Light object interface */ +#include /*Curses window package */ +#include /*Dumb terminal window package */ +#include /*X11 window package */ +#include /*Frame package */ +#include #include #include diff --git a/src/aklog/skipwrap.c b/src/aklog/skipwrap.c index 6d3723f4d..75c63fd63 100644 --- a/src/aklog/skipwrap.c +++ b/src/aklog/skipwrap.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include "aklog.h" #include #include "skipwrap.h" diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index 2eed8e140..083bf20e4 100644 --- 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 7efbca5a8..31218ab9e 100644 --- a/src/bucoord/volstub.c +++ b/src/bucoord/volstub.c @@ -22,7 +22,7 @@ #include #include /*Misc server-side Volume Location stuff */ #include -#include "volser.h" +#include #include "bc.h" #include #include diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index e43ea5d7d..d3b4a49e1 100644 --- 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 aafd46a74..c19fb461f 100644 --- 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 fdc17d74a..bfb329505 100644 --- 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 9e451ba0d..d877ff695 100644 --- a/src/config/mc.c +++ b/src/config/mc.c @@ -15,7 +15,7 @@ #include #include -#include +#include "afsconfig.h" #include #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 8c9d813b2..998ad64c2 100644 --- 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 65bbd3a92..c987e7ab9 100644 --- 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 +#include "mit-cpyright.h" #include #include @@ -25,7 +25,7 @@ #include #endif -#include +#include "des.h" #include "des_prototypes.h" diff --git a/src/des/cksum.c b/src/des/cksum.c index 1764ce1c7..4faf547a1 100644 --- a/src/des/cksum.c +++ b/src/des/cksum.c @@ -21,7 +21,7 @@ #include -#include +#include "mit-cpyright.h" #ifndef KERNEL #include #endif @@ -33,7 +33,7 @@ #endif #endif -#include +#include "des.h" #include "des_internal.h" #include "des_prototypes.h" diff --git a/src/des/conf.h b/src/des/conf.h index 4c64df8e0..48191cca3 100644 --- a/src/des/conf.h +++ b/src/des/conf.h @@ -15,7 +15,7 @@ #ifndef _CONF_H_ -#include +#include "mit-cpyright.h" #include "andrew-conf.h" diff --git a/src/des/debug_decl.c b/src/des/debug_decl.c index 1a4a5b559..4b37a6108 100644 --- a/src/des/debug_decl.c +++ b/src/des/debug_decl.c @@ -11,5 +11,5 @@ #include -#include +#include "mit-cpyright.h" int des_debug = 0; diff --git a/src/des/des.c b/src/des/des.c index 0c0b069f6..95cd72e47 100644 --- a/src/des/des.c +++ b/src/des/des.c @@ -31,7 +31,7 @@ * * originally written by Steve Miller, MIT Project Athena */ -#include +#include "mit-cpyright.h" #include #include @@ -44,7 +44,7 @@ #ifdef AFS_PTHREAD_ENV #include #endif /* AFS_PTHREAD_ENV */ -#include +#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 9ad21d4a2..2b4b768c9 100644 --- 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 +#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 5dc8dbaa3..ac264400e 100644 --- a/src/des/enc.c +++ b/src/des/enc.c @@ -9,8 +9,8 @@ #include -#include -#include +#include "mit-cpyright.h" +#include "des.h" #ifdef BSDUNIX #include #endif diff --git a/src/des/key_parity.c b/src/des/key_parity.c index 1f0217d32..0ff9acd57 100644 --- a/src/des/key_parity.c +++ b/src/des/key_parity.c @@ -18,9 +18,9 @@ #include -#include +#include "mit-cpyright.h" #include -#include +#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 25127b3ab..131577f3f 100644 --- a/src/des/key_sched.c +++ b/src/des/key_sched.c @@ -31,7 +31,7 @@ #include -#include +#include "mit-cpyright.h" #include "des_internal.h" #include diff --git a/src/des/main.c b/src/des/main.c index 13cadc794..132c4c64e 100644 --- a/src/des/main.c +++ b/src/des/main.c @@ -14,7 +14,7 @@ #include -#include +#include "mit-cpyright.h" #include #include @@ -26,7 +26,7 @@ #endif #endif -#include +#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 11be53740..c06be79a9 100644 --- a/src/des/make_e.c +++ b/src/des/make_e.c @@ -12,7 +12,7 @@ #include -#include +#include "mit-cpyright.h" #include #include "tables.h" diff --git a/src/des/make_fp.c b/src/des/make_fp.c index 211e0f963..3a9cb8bf4 100644 --- a/src/des/make_fp.c +++ b/src/des/make_fp.c @@ -12,9 +12,9 @@ #include -#include +#include "mit-cpyright.h" #include -#include +#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 2fed60e50..174141ad9 100644 --- a/src/des/make_ip.c +++ b/src/des/make_ip.c @@ -12,10 +12,10 @@ #include -#include +#include "mit-cpyright.h" #include #include -#include +#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 a83be8fdc..f24043198 100644 --- a/src/des/make_keyperm.c +++ b/src/des/make_keyperm.c @@ -16,10 +16,10 @@ #include -#include +#include "mit-cpyright.h" #include #include -#include +#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 e5239073f..8c1e3a43f 100644 --- a/src/des/make_odd.c +++ b/src/des/make_odd.c @@ -11,7 +11,7 @@ #include -#include +#include "mit-cpyright.h" #include void diff --git a/src/des/make_p.c b/src/des/make_p.c index 1e61e483a..d430679e6 100644 --- a/src/des/make_p.c +++ b/src/des/make_p.c @@ -11,9 +11,9 @@ #include -#include +#include "mit-cpyright.h" #include -#include +#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 d16291797..0858ac44d 100644 --- a/src/des/make_p_table.c +++ b/src/des/make_p_table.c @@ -10,9 +10,9 @@ #include -#include +#include "mit-cpyright.h" #include -#include +#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 be25405e4..00aa31ffc 100644 --- a/src/des/make_s.c +++ b/src/des/make_s.c @@ -9,7 +9,7 @@ #include -#include +#include "mit-cpyright.h" #include #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 5f2f314c9..f0c233de0 100644 --- a/src/des/make_s_table.c +++ b/src/des/make_s_table.c @@ -9,9 +9,9 @@ #include -#include +#include "mit-cpyright.h" #include -#include +#include "des.h" #include "des_internal.h" #include "des_prototypes.h" diff --git a/src/des/misc.c b/src/des/misc.c index 7d0e129c0..f39d2d60d 100644 --- a/src/des/misc.c +++ b/src/des/misc.c @@ -14,11 +14,11 @@ #include -#include +#include "mit-cpyright.h" #ifndef KERNEL #include #endif -#include +#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 8044c26dd..81b7cd0ef 100644 --- 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 +#include "mit-cpyright.h" #include #include @@ -22,7 +22,7 @@ #ifndef KERNEL #include #endif -#include +#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 8f8cd6ef4..fd88793db 100644 --- a/src/des/pcbc_encrypt.c +++ b/src/des/pcbc_encrypt.c @@ -20,14 +20,14 @@ * spm 8/85 MIT project athena */ -#include +#include "mit-cpyright.h" #ifndef KERNEL #include #include #endif #include #include -#include +#include "des.h" #include "des_prototypes.h" diff --git a/src/des/quad_cksum.c b/src/des/quad_cksum.c index 58af958af..e3f183943 100644 --- a/src/des/quad_cksum.c +++ b/src/des/quad_cksum.c @@ -68,7 +68,7 @@ #include -#include +#include "mit-cpyright.h" /* System include files */ #ifndef KERNEL @@ -77,7 +77,7 @@ #include /* Application include files */ -#include +#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 de4b43a47..6b1841de3 100644 --- a/src/des/read_pssword.c +++ b/src/des/read_pssword.c @@ -15,8 +15,8 @@ #include -#include -#include +#include "mit-cpyright.h" +#include "des.h" #include "conf.h" #include diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c index 93233b416..65abd9bbb 100644 --- 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 +#include "mit-cpyright.h" #include #include @@ -29,7 +29,7 @@ #include #endif -#include +#include "des.h" #include "des_internal.h" #include "des_prototypes.h" diff --git a/src/des/util.c b/src/des/util.c index 9490d36c7..3408f7b50 100644 --- a/src/des/util.c +++ b/src/des/util.c @@ -16,7 +16,7 @@ #include #endif #include -#include +#include "des.h" #include "des_prototypes.h" int diff --git a/src/fsprobe/fsprobe.c b/src/fsprobe/fsprobe.c index 34ec2c118..a2d9a0640 100644 --- a/src/fsprobe/fsprobe.c +++ b/src/fsprobe/fsprobe.c @@ -20,7 +20,7 @@ #include -#include /*Interface for this module */ +#include "fsprobe.h" /*Interface for this module */ #include /*Lightweight process package */ #include #include diff --git a/src/fsprobe/fsprobe_test.c b/src/fsprobe/fsprobe_test.c index eaa015d40..73ca6f896 100644 --- a/src/fsprobe/fsprobe_test.c +++ b/src/fsprobe/fsprobe_test.c @@ -18,7 +18,7 @@ #include -#include /*Interface for fsprobe module */ +#include "fsprobe.h" /*Interface for fsprobe module */ #include /*------------------------------------------------------------------------ diff --git a/src/kauth/kaaux.c b/src/kauth/kaaux.c index bffc7677e..bf673a000 100644 --- a/src/kauth/kaaux.c +++ b/src/kauth/kaaux.c @@ -16,7 +16,7 @@ #include "afs/kauth.h" #else /* defined(UKERNEL) */ #include -#include "kauth.h" +#include #endif /* defined(UKERNEL) */ #define MAXBS 2048 /* try to avoid horrible allocs */ diff --git a/src/kauth/user.c b/src/kauth/user.c index 3c511551f..380b39fec 100644 --- 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 #include @@ -65,7 +65,7 @@ #include /* max ticket lifetime */ #include "kauth.h" #include "kautils.h" -#include "ktc.h" +#include #endif /* defined(UKERNEL) */ diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index 2a0f2e43d..fc63bee66 100644 --- 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 6b11521d7..7bf1f2ecf 100644 --- 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 31a4f1752..df31c9383 100644 --- 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 273a49abe..de2f4336a 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -38,11 +38,11 @@ #include -#include "rx_user.h" -#include "rx_clock.h" -#include "rx_queue.h" -#include "rx.h" -#include "rx_globals.h" +#include +#include +#include +#include +#include #define TIMEOUT 20 diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index c03a4c136..f3962a8b2 100644 --- 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 cf570a7d9..ab2d44ba5 100644 --- a/src/rxkad/domestic/crypt_conn.c +++ b/src/rxkad/domestic/crypt_conn.c @@ -45,7 +45,7 @@ #endif /* KERNEL */ #include -#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 281209a88..6b2f88b13 100644 --- 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 #include #ifdef TCRYPT diff --git a/src/rxkad/rxkad.p.h b/src/rxkad/rxkad.p.h index ce052dfd0..c57b0616f 100644 --- 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 #endif /* OPENAFS_RXKAD_RXKAD_H */ diff --git a/src/rxkad/v5gen.c b/src/rxkad/v5gen.c index 13cacaa46..b6087c47e 100644 --- a/src/rxkad/v5gen.c +++ b/src/rxkad/v5gen.c @@ -6,7 +6,7 @@ #include #include #include -#include +#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 4ce9013d4..676e66c3b 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -21,18 +21,18 @@ #endif #include #undef IN -#include /*Generic window package */ -#include /*Object definitions */ -#include /*Text object interface */ -#include /*Light object interface */ -#include /*Curses window package */ -#include /*Dumb terminal window package */ -#include /*X11 window package */ -#include /*Frame package */ -#include +#include /*Generic window package */ +#include /*Object definitions */ +#include /*Text object interface */ +#include /*Light object interface */ +#include /*Curses window package */ +#include /*Dumb terminal window package */ +#include /*X11 window package */ +#include /*Frame package */ +#include #include /*Standard I/O stuff */ -#include /*Command interpretation library */ -#include /*Interface for fsprobe module */ +#include /*Command interpretation library */ +#include /*Interface for fsprobe module */ #include #include #include diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index 0c5db238f..04c240fa8 100644 --- 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 e10751304..db397c8af 100644 --- 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 4843b5e99..464b6ce08 100644 --- 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 027e36167..3a91cf522 100644 --- a/src/tsalvaged/salvsync-debug.c +++ b/src/tsalvaged/salvsync-debug.c @@ -51,15 +51,15 @@ #include #include -#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 +#include +#include +#include +#include +#include +#include +#include +#include #ifdef AFS_NT40_ENV #include #endif diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index b749078ea..f6ece4ecb 100644 --- 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 747118de6..5b65d1988 100644 --- 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 fd7377848..f22041957 100644 --- 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 35ef79e0d..4ceafa778 100644 --- 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 20fca39ab..dffc21a1d 100644 --- 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 ad587edc5..d4c1d4d72 100644 --- 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 e49d40066..9ff0fb122 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -104,7 +104,7 @@ #include /* yuck. This is an abomination. */ #include #include -#include +#include #include #include #include diff --git a/src/viced/viced.c b/src/viced/viced.c index 9d3eef870..e034ef414 100644 --- 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 #endif #if defined(AFS_SGI_ENV) #include "sys/schedctl.h" diff --git a/src/vlserver/vldbint.xg b/src/vlserver/vldbint.xg index 54530d74b..35614f35c 100644 --- 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 /* 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 76ca13be4..a5f74cbbd 100644 --- a/src/vol/nuke.c +++ b/src/vol/nuke.c @@ -33,7 +33,6 @@ #include -#include #include "nfs.h" #include "lwp.h" #include "lock.h" diff --git a/src/vol/physio.c b/src/vol/physio.c index 4136bde42..76795673d 100644 --- 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 +#include #include "vol_internal.h" /* returns 0 on success, errno on failure */ diff --git a/src/vol/volume.c b/src/vol/volume.c index 28bb943a5..47fc80e0a 100644 --- 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 +#include #include #endif diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index 29b9431e7..4dff10bb5 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -39,18 +39,18 @@ #include #include -#include "nfs.h" +#include #include -#include "lock.h" -#include "lwp.h" +#include +#include #include -#include "ihandle.h" -#include "vnode.h" -#include "volume.h" -#include "partition.h" -#include "viceinode.h" +#include +#include +#include +#include +#include #include -#include "acl.h" +#include #include #include @@ -72,9 +72,9 @@ #include -#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 2ea92f257..186772a55 100644 --- a/src/volser/vol_split.c +++ b/src/volser/vol_split.c @@ -40,15 +40,15 @@ #include #include #include -#include "nfs.h" -#include "lwp.h" -#include "lock.h" +#include +#include +#include #include -#include "ihandle.h" -#include "vnode.h" -#include "volume.h" -#include "partition.h" -#include "viceinode.h" +#include +#include +#include +#include +#include #include "vol.h" #include "volint.h" #include "volser.h" diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 244688fb0..5bf46cb0d 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -56,7 +56,6 @@ #include #include -#include "volser.h" #include #include #include diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c index cf00cb67a..a55839835 100644 --- 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 /*Command line interpreter */ +#include /*Command line interpreter */ #include #include #include diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c index 63377b33a..22182f544 100644 --- 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 /*Command line interpreter */ +#include /*Command line interpreter */ #include #include #include -- 2.39.5