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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-04-02 17:01:58 -0600 (Fri, 02 Apr 2004)
New Revision: 840

Modified:
   trunk/src/Makefile
Log:
Added install rule for 2.6 (shared with 2.4, 2.4 goes in it's own subdir now)
use ALL_RULES for 2.6 build


Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-04-02 23:01:22 UTC (rev 839)
+++ trunk/src/Makefile	2004-04-02 23:01:58 UTC (rev 840)
@@ -199,6 +199,8 @@
 
 MODULES = ocfs2.o
 
+INSTALL_MODULE = $(MODULES)
+
 $(CFILES): $(HFILES)
 
 VERSION_FILES = $(CFILES) $(HFILES)
@@ -208,13 +210,6 @@
 ocfs2.o: $(OBJS)
 	$(CC) $(OPTS) -Wl,-r -o $@ $^ $(LDADD)
 
-INSTALL_RULES = install-ocfs
-
-install-ocfs: ocfs2.o
-	$(TOPDIR)/mkinstalldirs $(DESTDIR)$(MODULEDIR)
-	$(INSTALL_DATA) ocfs2.o $(DESTDIR)$(MODULEDIR)/ocfs2.o
-
-
 CLEAN_RULES = clean-ocfs
 
 clean-ocfs:
@@ -235,13 +230,23 @@
 #	This will cause the kernel make system to call back into our makefile
 #	(2nd way).
 
+INSTALL_MODULE = ocfs2.ko
+
 KDIR	:= $(KERNELDIR)
 
-all:
+ALL_RULES = build-modules
+
+build-modules:
 	$(MAKE) -C $(KDIR) SUBDIRS=$(CURDIR) modules
-
+	
 endif # OCFS_KERNEL_2_6
 
+INSTALL_RULES = install-ocfs
+
+install-ocfs: $(INSTALL_MODULE)
+	$(TOPDIR)/mkinstalldirs $(DESTDIR)$(MODULEDIR)/ocfs
+	$(INSTALL_DATA) $< $(DESTDIR)$(MODULEDIR)/ocfs/$<
+
 include $(TOPDIR)/Postamble.make
 
 else # ifeq ($(KERNELRELEASE),)