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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-20 17:25:58 -0600 (Thu, 20 Jan 2005)
New Revision: 1813

Modified:
   trunk/Makefile
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/cluster/Makefile
Log:

Step 6 - Get cluster/ working

o Modify the Makefiles to walk cluster/ appropriately for each build
  system.  I love watching kbuild-2.6 work its magic.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-20 23:16:58 UTC (rev 1812)
+++ trunk/Makefile	2005-01-20 23:25:58 UTC (rev 1813)
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
-SUBDIRS = cluster fs docs patches vendor
+SUBDIRS = fs docs patches vendor
 
 DIST_FILES = \
 	COPYING		\

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-01-20 23:16:58 UTC (rev 1812)
+++ trunk/fs/ocfs2/Makefile	2005-01-20 23:25:58 UTC (rev 1813)
@@ -58,6 +58,12 @@
 # are needed for VERSION_FILES
 #
 
+#
+# Since SUBDIRS means something to kbuild, define them safely.  Do not
+# include trailing slashes.
+#
+SAFE_SUBDIRS = cluster
+
 SOURCES =			\
 	24io.c			\
 	alloc.c 		\
@@ -133,6 +139,8 @@
 STAMP_DIR	:= $(OUR_TOPDIR)/fs/ocfs2
 include $(OUR_TOPDIR)/Versioning.make
 CFLAGS_$(VERSION_OBJ) += $(VERDEFS)
+
+obj-m += $(addsuffix /,$(SAFE_SUBDIRS))
 endif
 
 ifeq ($(KERNELRELEASE),)
@@ -168,6 +176,8 @@
 # everything by hand.
 #
 
+SUBDIRS = $(SAFE_SUBDIRS)
+
 INSTALL_DIR = ocfs2
 
 include $(TOPDIR)/Kbuild-24.make

Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile	2005-01-20 23:16:58 UTC (rev 1812)
+++ trunk/fs/ocfs2/cluster/Makefile	2005-01-20 23:25:58 UTC (rev 1813)
@@ -1,14 +1,14 @@
 
 ifeq ($(KERNELRELEASE),)
-TOPDIR = ..
+TOPDIR = ../../..
 
 include $(TOPDIR)/Preamble.make
 else
 # We are included by kbuild.
 
-OUR_SRC_DIR	:= $(M)
+OUR_TOPDIR	:= $(M)/..
 
-include $(OUR_SRC_DIR)/../Config.make
+include $(OUR_TOPDIR)/Config.make
 
 endif
 
@@ -87,13 +87,13 @@
 #
 
 build-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
+	$(MAKE) -C $(TOPDIR)/fs build-modules
 
 install-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules_install
+	$(MAKE) -C $(TOPDIR)/fs install-modules
 
 clean-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) clean
+	$(MAKE) -C $(TOPDIR)/fs clean-modules
 else
 #
 # This is a 2.4 kernel.  Because Red Hat's source tree is whack, do