[Ocfs2-commits] manish commits r1143 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-17 21:55:28 -0500 (Thu, 17 Jun 2004)
New Revision: 1143

Modified:
   trunk/src/Makefile
Log:
Enable vermagic for 2.6


Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-06-18 02:18:13 UTC (rev 1142)
+++ trunk/src/Makefile	2004-06-18 02:55:28 UTC (rev 1143)
@@ -4,6 +4,7 @@
 TOPDIR = ..
 
 include $(TOPDIR)/Preamble.make
+
 else # ifeq ($(KERNELRELEASE),)
 # We are being included by the 2.6.x kernel build system
 
@@ -51,7 +52,7 @@
 
 endif
 
-CFILES =			\
+CFILES = \
 	alloc.c			\
 	bitmap.c		\
 	buffer_head_io.c	\
@@ -76,7 +77,7 @@
 	volcfg.c		\
 	vote.c
 
-HFILES =			\
+HFILES = \
 	ocfs2_fs.h		\
 	ocfs1_fs_compat.h	\
 	ocfs.h			\
@@ -108,8 +109,11 @@
 	vote.h
 
 VERSION_FILES = $(CFILES) $(HFILES)
+VERSION_SRC = ver.c
 VERSION_PREFIX = OCFS
 
+CLEAN_RULES = clean-ocfs
+
 OBJS = $(subst .c,.o,$(CFILES))
 
 # End of stuff which is global for 2.4.x and 2.6.x kernels
@@ -186,8 +190,6 @@
 
 INSTALL_MODULE = $(MODULES)
 
-VERSION_SRC = ver.c
-
 # Make dependancies work
 $(CFILES): $(HFILES)
 $(OBJS): $(HFILES)
@@ -195,8 +197,6 @@
 ocfs2.o: $(OBJS)
 	$(CC) $(OPTS) -Wl,-r -o $@ $^ $(LDADD)
 
-CLEAN_RULES = clean-ocfs
-
 clean-ocfs:
 	rm -f *.o *.p *.s
 
@@ -212,12 +212,13 @@
 
 INSTALL_MODULE = ocfs2.ko
 
-KDIR	:= $(KERNELDIR)
+ALL_RULES = stamp-md5 build-ocfs
 
-ALL_RULES = build-modules
+build-ocfs:
+	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
 
-build-modules:
-	$(MAKE) -C $(KDIR) M=$(CURDIR) modules
+clean-ocfs:
+	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) clean
 
 endif # OCFS_KERNEL_2_6
 
@@ -248,10 +249,12 @@
 # various parameters for the kernel make system and then it will take care of
 # building us.
 
+STAMP_DIR = $(OCFS_SRC_DIR)
+include $(OCFS_SRC_DIR)/../Versioning.make
+
 EXTRA_CFLAGS += $(GLOBAL_DEFINES)
 
-EXTRA_CFLAGS +=	-DOCFS_BUILD_DATE=\"y\" -DOCFS_BUILD_MD5=\"z\" \
-		-DOCFS_BUILD_VERSION=\"x\"
+CFLAGS_$(VERSION_OBJ) += $(VERDEFS)
 
 # Kernel Module file to produce
 obj-m += ocfs2.o