Move these macros to lustre-portals.m4 and lustre-core.m4 where they really belong

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

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index c5d668d..6d9b324 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -6,7 +6,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = . include portals ldiskfs lvfs obdclass lov ldlm ptlrpc      \
-       obdecho osc mdc mds obdfilter ost llite cobd ptlbd snapfs smfs cmobd \
+       obdecho osc mdc lmv  mds obdfilter ost llite cobd ptlbd smfs cmobd \
        liblustre doc utils tests conf scripts
 
 EXTRA_DIST = BUGS FDL Rules.in kernel_patches kernel-tests/Makefile    \
@@ -42,6 +42,8 @@ dep: .depend
 
 .depend:
        $(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) -o scripts -o include/config/MARKER _sfdep_$(PWD) _FASTDEP_ALL_SUB_DIRS="$(PWD)"
+
+CLEANFILES = .depend
 endif
 
 if LDISKFS
@@ -54,7 +56,11 @@ lvfs-sources:
        $(MAKE) sources -C lvfs
 
 modules: lustre_build_version $(DEP) $(LDISKFS) lvfs-sources
-       $(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) SUBDIRS=$(PWD) -o tmp_include_depends -o scripts -o include/config/MARKER $@
+       $(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o include/config/MARKER $@
+
+endif # MODULES
+
+all-recursive: lustre_build_version
 
 lustre_build_version:
        perl $(top_builddir)/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
@@ -64,8 +70,6 @@ lustre_build_version:
                 $(RM) tmpver ||                                            \
                 mv tmpver $(top_builddir)/include/linux/lustre_build_version.h
 
-endif # MODULES
-
 dist-hook:
        find $(distdir) -name .deps | xargs rm -rf
        find $(distdir) -name CVS | xargs rm -rf