[Ocfs2-tools-devel] [PATCH 4/4] build: Use CFLAGS as set by
Config.make
Mark Fasheh
mark.fasheh at oracle.com
Thu Feb 21 16:08:33 PST 2008
Most modules no longer have to set their own warning or debug flags, so we
can remove any setting of CFLAGS. For those which still require a special
switch, we use the "+=" command to keep what we get from Config.make.
Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>
---
debugfs.ocfs2/Makefile | 6 ------
extras/Makefile | 13 -------------
fsck.ocfs2/Makefile | 10 ----------
fswreck/Makefile | 6 ------
libo2cb/Makefile | 8 +-------
libo2dlm/Makefile | 11 +----------
libocfs2/Makefile | 11 +----------
listuuid/Makefile | 9 ---------
mkfs.ocfs2/Makefile | 11 -----------
mount.ocfs2/Makefile | 9 ---------
mounted.ocfs2/Makefile | 11 -----------
o2cb_ctl/Makefile | 9 ---------
ocfs2_hb_ctl/Makefile | 9 ---------
ocfs2cdsl/Makefile | 12 ------------
ocfs2console/blkid/Makefile | 6 +-----
ocfs2console/ocfs2interface/Makefile | 15 ++-------------
sizetest/Makefile | 11 -----------
tunefs.ocfs2/Makefile | 11 -----------
18 files changed, 6 insertions(+), 172 deletions(-)
diff --git a/debugfs.ocfs2/Makefile b/debugfs.ocfs2/Makefile
index 10782ef..b17886d 100644
--- a/debugfs.ocfs2/Makefile
+++ b/debugfs.ocfs2/Makefile
@@ -11,12 +11,6 @@ DEFINES += -DVERSION=\"$(VERSION)\"
INCLUDES = -I$(TOPDIR)/include -Iinclude
INCLUDES += $(GLIB_CFLAGS)
-ifdef OCFS2_DEBUG
-CFLAGS = -Wall -O -ggdb
-else
-CFLAGS = -Wall -O2
-endif
-
CFILES = main.c commands.c dump.c utils.c journal.c find_block_inode.c find_inode_paths.c dump_fs_locks.c
HFILES = \
diff --git a/extras/Makefile b/extras/Makefile
index bbdd813..a7a1946 100644
--- a/extras/Makefile
+++ b/extras/Makefile
@@ -2,23 +2,10 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS = -g
-endif
-
-CFLAGS = $(OPTS) $(WARNINGS)
-
UNINST_PROGRAMS = find_hardlinks find_dup_extents find_inode_paths set_random_bits decode_lockres encode_lockres mark_journal_dirty find_allocation_fragments compute_groups
INCLUDES = -I$(TOPDIR)/include
-OPTIMIZE = -O2
-
-CFLAGS += $(OPTIMIZE)
-
FIND_HARDLINKS_CFILES = find_hardlinks.c
FIND_DUP_EXTENTS_CFILES = find_dup_extents.c
FIND_INODE_PATHS_CFILES = find_inode_paths.c
diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
index fe34e37..3b6fc82 100644
--- a/fsck.ocfs2/Makefile
+++ b/fsck.ocfs2/Makefile
@@ -13,20 +13,10 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
ifndef OCFS2_DYNAMIC_FSCK
LDFLAGS += -static
endif
-CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
-
CFILES = fsck.c \
dirblocks.c \
dirparents.c \
diff --git a/fswreck/Makefile b/fswreck/Makefile
index b7109b0..e6f3e06 100644
--- a/fswreck/Makefile
+++ b/fswreck/Makefile
@@ -10,12 +10,6 @@ DEFINES += -DVERSION=\"$(VERSION)\"
INCLUDES = -I$(TOPDIR)/include -Iinclude
INCLUDES += $(GLIB_CFLAGS)
-ifdef OCFS2_DEBUG
-CFLAGS = -Wall -O -ggdb
-else
-CFLAGS = -Wall -O2
-endif
-
UNINST_PROGRAM = fswreck
CFILES = main.c corrupt.c chain.c extent.c group.c inode.c local_alloc.c truncate_log.c special.c symlink.c dir.c
diff --git a/libo2cb/Makefile b/libo2cb/Makefile
index 09edbdd..6d36ad2 100644
--- a/libo2cb/Makefile
+++ b/libo2cb/Makefile
@@ -5,17 +5,11 @@ include $(TOPDIR)/Preamble.make
WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
INCLUDES = -I$(TOPDIR)/include -I.
LIBRARIES = libo2cb.a
-CFLAGS = $(OPTS) $(WARNINGS) -fPIC
+CFLAGS += -fPIC
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
diff --git a/libo2dlm/Makefile b/libo2dlm/Makefile
index 57412fd..116d31a 100644
--- a/libo2dlm/Makefile
+++ b/libo2dlm/Makefile
@@ -2,20 +2,11 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
INCLUDES = -I$(TOPDIR)/include
LIBRARIES = libo2dlm.a
-CFLAGS = $(OPTS) $(WARNINGS) -fPIC
+CFLAGS += -fPIC
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
diff --git a/libocfs2/Makefile b/libocfs2/Makefile
index 52461fb..7fd0042 100644
--- a/libocfs2/Makefile
+++ b/libocfs2/Makefile
@@ -2,15 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
INCLUDES = -I$(TOPDIR)/include
LIBRARIES = libocfs2.a
@@ -21,7 +12,7 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-CFLAGS = $(OPTS) $(WARNINGS) -fPIC
+CFLAGS += -fPIC
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
diff --git a/listuuid/Makefile b/listuuid/Makefile
index 78c9444..46e8dd9 100644
--- a/listuuid/Makefile
+++ b/listuuid/Makefile
@@ -13,15 +13,6 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
-CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
UNINST_PROGRAMS = listuuid
CFILES = listuuid.c
diff --git a/mkfs.ocfs2/Makefile b/mkfs.ocfs2/Makefile
index 00d9d22..074c7d6 100644
--- a/mkfs.ocfs2/Makefile
+++ b/mkfs.ocfs2/Makefile
@@ -2,17 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS = -ggdb -O0
-else
-OPTS = -O2
-endif
-
-CFLAGS = $(OPTS) $(WARNINGS)
-
sbindir = $(root_sbindir)
SBIN_PROGRAMS = mkfs.ocfs2
diff --git a/mount.ocfs2/Makefile b/mount.ocfs2/Makefile
index 5f796c9..75072a6 100644
--- a/mount.ocfs2/Makefile
+++ b/mount.ocfs2/Makefile
@@ -13,15 +13,6 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
-CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
DEFINES = -DVERSION=\"$(VERSION)\"
CFILES = opts.c mount.ocfs2.c
diff --git a/mounted.ocfs2/Makefile b/mounted.ocfs2/Makefile
index be10987..21f7b88 100644
--- a/mounted.ocfs2/Makefile
+++ b/mounted.ocfs2/Makefile
@@ -2,17 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS = -O -ggdb
-else
-OPTS = -O2
-endif
-
-CFLAGS = $(OPTS) $(WARNINGS)
-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
diff --git a/o2cb_ctl/Makefile b/o2cb_ctl/Makefile
index b6cd01b..d2710e6 100644
--- a/o2cb_ctl/Makefile
+++ b/o2cb_ctl/Makefile
@@ -13,19 +13,10 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
ifndef OCFS2_DYNAMIC_CTL
LDFLAGS += -static
endif
-CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
DEFINES = -DVERSION=\"$(VERSION)\"
O2CB_CTL_CFILES = o2cb_ctl.c o2cb_config.c \
diff --git a/ocfs2_hb_ctl/Makefile b/ocfs2_hb_ctl/Makefile
index 0b40a0f..fc426d3 100644
--- a/ocfs2_hb_ctl/Makefile
+++ b/ocfs2_hb_ctl/Makefile
@@ -13,19 +13,10 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-ifdef OCFS2_DEBUG
-OPTS += -ggdb
-else
-OPTS += -O2
-endif
-
ifndef OCFS2_DYNAMIC_CTL
LDFLAGS += -static
endif
-CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations
-
DEFINES = -DVERSION=\"$(VERSION)\"
CFILES = ocfs2_hb_ctl.c
diff --git a/ocfs2cdsl/Makefile b/ocfs2cdsl/Makefile
index e8125c7..0e21975 100644
--- a/ocfs2cdsl/Makefile
+++ b/ocfs2cdsl/Makefile
@@ -2,12 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall
-
-ifdef OCFS2_DEBUG
-OPTS = -g
-endif
-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
@@ -17,8 +11,6 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-CFLAGS = $(OPTS) $(WARNINGS)
-
sbindir = $(root_sbindir)
SBIN_PROGRAMS = ocfs2cdsl
@@ -27,10 +19,6 @@ DEFINES += -DG_DISABLE_DEPRECATED
INCLUDES = -I$(TOPDIR)/include $(GLIB_CFLAGS)
-OPTIMIZE = -O2
-
-CFLAGS += $(OPTIMIZE)
-
CFILES = ocfs2cdsl.c
OBJS = $(subst .c,.o,$(CFILES))
diff --git a/ocfs2console/blkid/Makefile b/ocfs2console/blkid/Makefile
index a4996db..aad25c0 100644
--- a/ocfs2console/blkid/Makefile
+++ b/ocfs2console/blkid/Makefile
@@ -2,13 +2,9 @@ TOPDIR = ../..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall
-
-OPTS += -O2
-
INCLUDES = -I..
-CFLAGS = $(OPTS) $(WARNINGS) -fPIC
+CFLAGS += -fPIC
CPPFLAGS = -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-DHAVE_ERRNO_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_LINUX_FD_H=1 \
-DHAVE_SYS_QUEUE_H=1 -DHAVE_STDLIB_H=1 -DHAVE_LSEEK64=1 \
diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile
index be16577..643d02d 100644
--- a/ocfs2console/ocfs2interface/Makefile
+++ b/ocfs2console/ocfs2interface/Makefile
@@ -2,18 +2,11 @@ TOPDIR = ../..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall
-
-ifdef OCFS2_DEBUG
-OPTS = -g
-endif
-OPTS = -g
-
INCLUDES = -I$(TOPDIR)/include
-CFLAGS = $(OPTS) $(WARNINGS) -fPIC
+CFLAGS += -fPIC
-PYMOD_CFLAGS = $(CFLAGS) -fno-strict-aliasing $(PYTHON_INCLUDES)
+PYMOD_CFLAGS = -fno-strict-aliasing $(PYTHON_INCLUDES)
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
@@ -35,10 +28,6 @@ endif
GLIB_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
-OPTIMIZE = -O2
-
-CFLAGS += $(OPTIMIZE)
-
PLIST_CBITS = ocfsplist.c
PLIST_CFILES = $(PLIST_CBITS) plistmodule.c
PLIST_HFILES = $(subst .c,.h,$(PLIST_CBITS))
diff --git a/sizetest/Makefile b/sizetest/Makefile
index 23df530..407aa8b 100644
--- a/sizetest/Makefile
+++ b/sizetest/Makefile
@@ -2,17 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-#WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
-# -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS = -O -ggdb
-else
-OPTS = -O2
-endif
-
-CFLAGS = $(OPTS) $(WARNINGS)
-
UNINST_PROGRAMS = sizetest.ocfs2
INCLUDES = -I$(TOPDIR)/include
diff --git a/tunefs.ocfs2/Makefile b/tunefs.ocfs2/Makefile
index e062dfb..011fc98 100644
--- a/tunefs.ocfs2/Makefile
+++ b/tunefs.ocfs2/Makefile
@@ -2,17 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-WARNINGS = -Wall -Wstrict-prototypes -Wno-format -Wmissing-prototypes \
- -Wmissing-declarations
-
-ifdef OCFS2_DEBUG
-OPTS = -O -ggdb
-else
-OPTS = -O2
-endif
-
-CFLAGS = $(OPTS) $(WARNINGS)
-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
--
1.5.3.6
More information about the Ocfs2-tools-devel
mailing list