[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH] Cleanup some common CFLAGS



The following patch does:

- 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 (almost cosmetic since
  perl didn't trip on them).

NOTE that some subproject were using -ggdb with notes that had to be removed.
This is basically the only "major" change in the set since it will switch to a
more common -g. According to gcc 4.1 man page -g is still good enough to
generate enough debugging information for gdb.

Please ACK or apply.

Fabio

PS The patch depends on the previous Makefile cleanup I posted on the mailing
list right before this one.

-- 
I'm going to make him an offer he can't refuse.
diff -Naurd redhat-cluster-suite-2.20070823/ccs/ccs_test/Makefile cluster/ccs/ccs_test/Makefile
--- redhat-cluster-suite-2.20070823/ccs/ccs_test/Makefile	2007-08-23 06:48:17.000000000 +0200
+++ cluster/ccs/ccs_test/Makefile	2007-08-26 07:05:41.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/ccs/ccs_tool/Makefile cluster/ccs/ccs_tool/Makefile
--- redhat-cluster-suite-2.20070823/ccs/ccs_tool/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/ccs/ccs_tool/Makefile	2007-08-26 07:05:52.000000000 +0200
@@ -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
 
diff -Naurd redhat-cluster-suite-2.20070823/ccs/daemon/Makefile cluster/ccs/daemon/Makefile
--- redhat-cluster-suite-2.20070823/ccs/daemon/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/ccs/daemon/Makefile	2007-08-26 07:06:01.000000000 +0200
@@ -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
 
diff -Naurd redhat-cluster-suite-2.20070823/ccs/lib/Makefile cluster/ccs/lib/Makefile
--- redhat-cluster-suite-2.20070823/ccs/lib/Makefile	2007-06-02 16:23:26.000000000 +0200
+++ cluster/ccs/lib/Makefile	2007-08-26 07:05:31.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/cman/cman_tool/Makefile cluster/cman/cman_tool/Makefile
--- redhat-cluster-suite-2.20070823/cman/cman_tool/Makefile	2007-08-23 06:48:18.000000000 +0200
+++ cluster/cman/cman_tool/Makefile	2007-08-26 07:06:11.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/cman/daemon/Makefile cluster/cman/daemon/Makefile
--- redhat-cluster-suite-2.20070823/cman/daemon/Makefile	2007-08-23 06:48:18.000000000 +0200
+++ cluster/cman/daemon/Makefile	2007-08-26 07:06:23.000000000 +0200
@@ -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
diff -Naurd redhat-cluster-suite-2.20070823/cman/lib/Makefile cluster/cman/lib/Makefile
--- redhat-cluster-suite-2.20070823/cman/lib/Makefile	2007-06-02 16:23:26.000000000 +0200
+++ cluster/cman/lib/Makefile	2007-08-26 07:10:17.000000000 +0200
@@ -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)
diff -Naurd redhat-cluster-suite-2.20070823/cman/qdisk/Makefile cluster/cman/qdisk/Makefile
--- redhat-cluster-suite-2.20070823/cman/qdisk/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/cman/qdisk/Makefile	2007-08-26 07:10:30.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/cman/tests/Makefile cluster/cman/tests/Makefile
--- redhat-cluster-suite-2.20070823/cman/tests/Makefile	2007-06-02 16:23:26.000000000 +0200
+++ cluster/cman/tests/Makefile	2007-08-26 07:10:35.000000000 +0200
@@ -1,6 +1,6 @@
 include ../../make/defines.mk
 
-CFLAGS += -g -I${cmanincdir}
+CFLAGS += -I${cmanincdir}
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${cmanlibdir} -lcman
diff -Naurd redhat-cluster-suite-2.20070823/configure cluster/configure
--- redhat-cluster-suite-2.20070823/configure	2007-08-23 06:48:17.000000000 +0200
+++ cluster/configure	2007-08-26 06:59:01.000000000 +0200
@@ -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";
diff -Naurd redhat-cluster-suite-2.20070823/dlm/lib/Makefile cluster/dlm/lib/Makefile
--- redhat-cluster-suite-2.20070823/dlm/lib/Makefile	2007-08-23 06:48:19.000000000 +0200
+++ cluster/dlm/lib/Makefile	2007-08-26 07:10:43.000000000 +0200
@@ -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
diff -Naurd redhat-cluster-suite-2.20070823/dlm/tests/usertest/Makefile cluster/dlm/tests/usertest/Makefile
--- redhat-cluster-suite-2.20070823/dlm/tests/usertest/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/dlm/tests/usertest/Makefile	2007-08-26 07:10:46.000000000 +0200
@@ -18,7 +18,6 @@
 all: depends ${TARGETS}
 
 CFLAGS += -D_REENTRANT
-CFLAGS += -g
 CFLAGS += -I${dlmincdir}
 
 LDFLAGS += -L${dlmlibdir} -ldlm -lpthread
diff -Naurd redhat-cluster-suite-2.20070823/dlm/tool/Makefile cluster/dlm/tool/Makefile
--- redhat-cluster-suite-2.20070823/dlm/tool/Makefile	2007-07-16 10:37:53.000000000 +0200
+++ cluster/dlm/tool/Makefile	2007-08-26 07:10:50.000000000 +0200
@@ -16,7 +16,6 @@
 
 OBJS=	main.o
 
-CFLAGS += -g
 CFLAGS += -I. -I../lib/ -I../../group/dlm_controld/
 CFLAGS += -I${incdir}
 
diff -Naurd redhat-cluster-suite-2.20070823/fence/agents/xvm/Makefile cluster/fence/agents/xvm/Makefile
--- redhat-cluster-suite-2.20070823/fence/agents/xvm/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/fence/agents/xvm/Makefile	2007-08-26 07:10:55.000000000 +0200
@@ -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`
diff -Naurd redhat-cluster-suite-2.20070823/fence/fenced/Makefile cluster/fence/fenced/Makefile
--- redhat-cluster-suite-2.20070823/fence/fenced/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/fence/fenced/Makefile	2007-08-26 07:11:09.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/fence/fence_node/Makefile cluster/fence/fence_node/Makefile
--- redhat-cluster-suite-2.20070823/fence/fence_node/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/fence/fence_node/Makefile	2007-08-26 07:11:04.000000000 +0200
@@ -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
diff -Naurd redhat-cluster-suite-2.20070823/fence/fence_tool/Makefile cluster/fence/fence_tool/Makefile
--- redhat-cluster-suite-2.20070823/fence/fence_tool/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/fence/fence_tool/Makefile	2007-08-26 07:06:45.000000000 +0200
@@ -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
 
diff -Naurd redhat-cluster-suite-2.20070823/gfs/gfs_debug/Makefile cluster/gfs/gfs_debug/Makefile
--- redhat-cluster-suite-2.20070823/gfs/gfs_debug/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs/gfs_debug/Makefile	2007-08-26 06:49:14.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs/gfs_fsck/Makefile cluster/gfs/gfs_fsck/Makefile
--- redhat-cluster-suite-2.20070823/gfs/gfs_fsck/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs/gfs_fsck/Makefile	2007-08-26 06:49:19.000000000 +0200
@@ -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}
 
diff -Naurd redhat-cluster-suite-2.20070823/gfs/gfs_mkfs/Makefile cluster/gfs/gfs_mkfs/Makefile
--- redhat-cluster-suite-2.20070823/gfs/gfs_mkfs/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs/gfs_mkfs/Makefile	2007-08-26 06:49:21.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs/gfs_quota/Makefile cluster/gfs/gfs_quota/Makefile
--- redhat-cluster-suite-2.20070823/gfs/gfs_quota/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs/gfs_quota/Makefile	2007-08-26 06:49:25.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs/gfs_tool/Makefile cluster/gfs/gfs_tool/Makefile
--- redhat-cluster-suite-2.20070823/gfs/gfs_tool/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs/gfs_tool/Makefile	2007-08-26 06:49:27.000000000 +0200
@@ -26,7 +26,6 @@
 	util.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I../include
 CFLAGS += -I${incdir}
diff -Naurd redhat-cluster-suite-2.20070823/gfs/libgfs/Makefile cluster/gfs/libgfs/Makefile
--- redhat-cluster-suite-2.20070823/gfs/libgfs/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs/libgfs/Makefile	2007-08-26 07:11:24.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/convert/Makefile cluster/gfs2/convert/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/convert/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs2/convert/Makefile	2007-08-26 07:11:32.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/debug/Makefile cluster/gfs2/debug/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/debug/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs2/debug/Makefile	2007-08-26 06:49:37.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/edit/Makefile cluster/gfs2/edit/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/edit/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs2/edit/Makefile	2007-08-26 07:11:29.000000000 +0200
@@ -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
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/fsck/Makefile cluster/gfs2/fsck/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/fsck/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs2/fsck/Makefile	2007-08-26 06:49:41.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/libgfs2/Makefile cluster/gfs2/libgfs2/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/libgfs2/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs2/libgfs2/Makefile	2007-08-26 07:11:38.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/mkfs/Makefile cluster/gfs2/mkfs/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/mkfs/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs2/mkfs/Makefile	2007-08-26 07:11:41.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/mount/Makefile cluster/gfs2/mount/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/mount/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs2/mount/Makefile	2007-08-26 06:50:00.000000000 +0200
@@ -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
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/quota/Makefile cluster/gfs2/quota/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/quota/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gfs2/quota/Makefile	2007-08-26 06:50:02.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gfs2/tool/Makefile cluster/gfs2/tool/Makefile
--- redhat-cluster-suite-2.20070823/gfs2/tool/Makefile	2007-08-26 07:02:55.000000000 +0200
+++ cluster/gfs2/tool/Makefile	2007-08-26 06:50:05.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gnbd/client/Makefile cluster/gnbd/client/Makefile
--- redhat-cluster-suite-2.20070823/gnbd/client/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gnbd/client/Makefile	2007-08-26 06:50:07.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gnbd/server/Makefile cluster/gnbd/server/Makefile
--- redhat-cluster-suite-2.20070823/gnbd/server/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gnbd/server/Makefile	2007-08-26 06:50:11.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gnbd/tools/gnbd_export/Makefile cluster/gnbd/tools/gnbd_export/Makefile
--- redhat-cluster-suite-2.20070823/gnbd/tools/gnbd_export/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gnbd/tools/gnbd_export/Makefile	2007-08-26 06:50:14.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/gnbd/tools/gnbd_import/Makefile cluster/gnbd/tools/gnbd_import/Makefile
--- redhat-cluster-suite-2.20070823/gnbd/tools/gnbd_import/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/gnbd/tools/gnbd_import/Makefile	2007-08-26 06:50:16.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/group/daemon/Makefile cluster/group/daemon/Makefile
--- redhat-cluster-suite-2.20070823/group/daemon/Makefile	2007-08-09 11:44:43.000000000 +0200
+++ cluster/group/daemon/Makefile	2007-08-26 07:11:44.000000000 +0200
@@ -20,7 +20,6 @@
 	joinleave.o \
 	main.o
 
-CFLAGS += -g 
 CFLAGS += -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -I. -I../include/ -I../lib/
 CFLAGS += -I${incdir}
diff -Naurd redhat-cluster-suite-2.20070823/group/dlm_controld/Makefile cluster/group/dlm_controld/Makefile
--- redhat-cluster-suite-2.20070823/group/dlm_controld/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/group/dlm_controld/Makefile	2007-08-26 07:11:46.000000000 +0200
@@ -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/
diff -Naurd redhat-cluster-suite-2.20070823/group/gfs_controld/Makefile cluster/group/gfs_controld/Makefile
--- redhat-cluster-suite-2.20070823/group/gfs_controld/Makefile	2007-08-23 06:48:20.000000000 +0200
+++ cluster/group/gfs_controld/Makefile	2007-08-26 07:11:49.000000000 +0200
@@ -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/
diff -Naurd redhat-cluster-suite-2.20070823/group/lib/Makefile cluster/group/lib/Makefile
--- redhat-cluster-suite-2.20070823/group/lib/Makefile	2007-06-02 16:23:28.000000000 +0200
+++ cluster/group/lib/Makefile	2007-08-26 07:12:02.000000000 +0200
@@ -15,7 +15,7 @@
 TARGET=libgroup
 STATICLIB=$(TARGET).a
 
-CFLAGS += -g -O -fPIC
+CFLAGS += -fPIC
 CFLAGS += -I. -I../daemon
 CFLAGS += -I${incdir}
 
diff -Naurd redhat-cluster-suite-2.20070823/group/tool/Makefile cluster/group/tool/Makefile
--- redhat-cluster-suite-2.20070823/group/tool/Makefile	2007-06-02 16:23:28.000000000 +0200
+++ cluster/group/tool/Makefile	2007-08-26 07:12:57.000000000 +0200
@@ -16,7 +16,6 @@
 
 OBJS=	main.o
 
-CFLAGS += -g
 CFLAGS += -I. -I../lib/ -I../daemon/
 CFLAGS += -I${incdir}
 
diff -Naurd redhat-cluster-suite-2.20070823/rgmanager/src/clulib/Makefile cluster/rgmanager/src/clulib/Makefile
--- redhat-cluster-suite-2.20070823/rgmanager/src/clulib/Makefile	2007-08-23 06:48:21.000000000 +0200
+++ cluster/rgmanager/src/clulib/Makefile	2007-08-26 07:13:07.000000000 +0200
@@ -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}
diff -Naurd redhat-cluster-suite-2.20070823/rgmanager/src/daemons/Makefile cluster/rgmanager/src/daemons/Makefile
--- redhat-cluster-suite-2.20070823/rgmanager/src/daemons/Makefile	2007-06-11 12:14:22.000000000 +0200
+++ cluster/rgmanager/src/daemons/Makefile	2007-08-26 07:13:15.000000000 +0200
@@ -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
diff -Naurd redhat-cluster-suite-2.20070823/rgmanager/src/utils/Makefile cluster/rgmanager/src/utils/Makefile
--- redhat-cluster-suite-2.20070823/rgmanager/src/utils/Makefile	2007-08-23 06:48:21.000000000 +0200
+++ cluster/rgmanager/src/utils/Makefile	2007-08-26 07:13:18.000000000 +0200
@@ -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}

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]