Merge b_md to HEAD for 0.5.19 release.

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

diff --git a/lustre/obdclass/Makefile.am b/lustre/obdclass/Makefile.am
index ed2b321..6f7f8fc 100644 (file)
--- a/lustre/obdclass/Makefile.am
+++ b/lustre/obdclass/Makefile.am
@@ -9,16 +9,18 @@ else
 FSMOD = fsfilt_extN
 endif
 
-modulefs_DATA = lustre_build_version obdclass.o $(FSMOD).o
-EXTRA_PROGRAMS = obdclass $(FSMOD)
+modulefs_DATA = lustre_build_version obdclass.o $(FSMOD).o fsfilt_reiserfs.o
+EXTRA_PROGRAMS = obdclass $(FSMOD) fsfilt_reiserfs
 
 obdclass_SOURCES = debug.c genops.c class_obd.c sysctl.c uuid.c lprocfs_status.c
-obdclass_SOURCES += fsfilt.c
+obdclass_SOURCES += fsfilt.c statfs_pack.c
 
 include $(top_srcdir)/Rules
+
+# XXX I'm sure there's some automake mv-if-different helper for this.
 lustre_build_version:
        perl $(top_srcdir)/scripts/version_tag.pl $(top_srcdir) > tmpver
-       diff -u $(top_builddir)/include/linux/lustre_build_version.h tmpver \
-                       2> /dev/null &&\
-               $(RM) tmpver || \
+       cmp -z $(top_builddir)/include/linux/lustre_build_version.h tmpver \
+               2> /dev/null &&                                            \
+               $(RM) tmpver ||                                            \
                mv tmpver $(top_builddir)/include/linux/lustre_build_version.h