Branch b1_8

[fs/lustre-release.git] / ldiskfs / ldiskfs / autoMakefile.am

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 7e378c2..f7b83ad 100644 (file)
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -1,8 +1,4 @@
-if MODULES
-if LDISKFS
 modulefs_DATA = ldiskfs$(KMODEXT)
-endif
-endif
 
 ldiskfs_linux_headers := $(addprefix linux/,$(subst ext3,ldiskfs,$(notdir $(linux_headers))))
 
@@ -25,12 +21,8 @@ ldiskfs_sed_flags = \
 linux/ldiskfs%.h: linux-stage/include/linux/ext3%.h
        sed $(strip $(ldiskfs_sed_flags)) $< > $@
 
-#
-# FIXME: we need to grab the series in configure somehow
-# (see bug 1679)
-#
-series := @top_srcdir@/lustre/kernel_patches/series/ldiskfs-$(LDISKFS_SERIES)
-patches := @top_srcdir@/lustre/kernel_patches/patches
+series := @top_srcdir@/kernel_patches/series/ldiskfs-$(LDISKFS_SERIES)
+patches := @top_srcdir@/kernel_patches/patches
 
 sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
        rm -rf linux-stage linux sources $(ldiskfs_SOURCES)
@@ -76,7 +68,5 @@ foo-check:
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $(new_sources) $(new_headers))
 
-EXTRA_DIST := lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c
-
 clean: clean-am
        rm -rf linux linux-stage