[Ocfs2-commits] jlbec commits r1834 - in trunk: . fs/ocfs2 fs/ocfs2/cluster fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-23 06:12:36 -0600 (Sun, 23 Jan 2005)
New Revision: 1834

Modified:
   trunk/Kbuild-24.make
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/cluster/Makefile
   trunk/fs/ocfs2/dlm/Makefile
Log:
o Change "MODULE_DEFINES" to EXTRA_CFLAGS" ala kbuild 2.6

Modified: trunk/Kbuild-24.make
===================================================================
--- trunk/Kbuild-24.make	2005-01-22 02:09:12 UTC (rev 1833)
+++ trunk/Kbuild-24.make	2005-01-23 12:12:36 UTC (rev 1834)
@@ -69,9 +69,9 @@
 endif
 
 INCLUDES = -I. -I$(TOPDIR) -I$(KERNELINC) -I$(GCCINC)
-DEFINES = $(MODULE_DEFINES) $(KERNEL_DEFINES) $(KVER_DEFINES)
-CFLAGS = $(OPTIMIZE) $(MODULE_CFLAGS) $(KERNEL_CFLAGS) $(MACH_CFLAGS) \
-	$(MODVERSIONS) $(WARNINGS)
+DEFINES = $(KERNEL_DEFINES) $(KVER_DEFINES)
+CFLAGS = $(OPTIMIZE) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) \
+	$(KERNEL_CFLAGS) $(MACH_CFLAGS) $(MODVERSIONS) $(WARNINGS)
 LDADD = $(KERNEL_LDADD) $(MACH_LDADD)
 
 #

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
+++ trunk/fs/ocfs2/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
@@ -16,31 +16,29 @@
 endif
 
 ifdef OCFS_DEBUG
-MODULE_CFLAGS += -g
-MODULE_DEFINES += -DDEBUG
+EXTRA_CFLAGS += -g
+EXTRA_CFLAGS += -DDEBUG
 endif
 
-MODULE_DEFINES += -DCATCH_BH_JBD_RACES
+EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
 
 ifdef OCFS_TRACE
-MODULE_DEFINES += -DTRACE
+EXTRA_CFLAGS += -DTRACE
 endif
 
 ifdef COMPAT_SAFE_WRITE
-MODULE_DEFINES += -DOCFS_COMPAT_SAFE_WRITE
+EXTRA_CFLAGS += -DOCFS_COMPAT_SAFE_WRITE
 endif
 
 ifneq ($(QUIET),1)
-MODULE_DEFINES += -DVERBOSE_BH_JBD_TRACE
-MODULE_DEFINES += -DVERBOSE_LOCKING_TRACE
-MODULE_DEFINES += -DVERBOSE_BH_SEQNUM_TRACE
-MODULE_DEFINES += -DVERBOSE_PROCESS_VOTE
-MODULE_DEFINES += -DVERBOSE_COMMIT_THREAD
+EXTRA_CFLAGS += -DVERBOSE_BH_JBD_TRACE
+EXTRA_CFLAGS += -DVERBOSE_LOCKING_TRACE
+EXTRA_CFLAGS += -DVERBOSE_BH_SEQNUM_TRACE
+EXTRA_CFLAGS += -DVERBOSE_PROCESS_VOTE
+EXTRA_CFLAGS += -DVERBOSE_COMMIT_THREAD
 endif
 
-EXTRA_CFLAGS += $(MODULE_CFLAGS) $(MODULE_DEFINES)
 
-
 #
 # For OCFS2, SOURCES+HEADERS live even in kbuild-26 because they
 # are needed for VERSION_FILES

Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
+++ trunk/fs/ocfs2/cluster/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
@@ -13,11 +13,9 @@
 endif
 
 ifdef MISSING_SOCK_CREATE_LITE
-MODULE_DEFINES += -DMISSING_SOCK_CREATE_LITE
+EXTRA_CPPFLAGS += -DMISSING_SOCK_CREATE_LITE
 endif
 
-EXTRA_CFLAGS += $(MODULE_DEFINES)
-
 ifeq ($(KERNELRELEASE),)
 ifeq ($(KERNEL_26),)
 COMPAT_LIBFS := compat_libfs.o

Modified: trunk/fs/ocfs2/dlm/Makefile
===================================================================
--- trunk/fs/ocfs2/dlm/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
+++ trunk/fs/ocfs2/dlm/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
@@ -15,10 +15,8 @@
 
 endif
 
-MODULE_CFLAGS += -I$(CLUSTERINC)
+EXTRA_CFLAGS += -I$(CLUSTERINC)
 
-EXTRA_CFLAGS += $(MODULE_CFLAGS) $(MODULE_DEFINES)
-
 ifeq ($(KERNELRELEASE),)
 ifeq ($(KERNEL_26),)
 DLMFS_COMPAT := dlmfs_compat.o