Honour --enable-debug for userspace parts

For userspace we use ${DBG}, whereas for libafs ${DBUG} is used.
Use ${DBG} outside of src/libafs.

Change-Id: I8985e45fd8406d61b85e6e4156fa313bd056a857
Reviewed-on: http://gerrit.openafs.org/3541
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 70c0dd9e2b0a43e76219e2d8f039a08ccfe90a6d)

diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index a435392b4c898d9dcee2038f9e6516d91158b9b5..147a3c7c6e1c85c7bc71b4b27f59b218c565b01d 100644 (file)
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -15,7 +15,7 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
 
 all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
 

diff --git a/src/procmgmt/test/Makefile.in b/src/procmgmt/test/Makefile.in
index 99295eaad44f5a0e10d48aade27ca3cf6651dd6d..e8c68c2a5ebd51b811bd49f651b6cba6ab4c5f5e 100644 (file)
--- a/src/procmgmt/test/Makefile.in
+++ b/src/procmgmt/test/Makefile.in
@@ -9,7 +9,7 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
 
-CFLAGS = $(DBUG) -I${SRCDIR}/include ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS = $(DBG) -I${SRCDIR}/include ${XCFLAGS} ${ARCHFLAGS}
 
 ########################################################################
 # build tests

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 83f2daf1a401afe6f7ce5cb1c3078897b360df4e..8abce5f9fa9238c74cb5b0485d098622f33d308a 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -15,7 +15,7 @@ LIBAFSSETPAGMINOR=0
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=-I. -I${srcdir} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCFLAGS} ${ARCHFLAGS}
 SFLAGS=-I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
 

diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in
index 97a176c6b1997b8dece065f287e3d55c7530392f..db4ef5f19f92c7c15d4940db479f5a5afc288618 100644 (file)
--- a/src/usd/Makefile.in
+++ b/src/usd/Makefile.in
@@ -10,7 +10,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 
 
-CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} ${DBG}
 
 all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h
 

diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in
index b58cadc18324f7cb4f657fea2e2806f67ffb102e..26cc0108c766e60b6bc7ab353a5086d872173bcd 100644 (file)
--- a/src/usd/test/Makefile.in
+++ b/src/usd/test/Makefile.in
@@ -10,7 +10,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 
 INCDIRS= -I${DESTDIR}/include  -I..
-CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS = $(DBG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS}
 LIBUSD=DEST/lib/afs/libusd.a
 
 #####################################################################

diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index ab2c10e6fd1f62c95c6132130eff9672a15cbc6d..0101f8f0db7b0dcb541b578b674c58ceb84eb956 100644 (file)
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -12,7 +12,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 all: uss
 
-CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \
+CFLAGS=-I. -I${srcdir} ${DBG} -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} -I. ${XCFLAGS} ${ARCHFLAGS}
 
 #

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 1b7d23f597ead4cdce4c4cccdaa780df6d58ba7b..7fcf6d9f5f29fb57bf4b32b0a18aabd9ecdd96c7 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -16,7 +16,7 @@ CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\
         ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG -DNINTERFACE
 
-LDFLAGS = ${DBUG} ${XLDFLAGS} ${ARCHFLAGS}
+LDFLAGS = ${DBG} ${XLDFLAGS} ${ARCHFLAGS}
 
 LIBS=${TOP_LIBDIR}/libacl.a    \
        ${TOP_LIBDIR}/libvldb.a \

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index dd4e7aefa391a62e2529586821fb7ffa55b8a39c..61af386be4259a6229ddbc8acb0ec788bfc03b44 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -68,7 +68,7 @@ vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
        ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS}
 
 volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a
-       ${CC} ${DBUG} -o volserver $(SOBJS) ${TOP_LIBDIR}/libdir.a \
+       ${CC} ${DBG} -o volserver $(SOBJS) ${TOP_LIBDIR}/libdir.a \
                ${LDFLAGS} $(LIBS) ${XLIBS}
 
 voldump: vol-dump.o ${VOLDUMP_LIBS}