[Ocfs2-commits] jlbec commits r2706 - in branches/ocfs2-1.0: . fs fs/debugfs

[svn-commits at oss.oracle.com]

Author: jlbec
Signed-off-by: mfasheh
Date: 2005-11-21 20:45:16 -0600 (Mon, 21 Nov 2005)
New Revision: 2706

Modified:
   branches/ocfs2-1.0/Makefile
   branches/ocfs2-1.0/fs/Makefile
   branches/ocfs2-1.0/fs/debugfs/Makefile
Log:

o Fix make dist for the debugfs backport

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.0/Makefile
===================================================================
--- branches/ocfs2-1.0/Makefile	2005-11-18 21:52:17 UTC (rev 2705)
+++ branches/ocfs2-1.0/Makefile	2005-11-22 02:45:16 UTC (rev 2706)
@@ -10,10 +10,11 @@
 	include/linux/configfs.h
 
 KAPI_COMPAT_FILES = \
-	kapi-compat/include/assert_spin_locked.h		\
-	kapi-compat/include/journal_access.h			\
-	kapi-compat/include/kref_init.h				\
-	kapi-compat/include/kref_put.h
+	kapi-compat/include/assert_spin_locked.h	\
+	kapi-compat/include/journal_access.h		\
+	kapi-compat/include/kref_init.h			\
+	kapi-compat/include/kref_put.h			\
+	kapi-compat/include/kzalloc.h
 
 PATCH_FILES = \
 	patches/export_generic_drop_inode.patch

Modified: branches/ocfs2-1.0/fs/Makefile
===================================================================
--- branches/ocfs2-1.0/fs/Makefile	2005-11-18 21:52:17 UTC (rev 2705)
+++ branches/ocfs2-1.0/fs/Makefile	2005-11-22 02:45:16 UTC (rev 2706)
@@ -44,7 +44,10 @@
 # Traverse subdirs via Makebo for "make dist"
 ifeq ($(MAKECMDGOALS),dist-all)
 SUBDIRS = $(SAFE_SUBDIRS)
+ifndef BUILD_DEBUGFS_BACKPORT
+SUBDIRS += debugfs
 endif
+endif
 
 build-modules:
 	$(MAKE) -C ocfs2 stamp-md5

Modified: branches/ocfs2-1.0/fs/debugfs/Makefile
===================================================================
--- branches/ocfs2-1.0/fs/debugfs/Makefile	2005-11-18 21:52:17 UTC (rev 2705)
+++ branches/ocfs2-1.0/fs/debugfs/Makefile	2005-11-22 02:45:16 UTC (rev 2706)
@@ -27,7 +27,7 @@
 # Called from a regular "make".
 #
 DEBUGFS_HEADERS	=		\
-	debugfs.h		\
+	include/linux/debugfs.h	\
 	debugfs_compat.h
 
 DEBUGFS_SOURCES = 		\
@@ -54,6 +54,11 @@
 clean-modules:
 	$(MAKE) -C $(TOPDIR)/fs clean-modules
 
+dist-subdircreate:
+	 $(TOPDIR)/mkinstalldirs $(DIST_DIR)/include/linux
+
+DIST_RULES = dist-subdircreate
+
 include $(TOPDIR)/Postamble.make
 
 endif