land b_md onto HEAD. the highlights:

[fs/lustre-release.git] / lustre / obdclass / Makefile.am

diff --git a/lustre/obdclass/Makefile.am b/lustre/obdclass/Makefile.am
index 44c7ec7..ed2b321 100644 (file)
--- a/lustre/obdclass/Makefile.am
+++ b/lustre/obdclass/Makefile.am
@@ -2,12 +2,23 @@
 # lustre_build_version, or 'make -j2' breaks!
 DEFS=
 MODULE = obdclass
-modulefs_DATA = lustre_build_version obdclass.o
-EXTRA_PROGRAMS = obdclass
+
+if LINUX25
+FSMOD = fsfilt_ext3
+else
+FSMOD = fsfilt_extN
+endif
+
+modulefs_DATA = lustre_build_version obdclass.o $(FSMOD).o
+EXTRA_PROGRAMS = obdclass $(FSMOD)
+
 obdclass_SOURCES = debug.c genops.c class_obd.c sysctl.c uuid.c lprocfs_status.c
+obdclass_SOURCES += fsfilt.c
+
 include $(top_srcdir)/Rules
 lustre_build_version:
        perl $(top_srcdir)/scripts/version_tag.pl $(top_srcdir) > tmpver
-       diff -u tmpver $(top_builddir)/include/linux/lustre_build_version.h &&\
+       diff -u $(top_builddir)/include/linux/lustre_build_version.h tmpver \
+                       2> /dev/null &&\
                $(RM) tmpver || \
                mv tmpver $(top_builddir)/include/linux/lustre_build_version.h