From mboxrd@z Thu Jan  1 00:00:00 1970
From: fabbione@sourceware.org <fabbione@sourceware.org>
Date: 28 Aug 2007 04:35:53 -0000
Subject: [Cluster-devel] cluster ./configure ccs/ccs_test/Makefile ccs/ ...
Message-ID: <20070828043553.13548.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-08-28 04:35:47

Modified files:
	.              : configure 
	ccs/ccs_test   : Makefile 
	ccs/ccs_tool   : Makefile 
	ccs/daemon     : Makefile 
	ccs/lib        : Makefile 
	cman/cman_tool : Makefile 
	cman/daemon    : Makefile 
	cman/lib       : Makefile 
	cman/qdisk     : Makefile 
	cman/tests     : Makefile 
	dlm/lib        : Makefile 
	dlm/tests/usertest: Makefile 
	dlm/tool       : Makefile 
	fence/agents/xvm: Makefile 
	fence/fence_node: Makefile 
	fence/fence_tool: Makefile 
	fence/fenced   : Makefile 
	gfs/gfs_debug  : Makefile 
	gfs/gfs_fsck   : Makefile 
	gfs/gfs_mkfs   : Makefile 
	gfs/gfs_quota  : Makefile 
	gfs/gfs_tool   : Makefile 
	gfs/libgfs     : Makefile 
	gfs2/convert   : Makefile 
	gfs2/debug     : Makefile 
	gfs2/edit      : Makefile 
	gfs2/fsck      : Makefile 
	gfs2/libgfs2   : Makefile 
	gfs2/mkfs      : Makefile 
	gfs2/mount     : Makefile 
	gfs2/quota     : Makefile 
	gfs2/tool      : Makefile 
	gnbd/client    : Makefile 
	gnbd/server    : Makefile 
	gnbd/tools/gnbd_export: Makefile 
	gnbd/tools/gnbd_import: Makefile 
	group/daemon   : Makefile 
	group/dlm_controld: Makefile 
	group/gfs_controld: Makefile 
	group/lib      : Makefile 
	group/tool     : Makefile 
	rgmanager/src/clulib: Makefile 
	rgmanager/src/daemons: Makefile 
	rgmanager/src/utils: Makefile 

Log message:
	change the default CFLAGS to "-Wall -O2 -g".
	
	add --debug option to configure that will override the default CFLAGS
	to "-Wall -O0 -DDEBUG -g".
	
	clean up all the relevant Makefiles.
	
	add a few missing ; to configure script.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.54&r2=1.55
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/debug/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- cluster/configure	2007/08/22 08:58:36	1.26
+++ cluster/configure	2007/08/28 04:35:38	1.27
@@ -24,6 +24,7 @@
 %options = (
 	help => \$help,
 	cc => \$cc,
+	debug => \$debug,
 	cflags => \$cflags,
 	extracflags => \$extracflags,
 	ldflags => \$ldflags,
@@ -70,6 +71,7 @@
 $err = &GetOptions (\%options,
 		    'help',
 		    'cc=s',
+		    'debug',
 		    'cflags=s',
 		    'ldflags=s',
 		    'kernel_src=s',
@@ -131,7 +133,8 @@
   print "--module_dir=\tthe base directory for kernel modules.  (Default:  /lib/modules/`uname -r`/kernel\n";
   print "\nbuild flags:\n";
   print "--cc=\t\tcompiler to use.  (Default: gcc)\n";
-  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall)\n";
+  print "--debug\t\tEnable debugging build. Changes default CFLAGS to -Wall -O0 -DDEBUG -g.\n";
+  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O2 -g)\n";
   print "--extracflags=\tadd extra compiler options to default CFLAGS setting.  (Default: none)\n";
   print "--ldflags=\toverride default LDFLAGS settings.  (Default: none)\n";
   print "--extraldflags=\tadd extra linking options to default LDFLAGS settings.  (Default: none)\n";
@@ -172,25 +175,31 @@
   $cc="gcc";
 }
 if (!$cflags) {
-  $cflags="-Wall"
+  $cflags="-Wall";
+  if (!$debug) {
+    $cflags="${cflags} -O2";
+  } else {
+    $cflags="${cflags} -O0 -DDEBUG";
+  }
+  $cflags="${cflags} -g";
 }
 if ($extracflags) {
-  $cflags="${cflags} ${extracflags}"
+  $cflags="${cflags} ${extracflags}";
 }
 if ($extraldflags) {
-  $ldflags="${ldflags} ${extraldflags}"
+  $ldflags="${ldflags} ${extraldflags}";
 }
 if (!$kernel_src) {
-  $kernel_src="/lib/modules/`uname -r`/build"
+  $kernel_src="/lib/modules/`uname -r`/build";
 }
 if (!$module_dir) {
-  $module_dir="/lib/modules/`uname -r`/kernel"
+  $module_dir="/lib/modules/`uname -r`/kernel";
 }
 if (!$gfskincdir) {
-  $gfskincdir="${pwd}/gfs-kernel/src/gfs"
+  $gfskincdir="${pwd}/gfs-kernel/src/gfs";
 }
 if (!$gnbdkincdir) {
-  $gnbdkincdir="${pwd}/gnbd-kernel/src"
+  $gnbdkincdir="${pwd}/gnbd-kernel/src";
 }
 if (!$incdir) {
   $incdir="${prefix}/usr/include";
--- cluster/ccs/ccs_test/Makefile	2007/08/22 08:58:36	1.8
+++ cluster/ccs/ccs_test/Makefile	2007/08/28 04:35:38	1.9
@@ -20,12 +20,6 @@
 CFLAGS += -I${ccsincdir}
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -DDEBUG -g
-else
-CFLAGS += -O2
-endif
-
 LDFLAGS += -L${ccslibdir} -lccs
 
 all: depends ${TARGET}
--- cluster/ccs/ccs_tool/Makefile	2007/08/28 04:32:47	1.14
+++ cluster/ccs/ccs_tool/Makefile	2007/08/28 04:35:39	1.15
@@ -25,12 +25,6 @@
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -DDEBUG -g
-else
-CFLAGS += -O2
-endif
-
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
 LDFLAGS += `xml2-config --libs` -L${libdir} -ldl
 
--- cluster/ccs/daemon/Makefile	2007/08/28 04:32:47	1.16
+++ cluster/ccs/daemon/Makefile	2007/08/28 04:35:39	1.17
@@ -25,12 +25,6 @@
 CFLAGS += -I. -I../include -I../common
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -DDEBUG -g
-else
-CFLAGS += -O2
-endif
-
 LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
 LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl
 
--- cluster/ccs/lib/Makefile	2007/06/01 09:45:31	1.7
+++ cluster/ccs/lib/Makefile	2007/08/28 04:35:39	1.8
@@ -22,12 +22,6 @@
 CFLAGS += -I../include -I../common
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -DDEBUG -g
-else
-CFLAGS += -O2
-endif
-
 all: ${TARGET}
 
 ${TARGET}: ${OBJS}
--- cluster/cman/cman_tool/Makefile	2007/08/22 08:58:36	1.23
+++ cluster/cman/cman_tool/Makefile	2007/08/28 04:35:39	1.24
@@ -21,12 +21,6 @@
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -g -DDEBUG
-else
-CFLAGS += -O2
-endif
-
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
 
 all: depends ${TARGET}
--- cluster/cman/daemon/Makefile	2007/08/22 08:58:37	1.54
+++ cluster/cman/daemon/Makefile	2007/08/28 04:35:39	1.55
@@ -17,12 +17,6 @@
 CFLAGS += -I${ccsincdir} -I${openaisincdir}
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -g -DDEBUG
-else
-CFLAGS += -O2
-endif
-
 LDFLAGS += -L${ccslibdir} -lccs 
 
 TARGET= service_cman.lcrso
--- cluster/cman/lib/Makefile	2007/06/01 09:45:31	1.10
+++ cluster/cman/lib/Makefile	2007/08/28 04:35:39	1.11
@@ -18,8 +18,8 @@
 SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
 STATICLIB=$(TARGET).a
 
-CFLAGS += -g -I. -fPIC
-CFLAGS += -I../daemon
+CFLAGS += -fPIC
+CFLAGS += -I. -I../daemon
 CFLAGS += -I${incdir}
 
 all: $(STATICLIB) $(SHAREDLIB)
--- cluster/cman/qdisk/Makefile	2007/08/28 04:32:47	1.12
+++ cluster/cman/qdisk/Makefile	2007/08/28 04:35:39	1.13
@@ -13,7 +13,7 @@
 include ../../make/defines.mk
 
 CFLAGS += -D_GNU_SOURCE
-CFLAGS += -Werror -Wstrict-prototypes -Wshadow -g
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I.
 CFLAGS += -I${incdir}
--- cluster/cman/tests/Makefile	2007/06/01 09:45:31	1.7
+++ cluster/cman/tests/Makefile	2007/08/28 04:35:39	1.8
@@ -1,6 +1,6 @@
 include ../../make/defines.mk
 
-CFLAGS += -g -I${cmanincdir}
+CFLAGS += -I${cmanincdir}
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${cmanlibdir} -lcman
--- cluster/dlm/lib/Makefile	2007/08/21 04:46:43	1.21
+++ cluster/dlm/lib/Makefile	2007/08/28 04:35:40	1.22
@@ -19,7 +19,6 @@
 SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
 STATICLIB=$(TARGET).a $(TARGET)_lt.a
 
-CFLAGS += -g -O2 
 CFLAGS += -I.
 CFLAGS += -I${incdir}
 CFLAGS += -I$(KERNEL_SRC)/include
--- cluster/dlm/tests/usertest/Makefile	2007/08/28 04:32:47	1.12
+++ cluster/dlm/tests/usertest/Makefile	2007/08/28 04:35:40	1.13
@@ -18,7 +18,6 @@
 all: depends ${TARGETS}
 
 CFLAGS += -D_REENTRANT
-CFLAGS += -g
 CFLAGS += -I${dlmincdir}
 
 LDFLAGS += -L${dlmlibdir} -ldlm -lpthread
--- cluster/dlm/tool/Makefile	2007/07/13 18:29:50	1.3
+++ cluster/dlm/tool/Makefile	2007/08/28 04:35:40	1.4
@@ -16,7 +16,6 @@
 
 OBJS=	main.o
 
-CFLAGS += -g
 CFLAGS += -I. -I../lib/ -I../../group/dlm_controld/
 CFLAGS += -I${incdir}
 
--- cluster/fence/agents/xvm/Makefile	2007/08/28 04:32:47	1.14
+++ cluster/fence/agents/xvm/Makefile	2007/08/28 04:35:40	1.15
@@ -34,7 +34,7 @@
 		debug.o
 
 CFLAGS += -D_GNU_SOURCE
-CFLAGS += -Werror -Wstrict-prototypes -Wshadow -ggdb
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
 CFLAGS += `xml2-config --cflags`
--- cluster/fence/fence_node/Makefile	2007/08/22 08:58:42	1.9
+++ cluster/fence/fence_node/Makefile	2007/08/28 04:35:40	1.10
@@ -18,13 +18,7 @@
 OBJS=	../fenced/agent.o \
 	fence_node.o
 
-CFLAGS += -g -D_FILE_OFFSET_BITS=64
-
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -DDEBUG -g
-else
-CFLAGS += -O2
-endif
+CFLAGS += -D_FILE_OFFSET_BITS=64
 
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I../include
--- cluster/fence/fence_tool/Makefile	2007/08/22 08:58:42	1.16
+++ cluster/fence/fence_tool/Makefile	2007/08/28 04:35:42	1.17
@@ -23,12 +23,6 @@
 CFLAGS += -I../include -I../../group/lib
 CFLAGS += -I${incdir}
 
-ifeq ($(DEBUG),y)
-CFLAGS += -O0 -g
-else
-CFLAGS += -O2
-endif
-
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
 LDFLAGS += -L../../group/lib -lgroup
 
--- cluster/fence/fenced/Makefile	2007/08/22 08:58:42	1.11
+++ cluster/fence/fenced/Makefile	2007/08/28 04:35:42	1.12
@@ -22,7 +22,6 @@
 	agent.o 
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -g
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I. -I../include -I../../group/lib
 CFLAGS += -I${incdir}
--- cluster/gfs/gfs_debug/Makefile	2007/08/22 08:58:42	1.9
+++ cluster/gfs/gfs_debug/Makefile	2007/08/28 04:35:42	1.10
@@ -23,7 +23,6 @@
 	util.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
--- cluster/gfs/gfs_fsck/Makefile	2007/08/22 08:58:43	1.12
+++ cluster/gfs/gfs_fsck/Makefile	2007/08/28 04:35:42	1.13
@@ -47,7 +47,7 @@
 	util.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -MMD -O2
+CFLAGS += -MMD
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
 
--- cluster/gfs/gfs_mkfs/Makefile	2007/08/22 08:58:44	1.11
+++ cluster/gfs/gfs_mkfs/Makefile	2007/08/28 04:35:42	1.12
@@ -24,7 +24,6 @@
 	structures.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
 CFLAGS += -I${gfskincdir} -I${volidincdir}
 CFLAGS += -I../include -I../libgfs
 CFLAGS += -I${incdir}
--- cluster/gfs/gfs_quota/Makefile	2007/08/22 08:58:44	1.10
+++ cluster/gfs/gfs_quota/Makefile	2007/08/28 04:35:42	1.11
@@ -22,7 +22,6 @@
 	layout.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
--- cluster/gfs/gfs_tool/Makefile	2007/08/28 04:32:47	1.14
+++ cluster/gfs/gfs_tool/Makefile	2007/08/28 04:35:43	1.15
@@ -26,7 +26,6 @@
 	util.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
--- cluster/gfs/libgfs/Makefile	2007/08/28 04:32:47	1.9
+++ cluster/gfs/libgfs/Makefile	2007/08/28 04:35:43	1.10
@@ -17,7 +17,7 @@
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
-CFLAGS += -c -ggdb 
+CFLAGS += -c
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I${gfskincdir} -I../include
 CFLAGS += -I${incdir}
--- cluster/gfs2/convert/Makefile	2007/08/28 04:32:47	1.11
+++ cluster/gfs2/convert/Makefile	2007/08/28 04:35:43	1.12
@@ -17,7 +17,6 @@
 OBJS= gfs2_convert.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -g
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2
 CFLAGS += -I${incdir}
--- cluster/gfs2/debug/Makefile	2007/08/22 08:58:45	1.4
+++ cluster/gfs2/debug/Makefile	2007/08/28 04:35:43	1.5
@@ -24,7 +24,7 @@
 	readfile.c \
 	util.c
 
-CFLAGS+= -O2 -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
+CFLAGS+= -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
 
 INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config \
 	-I${gfs2kincdir} -I${incdir}
--- cluster/gfs2/edit/Makefile	2007/08/22 08:58:46	1.11
+++ cluster/gfs2/edit/Makefile	2007/08/28 04:35:43	1.12
@@ -20,7 +20,6 @@
 	hexedit.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -ggdb 
 CFLAGS += -I${ncursesincdir}
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2
--- cluster/gfs2/fsck/Makefile	2007/08/28 04:32:48	1.15
+++ cluster/gfs2/fsck/Makefile	2007/08/28 04:35:43	1.16
@@ -35,7 +35,7 @@
 	util.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -MMD -O2
+CFLAGS += -MMD
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2
 CFLAGS += -I${incdir}
--- cluster/gfs2/libgfs2/Makefile	2007/08/28 04:32:48	1.10
+++ cluster/gfs2/libgfs2/Makefile	2007/08/28 04:35:43	1.11
@@ -15,9 +15,7 @@
 
 TARGET= libgfs2.a
 
-## Bob: add -O2 back in and take -ggdb out
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
-CFLAGS += -ggdb
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
--- cluster/gfs2/mkfs/Makefile	2007/08/28 04:32:48	1.20
+++ cluster/gfs2/mkfs/Makefile	2007/08/28 04:35:43	1.21
@@ -16,7 +16,6 @@
 	main_jadd.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
-CFLAGS += -O2 -ggdb
 CFLAGS += -I${KERNEL_SRC}/include/
 CFLAGS += -I../include/ -I../libgfs2/
 CFLAGS += -I${incdir}
--- cluster/gfs2/mount/Makefile	2007/08/22 08:58:46	1.17
+++ cluster/gfs2/mount/Makefile	2007/08/28 04:35:44	1.18
@@ -24,7 +24,6 @@
 	    mtab.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include
--- cluster/gfs2/quota/Makefile	2007/08/22 08:58:46	1.12
+++ cluster/gfs2/quota/Makefile	2007/08/28 04:35:44	1.13
@@ -20,7 +20,6 @@
 	check.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-CFLAGS += -O2
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include -I../libgfs2/
 CFLAGS += -I${incdir}
--- cluster/gfs2/tool/Makefile	2007/08/28 04:32:48	1.12
+++ cluster/gfs2/tool/Makefile	2007/08/28 04:35:44	1.13
@@ -26,7 +26,6 @@
 	util.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
--- cluster/gnbd/client/Makefile	2007/08/22 08:58:47	1.14
+++ cluster/gnbd/client/Makefile	2007/08/28 04:35:44	1.15
@@ -25,7 +25,6 @@
 SHAREDOBJS= ../utils/trans.o \
 	    ../utils/gnbd_utils.o
 
-CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../include -I../server -I../utils
 CFLAGS += -I${incdir}
--- cluster/gnbd/server/Makefile	2007/08/22 08:58:47	1.14
+++ cluster/gnbd/server/Makefile	2007/08/28 04:35:44	1.15
@@ -30,7 +30,6 @@
 SHAREDOBJS= ../utils/gnbd_utils.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../include -I../utils
 CFLAGS += -I${incdir}
--- cluster/gnbd/tools/gnbd_export/Makefile	2007/08/22 08:58:47	1.15
+++ cluster/gnbd/tools/gnbd_export/Makefile	2007/08/28 04:35:44	1.16
@@ -20,7 +20,6 @@
 	../../utils/trans.o
 
 CFLAGS += -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\"
-CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../../include -I../../server -I../../utils
 CFLAGS += -I${incdir}
--- cluster/gnbd/tools/gnbd_import/Makefile	2007/08/22 08:58:47	1.12
+++ cluster/gnbd/tools/gnbd_import/Makefile	2007/08/28 04:35:44	1.13
@@ -20,7 +20,6 @@
 	../../client/monitor_req.o \
 	../../utils/trans.o
 
-CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
 CFLAGS += -I../../include -I../../client -I../../server -I../../utils
 CFLAGS += -I${incdir}
--- cluster/group/daemon/Makefile	2007/08/09 09:37:36	1.20
+++ cluster/group/daemon/Makefile	2007/08/28 04:35:44	1.21
@@ -20,7 +20,6 @@
 	joinleave.o \
 	main.o
 
-CFLAGS += -g 
 CFLAGS += -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -I. -I../include/ -I../lib/
 CFLAGS += -I${incdir}
--- cluster/group/dlm_controld/Makefile	2007/08/21 04:46:43	1.11
+++ cluster/group/dlm_controld/Makefile	2007/08/28 04:35:45	1.12
@@ -20,7 +20,6 @@
 	action.o \
 	deadlock.o
 
-CFLAGS += -g 
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${openaisincdir}
 CFLAGS += -I${KERNEL_SRC}/include/
 CFLAGS += -I../../group/lib/ -I../include/
--- cluster/group/gfs_controld/Makefile	2007/08/21 04:46:44	1.13
+++ cluster/group/gfs_controld/Makefile	2007/08/28 04:35:45	1.14
@@ -21,7 +21,6 @@
 	plock.o \
 	recover.o
 
-CFLAGS += -g -O2
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -I${KERNEL_SRC}/include/
 CFLAGS += -I../include/ -I../lib/
--- cluster/group/lib/Makefile	2007/06/01 09:45:35	1.6
+++ cluster/group/lib/Makefile	2007/08/28 04:35:45	1.7
@@ -15,7 +15,7 @@
 TARGET=libgroup
 STATICLIB=$(TARGET).a
 
-CFLAGS += -g -O -fPIC
+CFLAGS += -fPIC
 CFLAGS += -I. -I../daemon
 CFLAGS += -I${incdir}
 
--- cluster/group/tool/Makefile	2007/06/01 09:45:36	1.10
+++ cluster/group/tool/Makefile	2007/08/28 04:35:45	1.11
@@ -16,7 +16,6 @@
 
 OBJS=	main.o
 
-CFLAGS += -g
 CFLAGS += -I. -I../lib/ -I../daemon/
 CFLAGS += -I${incdir}
 
--- cluster/rgmanager/src/clulib/Makefile	2007/08/22 08:58:47	1.16
+++ cluster/rgmanager/src/clulib/Makefile	2007/08/28 04:35:47	1.17
@@ -25,7 +25,7 @@
 
 OBJS3= msgtest.o
 
-CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
 CFLAGS += -I${cmanincdir} -I${dlmincdir}
 CFLAGS += -I../../include
 CFLAGS += -I${incdir}
--- cluster/rgmanager/src/daemons/Makefile	2007/06/01 09:45:36	1.22
+++ cluster/rgmanager/src/daemons/Makefile	2007/08/28 04:35:47	1.23
@@ -48,7 +48,7 @@
 		rg_locks-noccs.o
 
 CFLAGS += -D_GNU_SOURCE -DSHAREDIR=\"${sharedir}\"
-CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
 CFLAGS += `xml2-config --cflags` -I${readlineincdir}
 CFLAGS += -I../../include
--- cluster/rgmanager/src/utils/Makefile	2007/08/22 08:58:47	1.18
+++ cluster/rgmanager/src/utils/Makefile	2007/08/28 04:35:47	1.19
@@ -21,7 +21,7 @@
 
 DISABLEDTARGETS= cluarp
 
-CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
 CFLAGS += -I../../include
 CFLAGS += -I${incdir}