More merging from the 2.5 tree.

diff --git a/lustre/obdfilter/Makefile.am b/lustre/obdfilter/Makefile.am
index 68eeee2..34b6c7a 100644 (file)
--- a/lustre/obdfilter/Makefile.am
+++ b/lustre/obdfilter/Makefile.am
@@ -21,5 +21,8 @@ obdfilter_SOURCES = $(FILTERC) $(LINX)
 dist-hook:
        list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done
 
+distclean: 
+       $(RM) Makefile.in
+
 include $(top_srcdir)/Rules