From: Christof Hanke <christof.hanke@rzg.mpg.de>
Date: Fri, 17 Dec 2010 15:08:14 +0000 (+0100)
Subject: Honour --enable-debug for userspace parts
X-Git-Tag: debian/1.4.14+dfsg-2~18
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bcffa984ae3cd8b71c7a66e85b0858e0f3fb4d61;p=packages%2Fo%2Fopenafs.git

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 a435392b4..147a3c7c6 100644
--- 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 99295eaad..e8c68c2a5 100644
--- 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 83f2daf1a..8abce5f9f 100644
--- 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 97a176c6b..db4ef5f19 100644
--- 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 b58cadc18..26cc0108c 100644
--- 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 ab2c10e6f..0101f8f0d 100644
--- 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 1b7d23f59..7fcf6d9f5 100644
--- 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 dd4e7aefa..61af386be 100644
--- 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}