From: nic <nic>
Date: Thu, 14 Oct 2004 19:01:56 +0000 (+0000)
Subject: update ldiskfs build rules to b1_4
X-Git-Tag: v1_8_0_110~486^5~146
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5749a1e3f4c7f09543b87db1a4ecedd5c55310db;p=fs%2Flustre-release.git

update ldiskfs build rules to b1_4
---

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index 7d1e229..e2aff01 100644
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -9,8 +9,9 @@ ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
 linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
 
 ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h
-ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources)
+new_sources := iopen.c iopen.h extents.c mballoc.c
+new_headers := ext3_extents.h
+ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
 
 ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
 
diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 3621012..9de1cf5 100644
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -51,7 +51,7 @@ endif
 		sed $(strip $(ldiskfs_sed_flags)) \
 			linux-stage/fs/ext3/$$i > $$i ; \
 	done
-	@for i in $(subst ext3,,$(notdir $(linux_headers))) ; do \
+	@for i in $(subst ext3,,$(notdir $(linux_headers) $(new_headers))) ; do \
 		echo -n " ext3$$i" ; \
 		sed $(strip $(ldiskfs_sed_flags)) \
 			linux-stage/include/linux/ext3$$i \
diff --git a/lustre/ldiskfs/Makefile.in b/lustre/ldiskfs/Makefile.in
index 7d1e229..e2aff01 100644
--- a/lustre/ldiskfs/Makefile.in
+++ b/lustre/ldiskfs/Makefile.in
@@ -9,8 +9,9 @@ ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
 linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
 
 ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h
-ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources)
+new_sources := iopen.c iopen.h extents.c mballoc.c
+new_headers := ext3_extents.h
+ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
 
 ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
 
diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
index 3621012..9de1cf5 100644
--- a/lustre/ldiskfs/autoMakefile.am
+++ b/lustre/ldiskfs/autoMakefile.am
@@ -51,7 +51,7 @@ endif
 		sed $(strip $(ldiskfs_sed_flags)) \
 			linux-stage/fs/ext3/$$i > $$i ; \
 	done
-	@for i in $(subst ext3,,$(notdir $(linux_headers))) ; do \
+	@for i in $(subst ext3,,$(notdir $(linux_headers) $(new_headers))) ; do \
 		echo -n " ext3$$i" ; \
 		sed $(strip $(ldiskfs_sed_flags)) \
 			linux-stage/include/linux/ext3$$i \