X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=6d9b324aa1d0abcb395608d7b6a23043588e143c;hb=69d00d347e28bd7ba7d4b35edf413fa6415da734;hp=9b829bfc1995987f70fca0d53b0ed3e17711c623;hpb=bd1b99d7caa6ab2b7c771524af9178a3da69eeab;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 9b829bf..6d9b324 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -6,12 +6,33 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = . include portals ldiskfs lvfs obdclass lov ldlm ptlrpc      \
-	obdecho osc mdc mds obdfilter ost llite cobd ptlbd snapfs smfs \
+	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	\
+EXTRA_DIST = BUGS FDL Rules.in kernel_patches kernel-tests/Makefile    \
 	README.kernel-source
 
+# these empty rules are needed so that automake doesn't add its own
+# recursive rules
+etags-recursive:
+
+ctags-recursive:
+
+tags-recursive:
+
+TAGS:
+
+tags:
+	rm -f $(top_srcdir)/TAGS
+	ETAGSF=`etags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	find $(top_srcdir) -name '*.[hc]' | xargs etags $$ETAGSF -a
+
+	rm -f $(top_srcdir)/tags
+	CTAGSF=`ctags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	find $(top_srcdir) -name '*.[hc]' | xargs ctags $$CTAGSF -a
+
 if MODULES
 all-am: modules
 
@@ -21,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
@@ -33,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
@@ -43,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