X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=ldiskfs%2Fldiskfs%2FMakefile.in;h=acbd1334b0c46dfae31bf6fdaca13b64b93a40a0;hb=19223651ed250966c0445c91dc91a5b9131dec35;hp=8fe16067407e3f65a844a7e44cbded30e842be54;hpb=3de901fceee79de12a31428bcc6ba3a00f10d1fe;p=fs%2Flustre-release.git

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index 8fe1606..acbd133 100644
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -3,15 +3,31 @@ default: all
 MODULES := ldiskfs
 
 # copy makefile over to not break patches
-ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
+backfs_extra := $(wildcard @LINUX@/fs/@BACKFS@/Makefile)
 
-ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
-linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
+backfs_headers := $(wildcard @EXT_DIR@/*.h)
+linux_headers := $(wildcard @LINUX@/include/linux/@BACKFS@*.h)
+linux_new_headers := dynlocks.h
+@LDISKFS_PDO_TRUE@linux_new_headers += htree_lock.h
+trace_headers := $(wildcard @LINUX@/include/trace/events/@BACKFS@*.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)
+backfs_sources := $(filter-out %.mod.c,$(wildcard @EXT_DIR@/*.c))
+
+ext3_new_sources := extents.c mballoc.c group.h dynlocks.c fiemap.h
+ext3_new_headers := ext3_extents.h
+
+ext4_new_sources := dynlocks.c fiemap.h mmp.c
+@LDISKFS_PDO_TRUE@ext4_new_sources += htree_lock.c
+ext4_new_headers :=
+
+new_sources := $(@BACKFS@_new_sources)
+new_headers := $(@BACKFS@_new_headers)
+
+ldiskfs_patched_sources := $(notdir $(backfs_sources) $(backfs_headers)) $(new_sources) $(new_headers)
+ldiskfs_sources := $(ldiskfs_patched_sources)
 
 ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
 
+EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFSDIR@
+
 @INCLUDE_RULES@