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
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
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
#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>
#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>
#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>
#include <afsconfig.h>
#include <afs/param.h>
#include <stdio.h>
-#include <aklog.h>
+#include "aklog.h"
#include <krb5.h>
#include "skipwrap.h"
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
#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>
$(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
# 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)
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) $? $@
$(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
#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. */
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 \
${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} $? $@
* 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>
#include <stdio.h>
#endif
-#include <des.h>
+#include "des.h"
#include "des_prototypes.h"
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#ifndef KERNEL
#include <stdio.h>
#endif
#endif
#endif
-#include <des.h>
+#include "des.h"
#include "des_internal.h"
#include "des_prototypes.h"
#ifndef _CONF_H_
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include "andrew-conf.h"
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
int des_debug = 0;
*
* originally written by Steve Miller, MIT Project Athena
*/
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <afsconfig.h>
#include <afs/param.h>
#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
#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 */
#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
#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"
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include "des_internal.h"
#include <stdio.h>
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <stdio.h>
#include <stdlib.h>
#endif
#endif
-#include <des.h>
+#include "des.h"
#include "des_internal.h"
#include "des_prototypes.h"
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <stdio.h>
#include "tables.h"
#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"
#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
#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"
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <stdio.h>
void
#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"
#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"
#include <afs/param.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <stdio.h>
#include "des_internal.h"
#include "s_table.h"
#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"
#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"
* without license from the U.S. Commerce department.
*/
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
#include <stdio.h>
#endif
-#include <des.h>
+#include "des.h"
#include "des_internal.h"
#include "des_prototypes.h"
* 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"
#include <afs/stds.h>
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
/* System include files */
#ifndef KERNEL
#include <errno.h>
/* Application include files */
-#include <des.h>
+#include "des.h"
#include "des_internal.h"
#include "des_prototypes.h"
#include <afs/param.h>
-#include <mit-cpyright.h>
-#include <des.h>
+#include "mit-cpyright.h"
+#include "des.h"
#include "conf.h"
#include <stdio.h>
* spm 8/85 MIT project athena
*/
-#include <mit-cpyright.h>
+#include "mit-cpyright.h"
#include <afsconfig.h>
#include <afs/param.h>
#include <stdio.h>
#endif
-#include <des.h>
+#include "des.h"
#include "des_internal.h"
#include "des_prototypes.h"
#include <stdio.h>
#endif
#include <sys/types.h>
-#include <des.h>
+#include "des.h"
#include "des_prototypes.h"
int
#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>
#include <string.h>
-#include <fsprobe.h> /*Interface for fsprobe module */
+#include "fsprobe.h" /*Interface for fsprobe module */
#include <afs/afsutil.h>
/*------------------------------------------------------------------------
#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 */
#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>
#include <rx/rxkad.h> /* max ticket lifetime */
#include "kauth.h"
#include "kautils.h"
-#include "ktc.h"
+#include <afs/ktc.h>
#endif /* defined(UKERNEL) */
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
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
${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}
${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}
${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
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}
${CCRULE}
rmtsysc.o: ${SYS}/rmtsysc.c
- ${CCRULE}
+ ${CCRULE} -I../sys
rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c
${CCRULE}
${CCRULE}
rmtsysnet.o: ${SYS}/rmtsysnet.c
- ${CCRULE}
+ ${CCRULE} -I../sys
glue.o: ${SYS}/glue.c
${CCRULE}
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
${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
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
${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
${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
${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}
#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
$(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}
#endif /* KERNEL */
#include <des/stats.h>
-#include "private_data.h"
+#include "../private_data.h"
#define XPRT_RXKAD_CRYPT
afs_int32
#include "sboxes.h"
#include "fcrypt.h"
-#include "rxkad.h"
+#include <rxkad.h>
#include <des/stats.h>
#ifdef TCRYPT
extern int rxkad_EpochWasSet; /* TRUE => we called rx_SetEpoch */
-#include "rxkad_prototypes.h"
+#include <rx/rxkad_prototypes.h>
#endif /* OPENAFS_RXKAD_RXKAD_H */
#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
#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>
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
${CCRULE}
ticket5.o: ${RXKAD}/ticket5.c
- ${CCRULE}
+ ${CCRULE} -I../rxkad -I${RXKAD}
crc.o: ${RXKAD}/crc.c
${CCRULE}
${CCRULE}
fcrypt.o: ${RXKAD}/domestic/fcrypt.c
- ${CCRULE}
+ ${CCRULE} -I../rxkad -I${RXKAD}
crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
${CCRULE}
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}
${CCRULE}
netutils.o: ${UTIL}/netutils.c
- ${CCRULE}
+ ${CCRULE} -I ../util
dirpath.o: ${UTIL}/dirpath.c
${CCRULE}
#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
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 $?
${CCRULE}
netutils.o: ${UTIL}/netutils.c
- ${CCRULE}
+ ${CCRULE} -I../util
dirpath.o: ${UTIL}/dirpath.c
${CCRULE}
${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}
${CCRULE}
afsaux.o: ${FSINT}/afsaux.c
- ${CCRULE}
+ ${CCRULE} -I../fsint
afscbint.cs.o: ${FSINT}/afscbint.cs.c
${CCRULE}
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 $?
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
${COMPILE}
netutils.o: ${UTIL}/netutils.c
- ${COMPILE}
+ ${COMPILE} -I../util
dirpath.o: ${UTIL}/dirpath.c
${COMPILE}
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
-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
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
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}
#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>
#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"
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)
#include <afs/afsutil.h>
-#include <afs/assert.h>
#include "nfs.h"
#include "lwp.h"
#include "lock.h"
#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 */
#endif /* AFS_PTHREAD_ENV */
#include "vutils.h"
#ifndef AFS_NT40_ENV
-#include <dir/dir.h>
+#include <afs/dir.h>
#include <unistd.h>
#endif
#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>
#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
#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"
#include <fcntl.h>
#include <sys/stat.h>
-#include "volser.h"
#include <errno.h>
#include <afs/audit.h>
#include <afs/afsutil.h>
#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>
#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>