Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch b1_8
[fs/lustre-release.git]
/
ldiskfs
/
ldiskfs
/
Makefile.in
diff --git
a/ldiskfs/ldiskfs/Makefile.in
b/ldiskfs/ldiskfs/Makefile.in
index
e52e62f
..
d70d42b
100644
(file)
--- a/
ldiskfs/ldiskfs/Makefile.in
+++ b/
ldiskfs/ldiskfs/Makefile.in
@@
-2,8
+2,6
@@
default: all
MODULES := ldiskfs
MODULES := ldiskfs
-@QUOTA_TRUE@MODULES += quotafmt_test
-
# copy makefile over to not break patches
ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
# copy makefile over to not break patches
ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
@@
-11,19
+9,13
@@
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))
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 extents.c mballoc.c
-new_headers := ext3_extents.h
+new_sources := iopen.c iopen.h extents.c mballoc.c
group.h fiemap.h
+new_headers := ext3_extents.h
ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
ldiskfs_sources := $(ldiskfs_patched_sources)
ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
ldiskfs_sources := $(ldiskfs_patched_sources)
-quotafmt_sources := lustre_quota_fmt.c
-quotafmt_headers := lustre_quota_fmt.h
-@QUOTA_TRUE@ldiskfs_sources += $(quotafmt_sources) $(quotafmt_headers)
-
ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
-@QUOTA_TRUE@quotafmt-objs := quotafmt_test.o
-
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
+EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFSDIR@
@INCLUDE_RULES@
@INCLUDE_RULES@