STABLE12-cleanup-dbg-and-ldflags-20030701

FIXES 1653

switch from -g to ${DBG}; remove -g from LDFLAGS.

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index f9ab85da2c97ce9980d8f7acae8ed53962e45b0e..1a628cf905f378e651f27274118b3526baf0e0fe 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -30,8 +30,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
 
 INSTALLex = ${INSTALL} -m 755
 
@@ -49,17 +49,17 @@ AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${
 afsd: afsd.o $(AFSLIBS)
        case ${SYS_NAME} in \
        sgi_61 | sgi_62 | sgi_63) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \
+               ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \
        sgi_64 | sgi_65 ) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \
+               ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \
        ppc_darwin* ) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} -F/System/Library/PrivateFrameworks -framework DiskArbitration ;; \
+               ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} -F/System/Library/PrivateFrameworks -framework DiskArbitration ;; \
        * ) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \
+               ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \
        esac
 
 vsys: vsys.o
-       $(CC) -g -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS}
+       $(CC) -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS}
 
 #
 # Objects

diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in
index 213ed29ba8bcd2adcf06890b9dce32db3d9e8c3d..0171664093cf671a92fad8648b9134d16085a703 100644 (file)
--- a/src/afsmonitor/Makefile.in
+++ b/src/afsmonitor/Makefile.in
@@ -29,7 +29,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -I. \
+CFLAGS=${DBG} -I. \
        -I${TOP_SRCDIR}/config \
        -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs \

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 60f8aeb238c3e0494ae222ae489be75caacff1bd..0a098552567d31ae9d37a7be5b5b9ff7e9dadb34 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -35,7 +35,7 @@ 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=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/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 5e46021f938391aa9b28a44c693d6ce724743630..c48b800c10d67df3a7be1c84249b6045061aae2c 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -28,7 +28,7 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/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 6fcbc06b0e29bd838a6db2a7c40d994b16f36f6e..c414aaf3c090cc0ab681c167a894d0bfe410226b 100644 (file)
--- a/src/bu_utils/Makefile.in
+++ b/src/bu_utils/Makefile.in
@@ -28,7 +28,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS}
+CFLAGS=${DBG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
 
 all: fms

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 701dd619ff7ad51903931b5242b39b87f2d0fb73..931acd340d04f45d4dc2be0a506012508619d0ee 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -30,8 +30,8 @@ include ../config/Makefile.${SYS_NAME}
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
 INCLS=\
        ${TOP_INCDIR}/lock.h \
        ${TOP_INCDIR}/ubik.h \

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index 67afda267e5d0b21d6fddc1ce7072fc7b31b4c1c..a937b8fb4dfa6fb94a324f1c86acdefbd1694c66 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -28,7 +28,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -w ${INCDIRS} ${XCFLAGS} @XBSA_CFLAGS@
+CFLAGS=${DBG} -w ${INCDIRS} ${XCFLAGS} @XBSA_CFLAGS@
 
 INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs \
        -I${TOP_INCDIR}/rx -I${TOP_INCDIR}

diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in
index 81e322df5331635f520222175d3569986feb4a83..f7e9ccfa5a5539563978640ebc7c82de98eac45d 100644 (file)
--- a/src/butm/Makefile.in
+++ b/src/butm/Makefile.in
@@ -26,8 +26,8 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
+CFLAGS=${DBG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
 INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
 
 LIBS=${TOP_LIBDIR}/libbubasics.a \

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index 1cf3b9e70217c4167546944fab38b76f6f20f402..ac4538f90b11290264b74cb627c553012b824475 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -30,7 +30,7 @@ SHELL=/bin/sh
 
 include Makefile.${SYS_NAME}
 
-CFLAGS=-g -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} -I${TOP_INCDIR} ${XCFLAGS}
 
 INST=$(RM) -f $@; $(CP) $? $@
 

diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in
index 5c6810f6fa35673fb87ce5d96341a29c54b58403..c4d9fb475feb073075f5f20ef7922eba04248651 100644 (file)
--- a/src/dauth/Makefile.in
+++ b/src/dauth/Makefile.in
@@ -28,10 +28,9 @@ SHELL =      /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-OPTMZ= -g
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS =      ${OPTMZ} ${XLDFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+LDFLAGS =      ${XLDFLAGS}
 
 INCLS=${TOP_INCDIR}/ubik.h \
                ${TOP_INCDIR}/lwp.h \

diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in
index eb1f0e197d0bb83a20efa17b19ddad678fd4a8d7..2aad40c926d5e12966012a189f88e1f76fc66bf9 100644 (file)
--- a/src/finale/Makefile.in
+++ b/src/finale/Makefile.in
@@ -27,8 +27,8 @@ SYS_NAME=@AFS_SYSNAME@
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
 INCLS=${TOP_INCDIR}/ubik.h \
        ${TOP_INCDIR}/lwp.h \
        ${TOP_INCDIR}/lock.h  \

diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in
index 802f68a8a2ca36d4d2499df6c1c2aa7e5c621214..4a158c9e7f3563e5d671ea275af9295446719d83 100644 (file)
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@@ -31,7 +31,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -I. \
+CFLAGS=${DBG} -I. \
        -I${TOP_SRCDIR}/config \
        -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs \

diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index cfaa3dff31b04022041754ea2335405905cb0e95..fb1bc0bb5505248a0434038d1098a7422b3919c2 100644 (file)
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -54,7 +54,7 @@ KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \
           ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a
 
 INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I/usr/include -I/usr/include/sys
-CFLAGS=        -g ${XCFLAGS} ${INCLUDES}
+CFLAGS=        ${DBG} ${XCFLAGS} ${INCLUDES}
 LIBC=  /lib/libc.a
 SRCS=  login.c 
 OBJS=   login.o setenv.o getenv.o libutil.a
@@ -71,14 +71,14 @@ all: login login.krb
 
 login: ${OBJS} ${LIBS}
        case ${SYS_NAME} in \
-       sun4x_5? | sunx86_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\
-       *) ${CC} -g -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
+       sun4x_5? | sunx86_5? ) ${CC} -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\
+       *) ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
        esac 
 
 login.krb: ${KOBJS} ${KLIBS}
        case ${SYS_NAME} in \
-       sun4x_5? | sunx86_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\
-       *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\
+       sun4x_5? | sunx86_5? ) ${CC} -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\
+       *) ${CC} -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\
        esac 
 
 libutil.a : ${UTILOBJS}

diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in
index 49067af2f09a973d9922e0b97467b23d9e789d59..fd9178f4017f46c5199374725ea598b79ba838dd 100644 (file)
--- a/src/pinstall/Makefile.in
+++ b/src/pinstall/Makefile.in
@@ -30,7 +30,7 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 LIBS= ${XLIBS}
-CFLAGS=${OPTMZ} -g -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=${OPTMZ} ${DBG} -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
 
 all: pinstall
 

diff --git a/src/rx/bulk.example/Makefile.in b/src/rx/bulk.example/Makefile.in
index 45a05731535b82549deb7e37002dc4d9132129ff..131bedfb53ca964fad5147fe9df30fd0b3788060 100644 (file)
--- a/src/rx/bulk.example/Makefile.in
+++ b/src/rx/bulk.example/Makefile.in
@@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
 INSTALL=${SRCDIR}/bin/install
 LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: bulk_client bulk_server
 

diff --git a/src/rx/bulktest/Makefile.in b/src/rx/bulktest/Makefile.in
index 45a05731535b82549deb7e37002dc4d9132129ff..131bedfb53ca964fad5147fe9df30fd0b3788060 100644 (file)
--- a/src/rx/bulktest/Makefile.in
+++ b/src/rx/bulktest/Makefile.in
@@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
 INSTALL=${SRCDIR}/bin/install
 LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: bulk_client bulk_server
 

diff --git a/src/rx/multi.example/Makefile.in b/src/rx/multi.example/Makefile.in
index bb7ac9c4abd5b546dbd6a5149265b1ec44257da1..d2c99c3a9dcde8ed3d0fbe8b92b6d24f54cb3b88 100644 (file)
--- a/src/rx/multi.example/Makefile.in
+++ b/src/rx/multi.example/Makefile.in
@@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
 INSTALL=${SRCDIR}/bin/install
 LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: sample_client sample_server
 

diff --git a/src/rx/simple.example/Makefile.in b/src/rx/simple.example/Makefile.in
index 1fab2e59c34ecee2c33fb034b8e9d988c4755530..d0199241019feee408a75ddf53be0ba3034b9cca 100644 (file)
--- a/src/rx/simple.example/Makefile.in
+++ b/src/rx/simple.example/Makefile.in
@@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
 INSTALL=${SRCDIR}/bin/install
 LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=-g -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: sample_client sample_server
 

diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
index cea77cecf763ed72f6d5002150f95b79f5171ec7..f4e819f9e706aa56a7cb1e2cfc6a41c2027cfb12 100644 (file)
--- a/src/rxkad/test/Makefile.in
+++ b/src/rxkad/test/Makefile.in
@@ -31,9 +31,7 @@ KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
-OPTIMIZE=-g
-
-CFLAGS=-g -I. -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} -I. -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h
 

diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in
index b89dd13f129c86f37078c4b2c41bb9cad00b2d30..37ad70dc5f34f789db7bd9af1faea3da68cd5920 100644 (file)
--- a/src/sia/Makefile.in
+++ b/src/sia/Makefile.in
@@ -28,7 +28,6 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-DEBUG = 
 #UNRESOLVED = -expect_unresolved \*
 UNRESOLVED =
 include ../config/Makefile.${SYS_NAME}
@@ -48,7 +47,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_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 
 ${DEST}/lib/afs/libafssiad.so: libafssiad.so
        ${INSTALL} $? $@
@@ -57,21 +56,21 @@ ${DEST}/lib/afs/libafssiad.krb.so: libafssiad.krb.so
        ${INSTALL} $? $@
 
 siad.o: siad.c
-       $(CC) $(CFLAGS) -c -g siad.c -o siad.o
+       $(CC) $(CFLAGS) -c siad.c -o siad.o
 
 siad_krb.o: siad.c
-       $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c -g siad.c -o siad_krb.o
+       $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c siad.c -o siad_krb.o
 
 libafssiad.so: siad.o
-       $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.so \
+       $(LD) $(LDFLAGS) -shared -no_archive -o libafssiad.so \
                 ${UNRESOLVED} siad.o ${LIBS} -none -lc
 
 libafssiad.krb.so: siad_krb.o
-       $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.krb.so \
+       $(LD) $(LDFLAGS) -shared -no_archive -o libafssiad.krb.so \
                 ${UNRESOLVED} siad_krb.o ${KLIBS} ${LIBS} -none -lc
 
 test-reauth: test-reauth.o
-       $(CC) $(CFLAGS) -g -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/tsm41/Makefile.in b/src/tsm41/Makefile.in
index d8cd5e972e7ebebf6503ee0f3e6382f187f00bfe..6f82cb403cdde198d36d15f7e627d6e6302b860a 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -25,8 +25,7 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
-OPTIMIZE=-g
-CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 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 \

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 335c1036f1345c2b24d8934d7c7c89e57b2cbd7a..5384d1d2c233ddeeca660ee8a495ee28d586445d 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -26,7 +26,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS}
 UKERNELDIR=../libuafs/
 
 LIBOBJS=disk.o  remote.o beacon.o recovery.o ubik.o  vote.o lock.o phys.o \
@@ -77,7 +77,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} -g -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c udebug.c
+       ${CC} ${CFLAGS} -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c udebug.c
 
 uerrors.o: uerrors.c
 

diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in
index d67e2e0c8004841a2a7d31fcdca03ce937479157..b690f296f13e9d92527d9e863eed680a097780e0 100644 (file)
--- a/src/util/test/Makefile.in
+++ b/src/util/test/Makefile.in
@@ -12,7 +12,7 @@ SYS_NAME=@AFS_SYSNAME@
 
 include ../../config/Makefile.${SYS_NAME}
 
-CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} -g
+CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} ${DBG}
 
 tests: test_ktime ktest dirpath_test
 

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index b5dabe13d4e633eff44d0ac6652c39e86c80adf1..6b444585d2544e8b2fa71b927d3f8da1ef8262f8 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -34,7 +34,7 @@ include ../config/Makefile.${SYS_NAME}
 INSTALLex = ${INSTALL} -m 755
 CCXPG2= /usr/xpg2bin/cc
 
-CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${OPTMZ} ${DBG} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 
 INCLS=${TOP_INCDIR}/afs/afsint.h \
        ${TOP_INCDIR}/afs/cmd.h \
@@ -140,37 +140,37 @@ ${DEST}/etc/kdump64: kdump64
 up.o: up.c AFS_component_version_number.c
 
 up: up.o
-       ${CC} ${CFLAGS} -g -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} -g -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} -g -o livesys $(CFLAGS) livesys.c $(LIBS) ${XLIBS}
+       ${CC} -o livesys $(CFLAGS) livesys.c $(LIBS) ${XLIBS}
 
 twiddle: twiddle.c $(LIBS)
-       ${CC} -g -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS}
+       ${CC} -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS}
 
 gcpags: gcpags.c $(LIBS)
-       ${CC} -g -o gcpags $(CFLAGS) gcpags.c $(LIBS) ${XLIBS}
+       ${CC} -o gcpags $(CFLAGS) gcpags.c $(LIBS) ${XLIBS}
 
 whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c
 
 whatfid: whatfid.o ${LIBS}
-       ${CC} ${CFLAGS} -g -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} -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
+                       ${CCXPG2} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c 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} -I/usr/xpg2include -I/usr/5include -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
                * ) \
-                       ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
+                       ${CC} ${CFLAGS} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
        esac
 
 fstrace: fstrace.o
@@ -178,9 +178,9 @@ 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} -g -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 ;; \
+                       ${CC} -L/usr/xpg2lib -L/usr/5lib ${CFLAGS} -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?) \
                        ${CC} -I${TOP_SRCDIR}/config  -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
                * ) \
@@ -196,11 +196,11 @@ ${KDUMP}.o: kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
                alpha_linux* ) \
-                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
+                       ${CC} -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
                *linux* ) \
-                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
+                       ${CC} -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
                alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
-                       ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
+                       ${CC} ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
                sgi_6? ) \
                        for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
                        do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
@@ -209,14 +209,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 \
-                                               -g -I${TOP_INCDIR} \
+                                               -I${TOP_INCDIR} \
                                                -I${TOP_SRCDIR}/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS64} \
                                                -c kdump.c -o kdump.$$IP.o \
                                        ;; \
                                *)      ${CC} -D_KMEMUSER -woff 1178 \
-                                               -g -I${TOP_INCDIR} \
+                                               -I${TOP_INCDIR} \
                                                -I${TOP_SRCDIR}/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
@@ -226,23 +226,23 @@ ${KDUMP}.o: kdump.c ${INCLS} AFS_component_version_number.c
                        done \
                        ;; \
                *) \
-                       ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -c kdump.c ;; \
+                       ${CC} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -c kdump.c ;; \
        esac ;
 
 kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[789] | hp_ux11* ) \
-               ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
+               ${CC} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c 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_54) \
-               ${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..\)'`; \
@@ -250,12 +250,12 @@ ${KDUMP}:  ${KDUMP}.o
                        echo IP = $$IP; \
                        echo CPU_KDEFS = $$CPU_KDEFS; \
                        case $$CPU_KDEFS in \
-                       *-64*)  ${CC} ${XCFLAGS64} -g \
+                       *-64*)  ${CC} ${XCFLAGS64} \
                                        $$CPU_KDEFS \
                                        -o kdump.$$IP kdump.$$IP.o \
                                        ${TOP_LIBDIR}/libcmd64.a -lelf \
                                ;; \
-                       *)      ${CC} ${XCFLAGS} -g \
+                       *)      ${CC} ${XCFLAGS} \
                                        $$CPU_KDEFS \
                                        -o kdump.$$IP kdump.$$IP.o \
                                        ${TOP_LIBDIR}/libcmd.a -lelf \
@@ -263,11 +263,11 @@ ${KDUMP}:  ${KDUMP}.o
                        esac || exit $$? ; \
                done ;; \
        *linux* ) \
-               ${CC} -g -o kdump-${LINUX_VERSION} kdump-${LINUX_VERSION}.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \
+               ${CC} -o kdump-${LINUX_VERSION} kdump-${LINUX_VERSION}.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \
        alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \
-               ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a ${XLIBS} -ll -lmld;; \
-       ncrx86_* ) ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a -lelf ${XLIBS} ;; \
-       * )     ${CC} -g -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} -ll -lmld;; \
+       ncrx86_* ) ${CC} -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} ;; \
        esac
 
 ## kdump to read from 64 bit kernel dumps
@@ -276,7 +276,7 @@ kdump64 : kdump64.o
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[789] | hp_ux11* )  \
-               ${CC} -g ${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
 
 #