From 580af44321feb2df60aae0a9c79dc8f10a6139b3 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Sat, 11 Jan 2003 07:33:52 +0000 Subject: [PATCH] makefiles-cflag-cleanup-20030111 move cflags back to makefile.config, more cleanup, dup removal --- acinclude.m4 | 26 ++-- src/JAVA/libjafs/Makefile.in | 4 +- src/afsd/Makefile.in | 21 +-- src/afsmonitor/Makefile.in | 8 -- src/auth/Makefile.in | 1 - src/bozo/Makefile.in | 1 - src/bu_utils/Makefile.in | 5 +- src/bubasics/Makefile.in | 2 - src/bucoord/Makefile.in | 3 - src/budb/Makefile.in | 2 - src/butc/Makefile.in | 6 - src/butm/Makefile.in | 3 - src/cf/linux-test5.m4 | 16 +++ src/cf/osconf.m4 | 104 +++++++++----- src/cmd/Makefile.in | 2 - src/comerr/Makefile.in | 2 - src/config/Makefile.config.in | 17 ++- src/config/Makefile.in | 2 +- src/dauth/Makefile.in | 3 - src/des/Makefile.in | 4 +- src/dir/Makefile.in | 3 - src/export/Makefile.in | 4 - src/finale/Makefile.in | 2 - src/fsint/Makefile.in | 1 - src/fsprobe/Makefile.in | 7 - src/ftpd43+/Makefile.in | 2 - src/gtx/Makefile.in | 4 - src/inetd/Makefile.in | 10 +- src/kauth/Makefile.in | 15 +- src/libacl/Makefile.in | 3 - src/libadmin/Makefile.in | 1 - src/libadmin/adminutil/Makefile.in | 2 +- src/libadmin/bos/Makefile.in | 2 +- src/libadmin/cfg/Makefile.in | 2 +- src/libadmin/cfg/test/Makefile.in | 2 +- src/libadmin/client/Makefile.in | 2 +- src/libadmin/kas/Makefile.in | 3 +- src/libadmin/pts/Makefile.in | 2 +- src/libadmin/samples/Makefile.in | 11 +- src/libadmin/test/Makefile.in | 7 +- src/libadmin/vos/Makefile.in | 3 +- src/libafs/Makefile.common.in | 218 ++++++++++++++--------------- src/libafs/MakefileProto.AIX.in | 10 +- src/libafs/MakefileProto.FBSD.in | 4 +- src/libafs/MakefileProto.LINUX.in | 53 +++---- src/libafsauthent/Makefile.in | 3 +- src/libafsrpc/Makefile.in | 6 +- src/log/Makefile.in | 5 - src/login/Makefile.in | 3 - src/lwp/Makefile.in | 17 +-- src/mpp/Makefile.in | 25 ++-- src/null/Makefile.in | 3 - src/package/Makefile.in | 29 +--- src/pinstall/Makefile.in | 13 +- src/procmgmt/Makefile.in | 3 - src/ptserver/Makefile.in | 7 +- src/rcp/Makefile.in | 2 +- src/rx/Makefile.in | 2 +- src/rxdebug/Makefile.in | 4 +- src/rxgen/Makefile.in | 6 +- src/rxkad/Makefile.in | 4 +- src/rxstat/Makefile.in | 2 - src/scout/Makefile.in | 8 -- src/shlibafsauthent/Makefile.in | 4 +- src/shlibafsrpc/Makefile.in | 5 +- src/sia/Makefile.in | 21 ++- src/sys/Makefile.in | 1 - src/tbutc/Makefile.in | 8 +- src/tests/Makefile.in | 4 +- src/tviced/Makefile.in | 95 ++++++------- src/ubik/Makefile.in | 4 +- src/update/Makefile.in | 2 - src/util/Makefile.in | 4 - src/venus/Makefile.in | 68 ++++----- src/vfsck/Makefile.in | 4 +- src/viced/Makefile.in | 9 +- src/vlserver/Makefile.in | 1 - src/vol/Makefile.in | 10 +- src/volser/Makefile.in | 7 - src/xstat/Makefile.in | 7 - 80 files changed, 428 insertions(+), 573 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 92ac69d50..5562757c6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -54,6 +54,21 @@ AC_ARG_ENABLE(tivoli-tsm, AC_ARG_ENABLE(debug-kernel, [ --enable-debug-kernel enable compilation of the kernel module with debugging information (defaults to disabled)],, enable_debug_kernel="no" ) +AC_ARG_ENABLE(optimize-kernel, +[ --disable-optimize-kernel disable compilation of the kernel module with optimization (defaults based on platform)],, enable_optimize_kernel="yes" +) +AC_ARG_ENABLE(debug, +[ --enable-debug enable compilation of the user space code with debugging information (defaults to disabled)],, enable_debug="no" +) +AC_ARG_ENABLE(optimize, +[ --disable-optimize disable optimization for compilation of the user space code (defaults to enabled)],, enable_optimize="yes" +) +AC_ARG_ENABLE(debug-lwp, +[ --enable-debug-lwp enable compilation of the LWP code with debugging information (defaults to disabled)],, enable_debug_lwp="no" +) +AC_ARG_ENABLE(optimize-lwp, +[ --disable-optimize-lwp disable optimization for compilation of the LWP code (defaults to enabled)],, enable_optimize_lwp="yes" +) dnl weird ass systems AC_AIX @@ -74,11 +89,6 @@ AM_PROG_LEX OPENAFS_CHECK_BIGENDIAN -KERN_DEBUG_OPT= -if test "x$enable_debug_kernel" = "xyes"; then - KERN_DEBUG_OPT=-g -fi - AC_MSG_CHECKING(your OS) system=$host case $system in @@ -129,16 +139,15 @@ case $system in fi AC_MSG_RESULT(linux) if test "x$enable_kernel_module" = "xyes"; then - OMIT_FRAME_POINTER= if test "x$enable_debug_kernel" = "xno"; then - OMIT_FRAME_POINTER=-fomit-frame-pointer + LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fomit-frame-pointer" fi - AC_SUBST(OMIT_FRAME_POINTER) OPENAFS_GCC_SUPPORTS_MARCH AC_SUBST(P5PLUS_KOPTS) OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING OPENAFS_GCC_SUPPORTS_NO_COMMON + OPENAFS_GCC_SUPPORTS_PIPE AC_SUBST(LINUX_GCC_KOPTS) ifdef([OPENAFS_CONFIGURE_LIBAFS], [LINUX_BUILD_VNODE_FROM_INODE(src/config,afs)], @@ -307,7 +316,6 @@ case $system in AC_MSG_RESULT($system) ;; esac -AC_SUBST(KERN_DEBUG_OPT) if test "x$with_afs_sysname" != "x"; then AFS_SYSNAME="$with_afs_sysname" diff --git a/src/JAVA/libjafs/Makefile.in b/src/JAVA/libjafs/Makefile.in index 24bc8e6c5..9d03a7477 100644 --- a/src/JAVA/libjafs/Makefile.in +++ b/src/JAVA/libjafs/Makefile.in @@ -34,10 +34,10 @@ OBJECT_FLAGS = -fPIC -c ifeq "$(BUILD_TYPE)" "admin" INC := -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ -I${JAVA_HOME}/include ${JNI_INC} - CFLAGS := ${INC} ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config ${MT_CFLAGS} + CFLAGS := ${INC} ${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config ${MT_CFLAGS} else INC := -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} -I${JAVA_HOME}/include ${JNI_INC} - CFLAGS := ${INC} ${FSINCLUDES} -D_REENTRANT -DLIBJUAFS ${DBUG} ${MT_CFLAGS} + CFLAGS := ${INC} ${DBG} ${OPTMZ} ${FSINCLUDES} -D_REENTRANT -DLIBJUAFS ${MT_CFLAGS} endif diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 4e0144312..2a91dffe6 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -9,12 +9,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=$(DBG) -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${XLDFLAGS} -INSTALLex = ${INSTALL} -m 755 - # # What to make # @@ -26,18 +22,11 @@ all: afsd vsys AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a -afsd: afsd.o $(AFSLIBS) - case ${SYS_NAME} in \ - sgi_61 | sgi_62 | sgi_63) \ - ${CC} ${CFLAGS} $(DBG) -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \ - sgi_64 | sgi_65 ) \ - ${CC} ${CFLAGS} $(DBG) -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \ - * ) \ - ${CC} ${CFLAGS} $(DBG) -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \ - esac +afsd: afsd.o $(AFSLIBS) $(AFSD_LIBS) + ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ${AFSD_LIBS} vsys: vsys.o - $(CC) $(DBG) -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} + ${CC} ${CFLAGS} -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} # # Objects @@ -97,10 +86,10 @@ dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys hp?00_ux10? ) \ ${INSTALL} -f ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ *linux* ) \ - ${INSTALLex} -f ${srcdir}/afs.rc.linux ${DEST}/root.client/usr/vice/etc/afs.rc; \ + ${INSTALL} -f ${srcdir}/afs.rc.linux -m 755 ${DEST}/root.client/usr/vice/etc/afs.rc; \ ${INSTALL} -f ${srcdir}/afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \ ppc_darwin*) \ - ${INSTALLex} -f ${srcdir}/afs.rc.darwin ${DEST}/root.client/usr/vice/etc/afs.rc ; \ + ${INSTALL} -f ${srcdir}/afs.rc.darwin -m 755 ${DEST}/root.client/usr/vice/etc/afs.rc ; \ ${INSTALL} -f ${srcdir}/afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \ *fbsd*) \ ${INSTALL} -f ${srcdir}/afs.rc.fbsd ${DEST}/root.client/usr/vice/etc/afs.rc.fbsd ;; \ diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 16cdc4d90..3ac36b9ed 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -8,14 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=$(DBG) -I. \ - -I${TOP_OBJDIR}/src/config \ - -I${TOP_INCDIR} \ - -I${TOP_INCDIR}/afs \ - ${XCFLAGS} -LDFLAGS = ${XLDFLAGS} - INCLS=${TOP_INCDIR}/afs/gtxobjects.h \ ${TOP_INCDIR}/afs/gtxwindows.h \ ${TOP_INCDIR}/afs/gtxcurseswin.h \ diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 8caf9d5da..f768f1b77 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -13,7 +13,6 @@ OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \ KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o -CFLAGS=$(DBG) -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LIBS=libauth.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index afb46a2b9..ecf24f628 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -8,7 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=$(DBG) -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h bosint.h INCLS=bnode.h \ diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index b7cca6e2f..afe22bffc 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -8,10 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=$(DBG) -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} -LDFLAGS = ${XLDFLAGS} - all: fms FMSLIBS=${TOP_LIBDIR}/libcmd.a \ @@ -34,6 +30,7 @@ clean: $(RM) -f *.o fms AFS_component_version_number.c include ../config/Makefile.version + ${DESTDIR}${sbindir}/fms: fms ${INSTALL} $? $@ diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index 8a5556b61..77eec29d7 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} - all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/tcdata.h ${TOP_INCDIR}/afs/butm.h ${TOP_INCDIR}/afs/butx.h OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index 05bd40b8e..c40c2d07c 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${DBUG} -w -I${TOP_OBJDIR}/src/config \ - -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} - LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/libbutm.a ${TOP_LIBDIR}/libvolser.a \ ${TOP_LIBDIR}/libvldb.a ${TOP_LIBDIR}/vlib.a \ diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 1f6d2f4a4..2fd13d585 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -9,8 +9,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=$(DBG) -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = $(DBG) ${XLDFLAGS} INCLS=\ ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/ubik.h \ diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index aea41f6a4..b34df9ab6 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -8,12 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=$(DBG) -w ${INCDIRS} ${XCFLAGS} - -INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs \ - -I${TOP_INCDIR}/rx -I${TOP_INCDIR} - INCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \ ${TOP_INCDIR}/afs/vlserver.h ${TOP_INCDIR}/rx/rx.h \ ${TOP_INCDIR}/rx/xdr.h ${TOP_INCDIR}/afs/keys.h \ diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index bc11e019f..d2d585359 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=$(DBG) -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = $(DBG) ${XLDFLAGS} INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h LIBS=${TOP_LIBDIR}/libbubasics.a \ diff --git a/src/cf/linux-test5.m4 b/src/cf/linux-test5.m4 index 97ce80ba7..73724f66c 100644 --- a/src/cf/linux-test5.m4 +++ b/src/cf/linux-test5.m4 @@ -69,3 +69,19 @@ fi CFLAGS="$save_CFLAGS" ]) +AC_DEFUN(OPENAFS_GCC_SUPPORTS_PIPE, [ +AC_MSG_CHECKING(if $CC supports -pipe) +save_CFLAGS="$CFLAGS" +CFLAGS="-pipe" +AC_CACHE_VAL(openafs_gcc_supports_pipe,[ +AC_TRY_COMPILE( +[], +[int x;], +openafs_gcc_supports_pipe=yes, +openafs_gcc_supports_pipe=no)]) +AC_MSG_RESULT($openafs_gcc_supports_pipe) +if test x$openafs_gcc_supports_pipe = xyes; then + LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -pipe" +fi +CFLAGS="$save_CFLAGS" +]) diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 1cb5431d2..26b082b13 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -2,14 +2,22 @@ AC_DEFUN(OPENAFS_OSCONF, [ dnl defaults, override in case below as needed -DBG="-g" -OPTMZ="-O2" -XCFLAGS="-O2" +XCFLAGS='${DBG} ${OPTMZ}' SHLIB_SUFFIX="so" CC="cc" MT_CC="cc" XLIBS="${LIB_AFSDB}" +dnl debugging and optimization flag defaults +dnl Note, these are all the defaults for if debug/optimize turned on, and +dnl the arch cases below do not override +KERN_DBG=-g +KERN_OPTMZ=-O +DBG=-g +OPTMZ=-O +LWP_DBG=-g +LWP_OPTMZ=-O + dnl standard programs AC_PROG_RANLIB AC_CHECK_PROGS(AS, as, [${am_missing_run}as]) @@ -21,12 +29,13 @@ AC_CHECK_PROGS(CP, cp, [${am_missing_run}cp]) AC_CHECK_PROGS(STRIP, strip, [${am_missing_run}strip]) AC_CHECK_PROGS(LORDER, lorder, [${am_missing_run}lorder]) +dnl TODO - need to disable STRIP if we are doing debugging in any user space code + case $AFS_SYSNAME in alpha_dux40) LEX="lex" CSTATIC="-non_shared" DBG="-g3" - LWP_OPTMZ="-O2" MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-pthread -lpthread -lmach -lexc -lc" TXLIBS="-lcurses" @@ -38,7 +47,6 @@ case $AFS_SYSNAME in LEX="flex -l" DBG="-g3" CSTATIC="-non_shared" - LWP_OPTMZ="-O2" MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-pthread -lpthread -lmach -lexc -lc" TXLIBS="-lcurses" @@ -59,6 +67,7 @@ case $AFS_SYSNAME in ;; alpha_linux_22) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -71,6 +80,7 @@ case $AFS_SYSNAME in ;; alpha_linux_24) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -167,6 +177,7 @@ case $AFS_SYSNAME in ;; ia64_linux24) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -180,6 +191,7 @@ case $AFS_SYSNAME in i386_linux22) CC="gcc -pipe" MT_CC="gcc -pipe" + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -194,9 +206,15 @@ case $AFS_SYSNAME in i386_linux24) CC="gcc -pipe" MT_CC="gcc -pipe" + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" + DBG=-g + KERN_DBG=-g + LWP_DBG=-g + LWP_OPTMZ=-O2 + OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="/usr/lib/libncurses.so" @@ -218,6 +236,7 @@ case $AFS_SYSNAME in ;; parisc_linux24) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -231,8 +250,6 @@ case $AFS_SYSNAME in ppc_darwin_12) LEX="lex -l" - LWP_OPTMZ="-g" - OPTMZ="-g" REGEX_OBJ="regex.o" XCFLAGS="-traditional-cpp" ;; @@ -261,6 +278,7 @@ case $AFS_SYSNAME in ppc_linux22) INSTALL="install" + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -273,6 +291,7 @@ case $AFS_SYSNAME in ;; ppc_linux24) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -288,11 +307,9 @@ case $AFS_SYSNAME in DBG="" LEX="lex" LIBSYS_AIX_EXP="afsl.exp" - LWP_OPTMZ="-O" MT_CC="xlc_r" MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" - OPTMZ="-O" SHLIB_SUFFIX="o" TXLIBS="-lcurses" XCFLAGS="-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void" @@ -304,11 +321,9 @@ case $AFS_SYSNAME in DBG="" LEX="lex" LIBSYS_AIX_EXP="afsl.exp" - LWP_OPTMZ="-O" MT_CC="xlc_r" MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" - OPTMZ="-O" SHLIB_SUFFIX="o" TXLIBS="-lcurses" XCFLAGS="-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void" @@ -319,11 +334,11 @@ case $AFS_SYSNAME in s390_linux22) CC="gcc" LD="gcc" + KERN_OPTMZ=-O2 LEX="flex -l" MT_CC="$CC" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" - OPTMZ="-O" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="/usr/lib/libncurses.so" @@ -335,11 +350,11 @@ case $AFS_SYSNAME in s390_linux24) CC="gcc" LD="gcc" + KERN_OPTMZ=-O2 LEX="flex -l" MT_CC="$CC" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" - OPTMZ="-O" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="/usr/lib/libncurses.so" @@ -349,12 +364,12 @@ case $AFS_SYSNAME in ;; sgi_62) + PINSTALL_LIBS=-lmld + AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a" FSINCLUDES="-I/usr/include/sys/fs" LEX="lex" - LWP_OPTMZ="-O" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - OPTMZ="-O" TXLIBS="-lcurses" XCFLAGS64="-64 -mips3" XCFLAGS="-o32" @@ -364,12 +379,12 @@ case $AFS_SYSNAME in ;; sgi_63) + PINSTALL_LIBS=-lmld + AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a" FSINCLUDES="-I/usr/include/sys/fs" LEX="lex" - LWP_OPTMZ="-O" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - OPTMZ="-O" TXLIBS="-lcurses" XCFLAGS64="-D_BSD_COMPAT -64 -mips3" XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32" @@ -379,12 +394,11 @@ case $AFS_SYSNAME in ;; sgi_64) + AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a" FSINCLUDES="-I/usr/include/sys/fs" LEX="lex" - LWP_OPTMZ="-O" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - OPTMZ="-O" TXLIBS="-lcurses" XCFLAGS64="-D_BSD_COMPAT -64 -mips3" XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552" @@ -394,6 +408,7 @@ case $AFS_SYSNAME in ;; sgi_65) + AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a" CC="/usr/bin/cc" FSINCLUDES="-I/usr/include/sys/fs" LD="/usr/bin/ld" @@ -401,7 +416,6 @@ case $AFS_SYSNAME in MT_CC="/usr/bin/cc" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - OPTMZ="-O" TXLIBS="-lcurses" XCFLAGS64="-64 -mips3" XCFLAGS="-n32 -mips3 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552" @@ -411,6 +425,7 @@ case $AFS_SYSNAME in ;; sparc64_linux22) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -423,6 +438,7 @@ case $AFS_SYSNAME in ;; sparc64_linux24) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -435,6 +451,7 @@ case $AFS_SYSNAME in ;; sparc_linux22) + KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" @@ -447,10 +464,9 @@ case $AFS_SYSNAME in ;; sun4_413) + CCXPG2="/usr/xpg2bin/cc" CC="gcc" LEX="lex" - LWP_OPTMZ="-O" - OPTMZ="-O" SHLIB_CFLAGS="-PIC" TXLIBS="-lcurses -ltermcap" XCFLAGS="" @@ -463,11 +479,9 @@ case $AFS_SYSNAME in sun4x_55) CC="/opt/SUNWspro/bin/cc" LEX="lex" - LWP_OPTMZ="-g" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" SHLIB_CFLAGS="-KPIC" TXLIBS="-lcurses" XCFLAGS="-dy -Bdynamic" @@ -481,11 +495,9 @@ case $AFS_SYSNAME in sun4x_56) CC="/opt/SUNWspro/bin/cc" LEX="lex" - LWP_OPTMZ="-g" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" PAM_CFLAGS="-KPIC" PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" @@ -503,11 +515,9 @@ case $AFS_SYSNAME in CC="/opt/SUNWspro/bin/cc" LEX="lex" LD="/usr/ccs/bin/ld" - LWP_OPTMZ="-g" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" PAM_CFLAGS="-KPIC" PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" @@ -525,11 +535,9 @@ case $AFS_SYSNAME in CC="/opt/SUNWspro/bin/cc" LEX="lex" LD="/usr/ccs/bin/ld" - LWP_OPTMZ="-g" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" PAM_CFLAGS="-KPIC" PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" @@ -546,12 +554,10 @@ case $AFS_SYSNAME in sun4x_59) CC="/opt/SUNWspro/bin/cc" LEX="lex" - LWP_OPTMZ="-g" LD="/usr/ccs/bin/ld" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" PAM_CFLAGS="-KPIC" PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" @@ -568,12 +574,10 @@ case $AFS_SYSNAME in sunx86_57) CC="/opt/SUNWspro/bin/cc" LEX="lex" - LWP_OPTMZ="-g" LD="/usr/ccs/bin/ld" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" PAM_CFLAGS="-KPIC" PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" @@ -591,12 +595,10 @@ case $AFS_SYSNAME in sunx86_58) CC="/opt/SUNWspro/bin/cc" LEX="lex" - LWP_OPTMZ="-g" LD="/usr/ccs/bin/ld" MT_CC="/opt/SUNWspro/bin/cc" MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" - OPTMZ="-O" PAM_CFLAGS="-KPIC" PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" @@ -648,14 +650,43 @@ case $AFS_SYSNAME in ;; esac +dnl Disable the default for debugging/optimization if not enabled +if test "x$enable_debug_kernel" = "xno"; then + KERN_DBG= +fi + +if test "x$enable_optimize_kernel" = "xno"; then + KERN_OPTMZ= +fi + +if test "x$enable_debug" = "xno"; then + DBG= +fi + +if test "x$enable_optimize" = "xno"; then + OPTMZ= +fi + +if test "x$enable_debug_lwp" = "xno"; then + LWP_DBG= +fi + +if test "x$enable_optimize_lwp" = "xno"; then + LWP_OPTMZ= +fi +AC_SUBST(CCXPG2) +AC_SUBST(AFSD_LIBS) AC_SUBST(AR) AC_SUBST(AS) AC_SUBST(CP) AC_SUBST(DBG) AC_SUBST(FSINCLUDES) +AC_SUBST(KERN_DBG) +AC_SUBST(KERN_OPTMZ) AC_SUBST(LD) AC_SUBST(LEX) +AC_SUBST(LWP_DBG) AC_SUBST(LWP_OPTMZ) AC_SUBST(MT_CC) AC_SUBST(MT_CFLAGS) @@ -664,6 +695,7 @@ AC_SUBST(MV) AC_SUBST(OPTMZ) AC_SUBST(PAM_CFLAGS) AC_SUBST(PAM_LIBS) +AC_SUBST(PINSTALL_LIBS) AC_SUBST(RANLIB) AC_SUBST(REGEX_OBJ) AC_SUBST(RM) diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index 37ba84639..73dd0aa28 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -11,8 +11,6 @@ include @TOP_OBJDIR@/src/config/Makefile.config LIBOBJS=cmd_errors.o cmd.o LIB64OBJS=cmd_errors64.o cmd64.o -CFLAGS=${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} - all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h all64: all ${TOP_LIBDIR}/libcmd64.a diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index c661998ca..e5ec12d9a 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -7,8 +7,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config -I. -I${srcdir} ${XCFLAGS} - all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a et_lex.lex.c: et_lex.lex.l diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 694203a9f..ce0e9caa0 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -29,13 +29,17 @@ viceetcdir=@viceetcdir@ # AR = @AR@ AS = @AS@ +AFSD_LIBS = @AFSD_LIBS@ CC = @CC@ +CCXPG2 = @CCXPG2@ CFLAGS = @CFLAGS@ CP = @CP@ DARWIN_INFOFILE=@DARWIN_INFOFILE@ DBG = @DBG@ DEST = @DEST@ FSINCLUDES = @FSINCLUDES@ +KERN_DBG = @KERN_DBG@ +KERN_OPTMZ = @KERN_OPTMZ@ LD = @LD@ LEX = @LEX@ LIB_AFSDB = @LIB_AFSDB@ @@ -44,6 +48,7 @@ LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@ LINUX_VERSION = @LINUX_VERSION@ LINUX_VERS = @LINUX_VERSION@ LWP_OPTMZ = @LWP_OPTMZ@ +LWP_DBG = @LWP_DBG@ MKAFS_OSTYPE = @MKAFS_OSTYPE@ AFS_PARAM_COMMON = @AFS_PARAM_COMMON@ MT_CC = @MT_CC@ @@ -53,6 +58,7 @@ MV = @MV@ OPTMZ = @OPTMZ@ PAM_CFLAGS = @PAM_CFLAGS@ PAM_LIBS = @PAM_LIBS@ +PINSTALL_LIBS = @PINSTALL_LIBS@ RANLIB = @RANLIB@ REGEX_OBJ = @REGEX_OBJ@ RM = @RM@ @@ -77,7 +83,6 @@ XLIBKVM = @XLIBKVM@ XLIBS = @XLIBS@ YACC = @YACC@ - # # Special build targets # @@ -110,3 +115,13 @@ INSTALL = ${TOP_OBJDIR}/src/pinstall/pinstall INSTALLex = ${INSTALL} -m 755 RXGEN = ${TOP_OBJDIR}/src/rxgen/rxgen 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 +COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL} + +CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} +LDFLAGS=${XLDFLAGS} diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 9b8e1c1ef..d973646dd 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -8,7 +8,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=$(DBG) -I${TOP_INCDIR} -I. ${XCFLAGS} +CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} -I. ${XCFLAGS} INST=$(RM) -f $@; $(CP) $? $@ diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in index f7e3d0f40..693c8157c 100644 --- a/src/dauth/Makefile.in +++ b/src/dauth/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = ${OPTMZ} ${XLDFLAGS} - INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ diff --git a/src/des/Makefile.in b/src/des/Makefile.in index 00dc088db..ac46e5d2a 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -25,8 +25,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -LDFLAGS = ${XLDFLAGS} - OBJS = \ des.o \ cbc_encrypt.o \ @@ -56,7 +54,7 @@ all: \ # Build rules # .c.o: - ${CC} -c -I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS} $< + ${CC} -c ${CFLAGS} $< libdes.a: ${OBJS} AFS_component_version_number.o $(RM) -f libdes.a diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index af7212ccb..06cf26793 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XINCLS} -CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} - all: \ ${TOP_LIBDIR}/libdir.a \ depinstall diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 0cacb93aa..893937189 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -8,10 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - OPTMZ = -g - DEFS = - INCS = -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} - CFLAGS = ${OPTMZ} ${DEFS} ${INCS} EXPORTS = -bexport:export.exp IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp KOBJ = export.o symtab.o diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index c620cabf1..a7350292f 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=$(DBG) -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = $(DBG) ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 045c2281c..6903771bf 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -9,7 +9,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o -CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} all: \ ${TOP_LIBDIR}/libafsint.a depinstall diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index b71f92c9a..c3ab825a4 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -8,13 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=$(DBG) -I. \ - -I${TOP_OBJDIR}/src/config \ - -I${TOP_INCDIR} \ - -I${TOP_INCDIR}/afs \ - -I${SRCDIR} \ - -I/usr/include ${XCFLAGS} - RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h INCLS=fsprobe.h ${RPCINCLS} diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in index 10ce44f5d..027e8ea17 100644 --- a/src/ftpd43+/Makefile.in +++ b/src/ftpd43+/Makefile.in @@ -18,7 +18,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - include ../config/Makefile.version AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \ @@ -28,7 +27,6 @@ AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libaudit.a LIBS = ${AFSLIBS} -CFLAGS=${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS} LIBC= /lib/libc.a SRCS= ftpd.c ftpcmd.c getusershell.c glob.c logwtmp.c popen.c vers.c OBJS= ftpd.o ftpcmd.o getusershell.o glob.o logwtmp.o popen.o vers.o diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index db94fe625..bbadd6b52 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -10,10 +10,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \ - -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} -LDFLAGS = ${XLDFLAGS} - INCLS=gtxobjects.h \ gtxwindows.h \ gtxcurseswin.h \ diff --git a/src/inetd/Makefile.in b/src/inetd/Makefile.in index 774889c51..2fead047e 100644 --- a/src/inetd/Makefile.in +++ b/src/inetd/Makefile.in @@ -1,8 +1,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -INCLUDES = -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -DEFINES = ${INCLUDES} AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a\ ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librx.a \ @@ -10,10 +8,8 @@ AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a\ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/librxkad.a\ ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a -LIBRES = LIBS = ${AFSLIBS} ${LIBRES} ${XLIBS} OBJS = inetd.o setenv.o getenv.o -CFLAGS = ${DEFINES} ${DBUG} ${XCFLAGS} include ../config/Makefile.version @@ -26,11 +22,9 @@ inetd: ${OBJS} set -x; \ case "${SYS_NAME}" in \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_dux?? ) \ - ${CC} -o $@ ${DEFINES} ${OBJS} ${LIBS} -lutil ;; \ - sgi_6* ) \ - ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ;; \ + ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS} -lutil ;; \ *) \ - ${CC} -o $@ ${DEFINES} ${OBJS} ${LIBS} ;; \ + ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS} ;; \ esac inetd.o: inetd.c AFS_component_version_number.c diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 7281f876e..921267042 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = ${OPTMZ} ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ @@ -31,7 +29,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a \ - ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libafsutil.a \ $(DBM) UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \ @@ -48,7 +46,7 @@ KLIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/libafsutil.a OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o @@ -199,14 +197,13 @@ kdb.o: kdb.c AFS_component_version_number.o krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h ${TOP_INCDIR}/lwp.h AFS_component_version_number.o -krb_udp: krb_udp.o libkauth.a - ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libutil.a ${TOP_LIBDIR}/libaudit.a +krb_udp: krb_udp.o libkauth.a $(KLIBS) + ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a $(KLIBS) rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o -rebuild: rebuild.o kautils.o ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libdes.a - ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \ - ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libdes.a ${XLIBS} ${TOP_LIBDIR}/libcmd.a +rebuild: rebuild.o kautils.o $(LIBS) + ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o $(LIBS) # # Install targets diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index 0e64e941e..82fdda1e7 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS = ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ - -I${TOP_INCDIR}/afs ${LIBS} ${XCFLAGS} - # # Main targets # diff --git a/src/libadmin/Makefile.in b/src/libadmin/Makefile.in index 022e72ca8..7b05d66b5 100644 --- a/src/libadmin/Makefile.in +++ b/src/libadmin/Makefile.in @@ -8,7 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - all: ${TOP_INCDIR}/afs/afs_Admin.h install: ${DESTDIR}${includedir}/afs/afs_Admin.h diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 0b1c4c205..4187901cc 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -9,7 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? RXKAD = ../../rxkad AUTH = ../../auth diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in index 91e79a22b..e163eff78 100644 --- a/src/libadmin/bos/Makefile.in +++ b/src/libadmin/bos/Makefile.in @@ -9,7 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? BOZO = ../../bozo/ diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in index 59ca01b77..60cea89f5 100644 --- a/src/libadmin/cfg/Makefile.in +++ b/src/libadmin/cfg/Makefile.in @@ -8,7 +8,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? UBIKOBJS=\ diff --git a/src/libadmin/cfg/test/Makefile.in b/src/libadmin/cfg/test/Makefile.in index dd99d1c56..1c97120f4 100644 --- a/src/libadmin/cfg/test/Makefile.in +++ b/src/libadmin/cfg/test/Makefile.in @@ -9,7 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -DAFS_PTHREAD_ENV -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS = ${DBG} ${OPTMZ} -DAFS_PTHREAD_ENV -I${SRCDIR}/include ${MT_CFLAGS} ######################################################################## diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in index 42cd5d69a..9ec438d5d 100644 --- a/src/libadmin/client/Makefile.in +++ b/src/libadmin/client/Makefile.in @@ -9,7 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} ADMINOBJS = afs_clientAdmin.o diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index 3936de4c8..b83da47c1 100644 --- a/src/libadmin/kas/Makefile.in +++ b/src/libadmin/kas/Makefile.in @@ -9,8 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} \ - -I../../kauth -I${srcdir}/../../kauth +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -I../../kauth -I${srcdir}/../../kauth CCRULE = ${CC} ${CFLAGS} -c $? KAUTH= ${srcdir}/../../kauth/ diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in index 0d08af27a..fd28e1e14 100644 --- a/src/libadmin/pts/Makefile.in +++ b/src/libadmin/pts/Makefile.in @@ -9,7 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? PTSERVER = ../../ptserver/ diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index af041bbdf..a552c2cf9 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -8,14 +8,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - - CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} - - -######################################################################## -# build tests +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} SAMPLEPROGS=\ cm_client_config \ @@ -46,7 +40,8 @@ SAMPLELIBS =\ ${TOP_LIBDIR}/libvosadmin.a \ ${TOP_LIBDIR}/libbosadmin.a \ ${TOP_LIBDIR}/libafsauthent.a \ - ${TOP_LIBDIR}/libafsrpc.a + ${TOP_LIBDIR}/libafsrpc.a \ + $(TOP_LIBDIR)/libafsutil.a cm_client_config: cm_client_config.o $(SAMPLELIBS) $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index 9307669ac..7281cc5b8 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -8,10 +8,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} - +CFLAGS = ${COMMON_CFLAGS} ${MT_CFLAGS} ######################################################################## # build tests @@ -25,7 +23,8 @@ AFSCPLIBS =\ $(TOP_LIBDIR)/libptsadmin.a \ $(TOP_LIBDIR)/libafsauthent.a \ $(TOP_LIBDIR)/libafsrpc.a \ - $(TOP_LIBDIR)/libcmd.a # static library + $(TOP_LIBDIR)/libcmd.a \ + $(TOP_LIBDIR)/libafsutil.a AFSCPOBJS =\ bos.o \ diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in index e81eeb954..ac23bf5af 100644 --- a/src/libadmin/vos/Makefile.in +++ b/src/libadmin/vos/Makefile.in @@ -8,9 +8,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${MT_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? VLSERVER = ../../vlserver/ diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in index 2bd0c74eb..9e1ffa170 100644 --- a/src/libafs/Makefile.common.in +++ b/src/libafs/Makefile.common.in @@ -47,10 +47,8 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \ .c.o: $(CC) $(COMMON_INCLUDE) $(CFLAGS) -c $< -CRULE1= $(CC) $(COMMON_INCLUDE) $(CFLAGS) -c $? -CRULE2= $(CC) $(COMMON_INCLUDE) $(OPTF) $(CFLAGS) -c $? -CRULE3= $(CC) $(COMMON_INCLUDE) $(OPTF2) $(CFLAGS) -c $? -CRULE4= $(CC) $(COMMON_INCLUDE) $(DBG) $(CFLAGS) -c $? +CRULE_NOOPT= $(CC) $(COMMON_INCLUDE) ${DBG} $(CFLAGS) -c $? +CRULE_OPT= $(CC) $(COMMON_INCLUDE) ${DBG} ${OPTMZ} $(CFLAGS) -c $? system: all @@ -172,227 +170,227 @@ AFSNONFSOBJS = \ # Compilation rules # These files are to be optimized afs_base64.o: $(TOP_SRC_AFS)/afs_base64.c - $(CRULE1) + $(CRULE_NOOPT) afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c - $(CRULE2) + $(CRULE_OPT) afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c - $(CRULE2) + $(CRULE_OPT) afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c - $(CRULE2) + $(CRULE_OPT) afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c - $(CRULE2) + $(CRULE_OPT) afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c - $(CRULE2) + $(CRULE_OPT) afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c - $(CRULE2) + $(CRULE_OPT) afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c - $(CRULE2) + $(CRULE_OPT) afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c - $(CRULE2) + $(CRULE_OPT) afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c - $(CRULE2) + $(CRULE_OPT) afs_init.o: $(TOP_SRC_AFS)/afs_init.c - $(CRULE2) + $(CRULE_OPT) afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c - $(CRULE2) + $(CRULE_OPT) afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c - $(CRULE2) + $(CRULE_OPT) afs_osi.o: $(TOP_SRC_AFS)/afs_osi.c - $(CRULE2) + $(CRULE_OPT) afs_osi_alloc.o: $(TOP_SRC_AFS)/afs_osi_alloc.c - $(CRULE2) + $(CRULE_OPT) afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c - $(CRULE2) + $(CRULE_OPT) afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c - $(CRULE2) + $(CRULE_OPT) afs_osi_vget.o: $(TOP_SRC_AFS)/afs_osi_vget.c - $(CRULE1) + $(CRULE_NOOPT) afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c - $(CRULE2) + $(CRULE_OPT) afs_server.o: $(TOP_SRC_AFS)/afs_server.c - $(CRULE2) + $(CRULE_OPT) afs_user.o: $(TOP_SRC_AFS)/afs_user.c - $(CRULE2) + $(CRULE_OPT) afs_util.o: $(TOP_SRC_AFS)/afs_util.c - $(CRULE2) + $(CRULE_OPT) afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c - $(CRULE2) + $(CRULE_OPT) afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c - $(CRULE1) + $(CRULE_NOOPT) afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c - $(CRULE1) + $(CRULE_NOOPT) afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c - $(CRULE2) + $(CRULE_OPT) rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c - $(CRULE2) + $(CRULE_OPT) afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c - $(CRULE2) -o afs_uuid.o + $(CRULE_OPT) -o afs_uuid.o xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c - $(CRULE2) + $(CRULE_OPT) # these files are not to be optimized - subject to change. afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c - $(CRULE1) + $(CRULE_NOOPT) afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c - $(CRULE1) + $(CRULE_NOOPT) afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c - $(CRULE1) + $(CRULE_NOOPT) afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c - $(CRULE1) + $(CRULE_NOOPT) afs_dir.o: $(TOP_SRCDIR)/dir/dir.c - $(CRULE1) -o afs_dir.o + $(CRULE_NOOPT) -o afs_dir.o AFS_component_version_number.o: AFS_component_version_number.c - $(CRULE1) + $(CRULE_NOOPT) afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c - $(CRULE1) + $(CRULE_NOOPT) afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c - $(CRULE1) + $(CRULE_NOOPT) afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c - $(CRULE1) + $(CRULE_NOOPT) fcrypt.o: $(TOP_SRC_RXKAD)/domestic/fcrypt.c - $(CRULE1) + $(CRULE_NOOPT) crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c - $(CRULE1) + $(CRULE_NOOPT) rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c - $(CRULE1) + $(CRULE_NOOPT) rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c - $(CRULE1) + $(CRULE_NOOPT) afs_exporter.o: $(TOP_SRC_AFS)/afs_exporter.c - $(CRULE1) + $(CRULE_NOOPT) afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c - $(CRULE1) + $(CRULE_NOOPT) afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c - $(CRULE1) + $(CRULE_NOOPT) rx.o: $(TOP_SRC_RX)/rx.c - $(CRULE1) + $(CRULE_NOOPT) rx_clock.o: $(TOP_SRC_RX)/rx_clock.c - $(CRULE1) + $(CRULE_NOOPT) rx_event.o: $(TOP_SRC_RX)/rx_event.c - $(CRULE1) + $(CRULE_NOOPT) rx_globals.o: $(TOP_SRC_RX)/rx_globals.c - $(CRULE1) + $(CRULE_NOOPT) rx_misc.o: $(TOP_SRC_RX)/rx_misc.c - $(CRULE1) + $(CRULE_NOOPT) rx_null.o: $(TOP_SRC_RX)/rx_null.c - $(CRULE1) + $(CRULE_NOOPT) rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c - $(CRULE1) + $(CRULE_NOOPT) rx_packet.o: $(TOP_SRC_RX)/rx_packet.c - $(CRULE1) + $(CRULE_NOOPT) xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c - $(CRULE1) + $(CRULE_NOOPT) Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c - $(CRULE1) + $(CRULE_NOOPT) rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c - $(CRULE1) + $(CRULE_NOOPT) Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c - $(CRULE1) + $(CRULE_NOOPT) Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c - $(CRULE1) + $(CRULE_NOOPT) Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c - $(CRULE1) + $(CRULE_NOOPT) Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c - $(CRULE1) + $(CRULE_NOOPT) afsaux.o: $(TOP_SRC_FSINT)/afsaux.c - $(CRULE1) + $(CRULE_NOOPT) xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c - $(CRULE1) + $(CRULE_NOOPT) xdr_array.o: $(TOP_SRC_RX)/xdr_array.c - $(CRULE1) + $(CRULE_NOOPT) xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c - $(CRULE1) + $(CRULE_NOOPT) xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c - $(CRULE1) + $(CRULE_NOOPT) xdr.o: $(TOP_SRC_RX)/xdr.c - $(CRULE1) + $(CRULE_NOOPT) Kvldbint.cs.o: ${TOP_OBJ_VLSERVER}/Kvldbint.cs.c - $(CRULE1) + $(CRULE_NOOPT) Kvldbint.xdr.o: ${TOP_OBJ_VLSERVER}/Kvldbint.xdr.c - $(CRULE1) -DAFS_UUID_XG + $(CRULE_NOOPT) -DAFS_UUID_XG rx_kmutex.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_kmutex.c - $(CRULE1) + $(CRULE_NOOPT) rx_knet.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_knet.c - $(CRULE1) + $(CRULE_NOOPT) rx_kcommon.o: $(TOP_SRC_RX)/rx_kcommon.c - $(CRULE1) + $(CRULE_NOOPT) # Files which do not contain NFS translator code. afs_call.o: $(TOP_SRC_AFS)/afs_call.c - $(CRULE1) -DAFS_NONFSTRANS + $(CRULE_NOOPT) -DAFS_NONFSTRANS afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c - $(CRULE1) -DAFS_NONFSTRANS + $(CRULE_NOOPT) -DAFS_NONFSTRANS # NFS Translator versions of the above code. afs_call_nfs.o: $(TOP_SRC_AFS)/afs_call.c - $(CRULE1) -o afs_call_nfs.o + $(CRULE_NOOPT) -o afs_call_nfs.o afs_pioctl_nfs.o: $(TOP_SRC_AFS)/afs_pioctl.c - $(CRULE1) -o afs_pioctl_nfs.o + $(CRULE_NOOPT) -o afs_pioctl_nfs.o # Files which are specific to particular architectures/targets # but have common build rules. Place here instead of duplicating # in the per-platform Makefiles. osi_groups.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_groups.c - $(CRULE1) + $(CRULE_NOOPT) osi_inode.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_inode.c - $(CRULE1) + $(CRULE_NOOPT) osi_file.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_file.c - $(CRULE1) + $(CRULE_NOOPT) osi_sleep.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_sleep.c - $(CRULE1) + $(CRULE_NOOPT) osi_misc.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_misc.c - $(CRULE1) + $(CRULE_NOOPT) osi_vfsops_nfs.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vfsops.c - $(CRULE1) -o osi_vfsops_nfs.o + $(CRULE_NOOPT) -o osi_vfsops_nfs.o osi_vfsops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vfsops.c - $(CRULE1) -DAFS_NONFSTRANS + $(CRULE_NOOPT) -DAFS_NONFSTRANS osi_vm.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vm.c - $(CRULE1) + $(CRULE_NOOPT) osi_vnodeops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c - $(CRULE1) + $(CRULE_NOOPT) osi_debug.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_debug.c - $(CRULE4) + $(CRULE_OPT) osi_module.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_module.c - $(CRULE1) + $(CRULE_NOOPT) osi_sysctl.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_sysctl.c - $(CRULE1) + $(CRULE_NOOPT) osi_alloc.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_alloc.c - $(CRULE1) + $(CRULE_NOOPT) osi_cred.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_cred.c - $(CRULE1) + $(CRULE_NOOPT) osi_idbg.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_idbg.c - $(CRULE1) + $(CRULE_NOOPT) osi_config.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_config.c - $(CRULE1) + $(CRULE_NOOPT) osi_timeout.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_timeout.c - $(CRULE1) + $(CRULE_NOOPT) diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index 7e5b5db0d..089a3c20a 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -139,12 +139,12 @@ osi_assem.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_assem.s # Build rules for iauth objects. afs_call_iauth.o: $(AFS)/afs_call.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o + $(CRULE_NOOPT) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o afs_nfsclnt_iauth.o: $(AFS)/afs_nfsclnt.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o + $(CRULE_NOOPT) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o afs_pioctl_iauth.o: $(AFS)/afs_pioctl.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o + $(CRULE_NOOPT) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o osi_vfsops_iauth.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o + $(CRULE_NOOPT) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o osi_vnodeops_iauth.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o + $(CRULE_NOOPT) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index 9fbb81d3f..af59eaf10 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -119,6 +119,6 @@ ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) # Object build rules: setdef0.o: setdef0.c - $(CRULE1) + $(CRULE_NOOPT) setdef1.o: setdef1.c - $(CRULE1) + $(CRULE_NOOPT) diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 634190919..d83071e06 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -6,8 +6,6 @@ # directory or online at http://www.openafs.org/dl/license10.html srcdir=@srcdir@ -KDEBUG=@KERN_DEBUG_OPT@ -FOMIT=@OMIT_FRAME_POINTER@ include @TOP_OBJDIR@/src/config/Makefile.config @@ -30,42 +28,49 @@ AFS_OS_NFSOBJS = AFS_OS_NONFSOBJS = -GCC_KOPTS=@LINUX_GCC_KOPTS@ +COMMON_KERN_CFLAGS=$(KERN_DBG) $(KERN_OPTMZ) @LINUX_GCC_KOPTS@ + +COMMON_DEFINES=-D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} + # System specific build commands and flags -P5PLUS=@P5PLUS_KOPTS@ -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe $(P5PLUS) -DEFINES = -D__KERNEL__ -DCPU=586 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} ${KDEFINES} +CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@ +DEFINES = $(COMMON_DEFINES) -DCPU=586 + -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mno-fp-regs -ffixed-8 -DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} +CCFLAGS = $(COMMON_KERN_CFLAGS) -mno-fp-regs -ffixed-8 +DEFINES = $(COMMON_DEFINES) + -CCFLAGS = -O $(FOMIT) $(GCC_KOPTS) -fsigned-char -DEFINES = -D__KERNEL__ -D__s390__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} +CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char +DEFINES = $(COMMON_DEFINES) -D__s390__ + LD = ld -m elf32_sparc -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) \ - -pipe -mcpu=v8 -mno-fpu -fcall-used-g5 -fcall-used-g7 -DEFINES = -D__KERNEL__ -DCPU=sparc -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} +CCFLAGS = $(COMMON_KERN_CFLAGS) -mcpu=v8 -mno-fpu -fcall-used-g5 -fcall-used-g7 +DEFINES = $(COMMON_DEFINES) -DCPU=sparc + CC = sparc64-linux-gcc LD = ld -m elf64_sparc -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) \ - -pipe -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare -DEFINES = -D__KERNEL__ -DCPU=sparc64 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} +CCFLAGS = $(COMMON_KERN_CFLAGS) \ + -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare +DEFINES = $(COMMON_DEFINES) -DCPU=sparc64 + -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -fsigned-char -msoft-float -pipe \ - -fno-builtin -ffixed-r2 -DEFINES = -D__KERNEL__ -D__powerpc__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} +CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char -msoft-float -fno-builtin -ffixed-r2 +DEFINES = $(COMMON_DEFINES) -D__powerpc__ + -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -fsigned-char -mno-space-regs \ +CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char -mno-space-regs \ -mfast-indirect-calls -mdisable-fpregs -ffunction-sections \ -march=1.1 -mschedule=7100 -DEFINES = -D__KERNEL__ -D__linux__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} +DEFINES = $(COMMON_DEFINES) -D__linux__ + -CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -ffixed-r13 \ - -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step -DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE +CCFLAGS = $(COMMON_KERN_CFLAGS) -ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step +DEFINES = $(COMMON_DEFINES) + INCLUDES = -I. -I../ -I${TOP_OBJDIR}/src/config diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index b200d42eb..dbd6b4ac8 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -11,8 +11,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC=${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} \ - -I../auth -I../kauth -I../ptserver -I../sys +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -I../auth -I../kauth -I../ptserver -I../sys CCRULE = ${CC} ${CFLAGS} -c $? AUDIT= ../audit diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 7b905a297..1200ef513 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -12,9 +12,9 @@ include @TOP_OBJDIR@/src/config/Makefile.config CC=${MT_CC} -INCLUDES=-I. -I${srcdir} -I${TOP_INCDIR} -I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \ - -I../rxkad -I${srcdir}/../rxkad -I../rxstat -I../fsint -CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_OBJDIR}/src/config +CFLAGS = ${COMMON_CFLAGS} -I${srcdir}/../des -I../des -I../rxkad -I${srcdir}/../rxkad \ + -I../fsint -DRXDEBUG ${MT_CFLAGS} + SFLAGS=-P -I${TOP_INCDIR} RX = ../rx CCRULE = ${CC} ${CFLAGS} -c $? diff --git a/src/log/Makefile.in b/src/log/Makefile.in index 01cf34286..e51f685c3 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -8,11 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs - -CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG} - PROGRAMS= unlog tokens tokens.krb kseal INCLS=${TOP_INCDIR}/afs/auth.h ${TOP_INCDIR}/rx/rx.h \ diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 7f197881f..e937329d8 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -20,7 +20,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ @@ -35,8 +34,6 @@ KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a -CFLAGS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} - SRCS= login.c OBJS= login.o setenv.o getenv.o libutil.a KOBJS= login.krb.o setenv.o getenv.o libutil.a diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 11bda3e2e..e657df6e2 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -8,12 +8,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -# this is important code, so let's optimize it. The optimizer aggravates any -# subtle bugs that may have been introduced in process.s, be warned! -OPTIMIZE=${LWP_OPTMZ} - -CFLAGS=${OPTIMIZE} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${COMMON_INCL} LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \ waitkey.o threadname.o AFS_component_version_number.o @@ -38,21 +33,21 @@ process.s: process.o : process.s process.c @case "$(SYS_NAME)" in \ pmax_he1) \ - $(CC) -c -I${TOP_INCDIR} process.s;; \ + $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \ sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_5?) \ /usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \ ${AS} process.ss -o process.o; \ $(RM) process.ss ;; \ sgi_5* ) \ - $(CC) -c -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \ + $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \ sgi_61 | sgi_62 | sgi_63 ) \ - $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \ + $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \ s390*) \ /lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s >process.ss; \ ${AS} -ahlns process.ss -o process.o >process.lst; \ $(RM) process.ss ;; \ ppc_darwin* ) \ - $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} ${srcdir}/process.s;; \ + $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} -I${TOP_INCDIR} ${srcdir}/process.s;; \ i386_fbsd*|i386_nbsd* ) \ /usr/bin/cpp -P ${srcdir}/process.fbsd.s > process.ss; \ ${AS} -o process.o process.ss; \ @@ -90,7 +85,7 @@ preempt.o : preempt.c lwp.h preempt.h lwp.o : lwp.c lwp.h case "$(SYS_NAME)" in \ rs_aix*) \ - $(CC) -I${srcdir} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -c ${srcdir}/lwp.c;; \ + $(CC) ${LWP_DBG} ${LWP_OPTMZ} -I${srcdir} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -c ${srcdir}/lwp.c;; \ *) \ $(CC) ${CFLAGS} -c ${srcdir}/lwp.c;; \ esac diff --git a/src/mpp/Makefile.in b/src/mpp/Makefile.in index 9b95a23ba..9d4c48a3e 100644 --- a/src/mpp/Makefile.in +++ b/src/mpp/Makefile.in @@ -4,34 +4,27 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS= ${OPTMZ} ${XCFLAGS} -LIBS = ${XLIBS} - -PROGRAM=mpp -MANUAL=mpp.1 - include ../config/Makefile.version all: ${PROGRAM} -install: ${DESTDIR}${sbindir}/${PROGRAM} +install: ${DESTDIR}${sbindir}/mpp -dest: ${DEST}/etc/${PROGRAM} +dest: ${DEST}/etc/mpp -${DESTDIR}${sbindir}/${PROGRAM}: ${PROGRAM} +${DESTDIR}${sbindir}/mpp: mpp ${INSTALL} $? $@ -${DEST}/etc/${PROGRAM}: ${PROGRAM} +${DEST}/etc/mpp: mpp ${INSTALL} $? $@ -installdoc: ${MANUAL} - ${INSTALL} -c ${MANUAL} ${DEST}/man/man1 +installdoc: mpp.1 + ${INSTALL} -c mpp.1 ${DEST}/man/man1 clean: - -$(RM) -f core a.out *.o *.out ${PROGRAM} AFS_component_version_number.c + -$(RM) -f core a.out *.o *.out mpp AFS_component_version_number.c -${PROGRAM}: AFS_component_version_number.c - ${CC} ${CFLAGS} $@.c -o $@ ${LIBS} +mpp: AFS_component_version_number.c + ${CC} ${CFLAGS} $@.c -o $@ ${XLIBS} mpp: mpp.c diff --git a/src/null/Makefile.in b/src/null/Makefile.in index 78076dd6c..3e14a1e96 100644 --- a/src/null/Makefile.in +++ b/src/null/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS = -I. -I${srcdir} ${XCFLAGS} - all: ${TOP_LIBDIR}/libnull.a install: ${DESTDIR}${libdir}/afs/libnull.a diff --git a/src/package/Makefile.in b/src/package/Makefile.in index b16b34dad..503b8152c 100644 --- a/src/package/Makefile.in +++ b/src/package/Makefile.in @@ -7,34 +7,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -INCLUDES=-I/usr/include -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -DBGFLAG = -UDEBUG -CFLAGS = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS) -YFLAGS = -vd -#LFLAGS = -ll - -HFILES = package.h \ - validupdates.h \ - systype.h \ - globals.h - -SRCS = package.c \ - conftree.c \ - check.c \ - update.c \ - fileops.c \ - messages.c \ - misc.c \ - globfuncs.c - -TEST_SRCS = test.c \ - conftree.c \ - messages.c \ - misc.c \ - globfuncs.c - -OTHERSRCS = gram.y +CFLAGS = ${COMMON_CFLAGS} -DKFLAG -DANDREW -DVICE -UDEBUG OBJS = package.o \ gram.o \ diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in index dc616a8d1..bf411af27 100644 --- a/src/pinstall/Makefile.in +++ b/src/pinstall/Makefile.in @@ -8,21 +8,10 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -LIBS= ${XLIBS} -CFLAGS=${OPTMZ} $(DBG) -I. -I${TOP_INCDIR} -I../config ${XCFLAGS} - all: pinstall pinstall: ${srcdir}/install.c AFS_component_version_number.c - case ${SYS_NAME} in \ - sgi_64 | sgi_65) \ - ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${LIBS} ;; \ - sgi_* ) \ - ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${LIBS} -lmld ;; \ - *) \ - ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${LIBS} ;; \ - esac + ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${XLIBS} ${PINSTALL_LIBS} test: pinstall csh ./test/test_install diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in index 16e2f635d..87be32740 100644 --- a/src/procmgmt/Makefile.in +++ b/src/procmgmt/Makefile.in @@ -8,9 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=$(DBUG) -I${TOP_INCDIR} -I../config ${XCFLAGS} - all: ${TOP_LIBDIR}/libprocmgmt.a ${TOP_INCDIR}/afs/procmgmt.h # diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 081b1f0ba..4f5233811 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -7,7 +7,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} $(DBUG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/lwp.h \ @@ -33,9 +32,11 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/util.a \ - ${TOP_LIBDIR}/libsys.a + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libafsutil.a all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \ @@ -100,7 +101,7 @@ display.o: display.c ${INCLS} db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c db_verify: db_verify.o pterror.o display.o $(LIBS) - $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a + $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ptclient: ptclient.o display.o libprot.a $(LIBS) $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS} diff --git a/src/rcp/Makefile.in b/src/rcp/Makefile.in index d8334f2a3..9ae2c472f 100644 --- a/src/rcp/Makefile.in +++ b/src/rcp/Makefile.in @@ -23,7 +23,7 @@ SRCS= rcp.c OBJS= rcp.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index 2ab7d65ba..e1988fd34 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -8,7 +8,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -DRXDEBUG ${XCFLAGS} +CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} -DRXDEBUG # # Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx). diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in index 5b1825144..d7391bd8c 100644 --- a/src/rxdebug/Makefile.in +++ b/src/rxdebug/Makefile.in @@ -8,10 +8,10 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS} +CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} -DRXDEBUG LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libafsutil.a all: rxdebug rxdumptrace diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index 17c3ab1e0..b0915fa62 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -13,12 +13,9 @@ HDRS= rpc_util.h rpc_parse.h rpc_scan.h OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \ rpc_svcout.o rpc_clntout.o -GOAL=rxgen -CFLAGS=-I. -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS} - all: rxgen ${TOP_INCDIR}/afs/rxgen_consts.h -rxgen: $(OBJS) AFS_component_version_number.c +rxgen: $(OBJS) AFS_component_version_number.c $(HDRS) $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@ # @@ -39,6 +36,7 @@ clean: $(RM) -f *.o rxgen core AFS_component_version_number.c include ../config/Makefile.version + ${DESTDIR}${bindir}/rxgen: rxgen ${INSTALL} $? $@ diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 21bb10266..09ad46fbf 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -8,7 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ ${TOP_INCDIR}/rx/fcrypt.h \ rxkad.h rxkad_prototypes.h fcrypt.h v5gen.h @@ -22,7 +21,8 @@ fc_test_LIBS=\ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libsys.a + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libafsutil.a all: ${TOP_LIBDIR}/librxkad.a fc_test depinstall diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index c34e175af..588b5552d 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src -I${TOP_INCDIR} ${XCFLAGS} - LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o all: depinstall ${TOP_LIBDIR}/librxstat.a diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index 31179bba5..db42c140e 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -8,14 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=-I. -I${srcdir} ${DBUG} \ - -I${TOP_OBJDIR}/src/config \ - -I${TOP_INCDIR} \ - -I${TOP_INCDIR}/afs \ - ${XCFLAGS} -LDFLAGS = ${XLDFLAGS} - INCLS=${TOP_INCDIR}/afs/gtxobjects.h \ ${TOP_INCDIR}/afs/gtxwindows.h \ ${TOP_INCDIR}/afs/gtxcurseswin.h \ diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index a72ac8e1d..4c01bf03a 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -15,10 +15,8 @@ LIBAFSAUTHENTMINOR=0 srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - CC=${MT_CC} -CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} ${SHLIB_CFLAGS} \ - -I../auth -I../kauth -I../ptserver -I../sys +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} ${SHLIB_CFLAGS} -I../auth -I../kauth -I../ptserver -I../sys CCRULE = ${CC} ${CFLAGS} -c $? AUDIT= ../audit diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index ec37b5e39..0e2ecc112 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -16,10 +16,11 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CC=${MT_CC} -INCLUDES=-I. -I${srcdir} -I${TOP_INCDIR} -I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \ +INCLUDES=-I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \ -I../rxkad -I${srcdir}/../rxkad -I../rxstat -I../fsint -CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_OBJDIR}/src/config ${SHLIB_CFLAGS} +CFLAGS = ${COMMON_CFLAGS} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} ${SHLIB_CFLAGS} SFLAGS=-P -I${TOP_INCDIR} + RX = ../rx CCRULE = ${CC} ${CFLAGS} -c $? RXKAD = ../rxkad diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in index ed6858f9f..d0b4c7220 100644 --- a/src/sia/Makefile.in +++ b/src/sia/Makefile.in @@ -8,11 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -DEBUG = -UNRESOLVED = - - LIBS1=${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a LIBS2=${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libaudit.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ @@ -28,7 +23,7 @@ all: ${TOP_LIBDIR}/libafssiad.so ${TOP_LIBDIR}/libafssiad.krb.so clean: $(RM) -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c -CFLAGS=$(DEBUG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${DEST}/lib/afs/libafssiad.so: libafssiad.so ${INSTALL} $? $@ @@ -37,21 +32,21 @@ ${DEST}/lib/afs/libafssiad.krb.so: libafssiad.krb.so ${INSTALL} $? $@ siad.o: siad.c - $(CC) $(CFLAGS) -c $(DBG) siad.c -o siad.o + $(CC) $(CFLAGS) -c siad.c -o siad.o siad_krb.o: siad.c - $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c $(DBG) siad.c -o siad_krb.o + $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c siad.c -o siad_krb.o libafssiad.so: siad.o - $(LD) $(LDFLAGS) $(DBG) -shared -no_archive -o libafssiad.so \ - ${UNRESOLVED} siad.o ${LIBS} -none -lc + $(LD) $(LDFLAGS) -shared -no_archive -o libafssiad.so \ + siad.o ${LIBS} -none -lc libafssiad.krb.so: siad_krb.o - $(LD) $(LDFLAGS) $(DBG) -shared -no_archive -o libafssiad.krb.so \ - ${UNRESOLVED} siad_krb.o ${KLIBS} ${LIBS} -none -lc + $(LD) $(LDFLAGS) -shared -no_archive -o libafssiad.krb.so \ + siad_krb.o ${KLIBS} ${LIBS} -none -lc test-reauth: test-reauth.o - $(CC) $(CFLAGS) $(DBG) -o test-reauth test-reauth.o -lc + $(CC) $(CFLAGS) -o test-reauth test-reauth.o -lc install: ${DESTDIR}${libdir}/afs/libafssiad.so ${DESTDIR}${libdir}/afs/libafssiad.krb.so diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index f0d2cc368..7a33ed4df 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -8,7 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} SFLAGS=-P -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/tbutc/Makefile.in b/src/tbutc/Makefile.in index 05e136579..fe1a4ab01 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -8,18 +8,12 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - - BUTMOBJS =file_tm.o BUTMLIBS =libbutm.a BUTMINCLS =${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h -BUTMINCLUDE =-I${TOP_INCDIR} CC = ${MT_CC} -CFLAGS=-I. -I${srcdir} -I${TOP_SRCDIR}/volser ${DBG} -w -I${TOP_OBJDIR}/src/config ${MT_CFLAGS} @XBSA_CFLAGS@ ${BUTMINCLUDE} \ - -I../bucoord -I../volser - -LDFLAGS = ${DBG} ${XLDFLAGS} +CFLAGS = ${COMMON_CFLAGS} -I${TOP_SRCDIR}/volser ${MT_CFLAGS} @XBSA_CFLAGS@ -I../bucoord -I../volser LWP = ${srcdir}/../lwp BUTM = ${srcdir}/../butm diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 27cd58162..0154064df 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -3,8 +3,8 @@ include @TOP_OBJDIR@/src/config/Makefile.config SHELL = /bin/sh -CFLAGS = -I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS} +CFLAGS = ${DBG} ${OPTMZ} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} +LDFLAGS=${XLDFLAGS} INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR} INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR} diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index b87e68443..456e3b24f 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -8,12 +8,10 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - - CC=${MT_CC} -INCLUDES=-I${TOP_OBJDIR}/src/config -I. -I.. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG -LDFLAGS=${DBG} ${XLDFLAGS} +CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG + +CCRULE=${CC} ${CFLAGS} -c $? VICED=../viced VLSERVER=../vlserver @@ -48,133 +46,131 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util. all: fileserver -COMPILE=${CC} ${CFLAGS} -c $? - viced.o: ${VICED}/viced.c - ${COMPILE} + ${CCRULE} afsfileprocs.o: ${VICED}/afsfileprocs.c - ${COMPILE} + ${CCRULE} host.o: ${VICED}/host.c - ${COMPILE} + ${CCRULE} physio.o: ${VICED}/physio.c - ${COMPILE} + ${CCRULE} callback.o: ${VICED}/callback.c - ${COMPILE} + ${CCRULE} assert.o: ${UTIL}/assert.c - ${COMPILE} + ${CCRULE} uuid.o: ${UTIL}/uuid.c - ${COMPILE} + ${CCRULE} serverLog.o: ${UTIL}/serverLog.c - ${COMPILE} + ${CCRULE} fileutil.o: ${UTIL}/fileutil.c - ${COMPILE} + ${CCRULE} volparse.o: ${UTIL}/volparse.c - ${COMPILE} + ${CCRULE} flipbase64.o: ${UTIL}/flipbase64.c - ${COMPILE} + ${CCRULE} netutils.o: ${UTIL}/netutils.c - ${COMPILE} + ${CCRULE} dirpath.o: ${UTIL}/dirpath.c - ${COMPILE} + ${CCRULE} lock.o: ${LWP}/lock.c - ${COMPILE} + ${CCRULE} fasttime.o: ${LWP}/fasttime.c - ${COMPILE} + ${CCRULE} threadname.o: ${LWP}/threadname.c - ${COMPILE} + ${CCRULE} aclprocs.o: ${LIBACL}/aclprocs.c - ${COMPILE} + ${CCRULE} netprocs.o: ${LIBACL}/netprocs.c - ${COMPILE} + ${CCRULE} vldbint.cs.o: ${VLSERVER}/vldbint.cs.c - ${COMPILE} + ${CCRULE} vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c - ${COMPILE} + ${CCRULE} buffer.o: ${DIR}/buffer.c - ${COMPILE} + ${CCRULE} dir.o: ${DIR}/dir.c - ${COMPILE} + ${CCRULE} salvage.o: ${DIR}/salvage.c - ${COMPILE} + ${CCRULE} vnode.o: ${VOL}/vnode.c - ${COMPILE} + ${CCRULE} volume.o: ${VOL}/volume.c - ${COMPILE} + ${CCRULE} vutil.o: ${VOL}/vutil.c - ${COMPILE} + ${CCRULE} partition.o: ${VOL}/partition.c - ${COMPILE} + ${CCRULE} fssync.o: ${VOL}/fssync.c - ${COMPILE} + ${CCRULE} purge.o: ${VOL}/purge.c - ${COMPILE} + ${CCRULE} clone.o: ${VOL}/clone.c - ${COMPILE} + ${CCRULE} nuke.o: ${VOL}/nuke.c - ${COMPILE} + ${CCRULE} devname.o: ${VOL}/devname.c - ${COMPILE} + ${CCRULE} common.o: ${VOL}/common.c - ${COMPILE} + ${CCRULE} listinodes.o: ${VOL}/listinodes.c - ${COMPILE} + ${CCRULE} ihandle.o: ${VOL}/ihandle.c - ${COMPILE} + ${CCRULE} namei_ops.o: ${VOL}/namei_ops.c - ${COMPILE} + ${CCRULE} afsaux.o: ${FSINT}/afsaux.c - ${COMPILE} + ${CCRULE} afscbint.cs.o: ${FSINT}/afscbint.cs.c - ${COMPILE} + ${CCRULE} afscbint.ss.o: ${FSINT}/afscbint.ss.c - ${COMPILE} + ${CCRULE} afsint.cs.o: ${FSINT}/afsint.cs.c - ${COMPILE} + ${CCRULE} afsint.ss.o: ${FSINT}/afsint.ss.c - ${COMPILE} + ${CCRULE} afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${COMPILE} + ${CCRULE} fileserver: ${objects} ${LIBS} ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} @@ -188,6 +184,7 @@ clean: $(RM) -f *.o fileserver core AFS_component_version_number.c include ../config/Makefile.version + ${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver ${INSTALL} -ns $? $@ diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 91e5dad01..8f2ee4113 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} ${XCFLAGS} - LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ ubikclient.o uerrors.o @@ -87,7 +85,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} $(DBG) -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c + ${CC} ${CFLAGS} -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c uerrors.o: uerrors.c diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 2f67a1a51..bab0fe624 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -17,8 +17,6 @@ LIBS=${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a -CFLAGS=-I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS} - all: upserver upclient # diff --git a/src/util/Makefile.in b/src/util/Makefile.in index a9c33d47e..9750823b2 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -8,10 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = ${OPTMZ} ${XLDFLAGS} - objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \ dirpath.o fileutil.o netutils.o flipbase64.o \ diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index a595ed6cb..0214058b2 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -8,12 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CCXPG2= /usr/xpg2bin/cc - -# Note - be careful with this line, ubik.h is very picky about getting the right lock.h -CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config ${XCFLAGS} - INCLS=${TOP_INCDIR}/afs/afsint.h \ ${TOP_INCDIR}/afs/cmd.h \ ${TOP_INCDIR}/afs/afsutil.h @@ -30,9 +24,9 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ - $(TOP_LIBDIR)/util.a \ ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libaudit.a + ${TOP_LIBDIR}/libaudit.a \ + $(TOP_LIBDIR)/libafsutil.a CMLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsint.a \ @@ -42,8 +36,8 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ - $(TOP_LIBDIR)/util.a \ - ${TOP_LIBDIR}/liblwp.a + ${TOP_LIBDIR}/liblwp.a \ + $(TOP_LIBDIR)/libafsutil.a LIBS = ${FSLIBS} @@ -114,37 +108,37 @@ ${DEST}/etc/kdump64: kdump64 up.o: up.c AFS_component_version_number.c up: up.o - ${CC} ${CFLAGS} $(DBG) -o up up.o ${LIBS} ${XLIBS} + ${CC} ${CFLAGS} -o up up.o ${LIBS} ${XLIBS} fs.o: fs.c ${INCLS} AFS_component_version_number.c fs: fs.o $(LIBS) - ${CC} ${CFLAGS} $(DBG) -o fs fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} + ${CC} ${CFLAGS} -o fs fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} livesys.o: livesys.c ${INCLS} AFS_component_version_number.c livesys: livesys.c $(LIBS) - ${CC} $(DBG) -o livesys $(CFLAGS) ${srcdir}/livesys.c $(LIBS) ${XLIBS} + ${CC} ${CFLAGS} -o livesys ${srcdir}/livesys.c $(LIBS) ${XLIBS} twiddle: twiddle.c $(LIBS) - ${CC} $(DBG) -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS} + ${CC} ${CFLAGS} -o twiddle ${srcdir}/twiddle.c $(LIBS) ${XLIBS} gcpags: gcpags.c $(LIBS) - ${CC} $(DBG) -o gcpags $(CFLAGS) gcpags.c $(LIBS) ${XLIBS} + ${CC} ${CFLAGS} -o gcpags ${srcdir}/gcpags.c $(LIBS) ${XLIBS} whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c whatfid: whatfid.o ${LIBS} - ${CC} ${CFLAGS} $(DBG) -o whatfid whatfid.o ${LIBS} ${XLIBS} + ${CC} ${CFLAGS} -o whatfid whatfid.o ${LIBS} ${XLIBS} fstrace.o: fstrace.c AFS_component_version_number.c case ${SYS_NAME} in \ sun4_411 | sun4c_411 | sun4m_412 ) \ - ${CCXPG2} $(DBG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \ + ${CCXPG2} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \ sun*_4* ) \ - ${CC} -I/usr/xpg2include -I/usr/5include -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \ + ${CC} ${DBG} ${OPTMZ} -I/usr/xpg2include -I/usr/5include -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \ * ) \ - ${CC} ${CFLAGS} $(DBG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \ + ${CC} ${CFLAGS} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \ esac fstrace: fstrace.o @@ -152,7 +146,7 @@ fstrace: fstrace.o pmax_ul43 | pmax_ul43a ) \ ${CC} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a /usr/lib/libi.a ;; \ sun4_411 | sun4c_411 | sun4m_412 ) \ - ${CCXPG2} ${CFLAGS} $(DBG) -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ + ${CCXPG2} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ sun*_4* ) \ ${CC} -L/usr/xpg2lib -L/usr/5lib ${CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lxpg ;; \ hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \ @@ -173,7 +167,7 @@ cmdebug: cmdebug.o ${CMLIBS} # *linux* - Builds kdump-X.Y.Z according to kernel version kdump-linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_number.c - ${CC} $(DBG) -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs \ + ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs \ -I${TOP_OBJDIR}/src \ -I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \ -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \ @@ -182,12 +176,12 @@ kdump-linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_number.c -c ${srcdir}/kdump.c kdump-linux-@LINUX_VERSION@: kdump-linux-@LINUX_VERSION@.o - ${CC} $(DBG) -o kdump-linux-${LINUX_VERSION} kdump-linux-${LINUX_VERSION}.o \ + ${CC} ${KERN_DBG} ${KERN_OPTMZ} -o kdump-linux-${LINUX_VERSION} kdump-linux-${LINUX_VERSION}.o \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} # *alpha_linux* - Builds kdump-X.Y.Z according to kernel version kdump-alpha_linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_number.c - ${CC} $(DBG) -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs \ + ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs \ -I${TOP_OBJDIR}/src \ -I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \ -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \ @@ -196,7 +190,7 @@ kdump-alpha_linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_numb -o kdump-alpha_linux-${LINUX_VERSION}.o -c ${srcdir}/kdump.c ;; \ kdump-alpha_linux-@LINUX_VERSION@: kdump-alpha_linux-@LINUX_VERSION@.o - ${CC} $(DBG) -o kdump-alpha_linux-${LINUX_VERSION} kdump-alpha_linux-${LINUX_VERSION}.o \ + ${CC} ${KERN_DBG} ${KERN_OPTMZ} -o kdump-alpha_linux-${LINUX_VERSION} kdump-alpha_linux-${LINUX_VERSION}.o \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} # @@ -210,7 +204,7 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c *linux* ) \ $(MAKE) kdump-linux-${LINUX_VERSION}.o ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \ - ${CC} $(DBG) ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c ${srcdir}/kdump.c ;;\ + ${CC} ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c ${srcdir}/kdump.c ;;\ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ do IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \ @@ -219,14 +213,14 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c echo CPU_KDEFS = $$CPU_KDEFS; \ case $$CPU_KDEFS in \ *-64*) ${CC} -D_KMEMUSER -woff 1178 \ - $(DBG) -I${TOP_INCDIR} \ + ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR} \ -I${TOP_OBJDIR}/src/config \ $$CPU_KDEFS \ ${XCFLAGS64} \ -c ${srcdir}/kdump.c -o kdump.$$IP.o \ ;; \ *) ${CC} -D_KMEMUSER -woff 1178 \ - $(DBG) -I${TOP_INCDIR} \ + ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR} \ -I${TOP_OBJDIR}/src/config \ $$CPU_KDEFS \ ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \ @@ -238,23 +232,23 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c *nbsd*) \ touch kdump.o ;; \ *) \ - ${CC} $(DBG) -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -c ${srcdir}/kdump.c ;; \ + ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -c ${srcdir}/kdump.c ;; \ esac ; kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c -set -x; \ case ${SYS_NAME} in \ sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \ - ${CC} $(DBG) -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c ${srcdir}/kdump.c ;; \ + ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c ${srcdir}/kdump.c ;; \ esac kdump: kdump.o -set -x; \ case ${SYS_NAME} in \ sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_5? ) \ - ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \ + ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \ sun*_5? ) \ - ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ + ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ do IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \ @@ -262,12 +256,12 @@ kdump: kdump.o echo IP = $$IP; \ echo CPU_KDEFS = $$CPU_KDEFS; \ case $$CPU_KDEFS in \ - *-64*) ${CC} ${XCFLAGS64} $(DBG) \ + *-64*) ${CC} ${XCFLAGS64} \ $$CPU_KDEFS \ -o kdump.$$IP kdump.$$IP.o \ ${TOP_LIBDIR}/libcmd64.a -lelf \ ;; \ - *) ${CC} ${XCFLAGS} $(DBG) \ + *) ${CC} ${XCFLAGS} \ $$CPU_KDEFS \ -o kdump.$$IP kdump.$$IP.o \ ${TOP_LIBDIR}/libcmd.a -lelf \ @@ -279,10 +273,10 @@ kdump: kdump.o *linux* ) \ $(MAKE) kdump-linux-@LINUX_VERSION@ ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \ - ${CC} $(DBG) -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} -ll -lmld;; \ - ncrx86_* ) ${CC} $(DBG) -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lelf ${XLIBS} ;; \ + ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} -ll -lmld;; \ + ncrx86_* ) ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lelf ${XLIBS} ;; \ *nbsd*) touch kdump ;; \ - * ) ${CC} $(DBG) -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ + * ) ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ esac ## kdump to read from 64 bit kernel dumps @@ -291,7 +285,7 @@ kdump64 : kdump64.o -set -x; \ case ${SYS_NAME} in \ sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \ - ${CC} $(DBG) ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ + ${CC} ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ esac # diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index cfa43f338..0dc51cb96 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -19,9 +19,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=-I. -I${srcdir} ${DBUG} -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ - ${XCFLAGS} ${VFSCK_CFLAGS} +CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${VFSCK_CFLAGS} SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ pass4.c pass5.c setup.c utilities.c ufs_subr.c \ diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 7d7f2026c..a1ad4a860 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -9,8 +9,9 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-DNINTERFACE -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\ - ${XCFLAGS} -DRXDEBUG +CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} \ + -I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\ + ${XCFLAGS} -DRXDEBUG -DNINTERFACE LDFLAGS = ${DBUG} ${XLDFLAGS} @@ -30,8 +31,8 @@ LIBS=${TOP_LIBDIR}/libacl.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcom_err.a \ - ${TOP_LIBDIR}/util.a \ - ${TOP_LIBDIR}/liblwp.a + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libafsutil.a headers=${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/afs/acl.h \ diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 9ddcdd170..03169dedf 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -8,7 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=-I. -I${srcdir} ${DBUG} -I.. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 35d7030d9..68aa77538 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -8,15 +8,11 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -INCDIRS=-I${TOP_OBJDIR}/src/config -I. -I${srcdir} -I${TOP_INCDIR} ${FSINCLUDES} -LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} - LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libacl.a -CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG} +CFLAGS = ${COMMON_CFLAGS} -D${SYS_NAME} ${FSINCLUDES} ${XCFLAGS} PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h\ fssync.h ihandle.h namei_ops.h @@ -163,10 +159,10 @@ gi: ${TOP_LIBDIR}/libsys.a volinfo: vol-info.o physio.o ihandle.o ${LIBS} case ${SYS_NAME} in \ *linux* | *fbsd*) \ - ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \ + ${CC} ${CFLAGS} -o volinfo vol-info.o physio.o \ ihandle.o ${LIBS} ${XLIBS} ;; \ *) \ - ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \ + ${CC} ${CFLAGS} -o volinfo vol-info.o physio.o \ ihandle.o ${LIBS} ${XLIBS} ;; \ esac diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 989f98b6a..c42ddc9f5 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -8,13 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=-I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS} - -INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR} -INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR} - VINCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \ ${TOP_INCDIR}/afs/vlserver.h vol.h dump.h volser.h lockdata.h diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index 7105845c1..ecb934912 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -11,13 +11,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -CFLAGS=-I. -I${srcdir} ${DBUG} \ - -I${TOP_OBJDIR}/src/config \ - -I${TOP_INCDIR} \ - -I${TOP_INCDIR}/afs \ - -I/usr/include ${XCFLAGS} - RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h LIBS=${TOP_LIBDIR}/libafsint.a \ -- 2.39.5