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

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 9b829bf..84f3c26 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -5,24 +5,38 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = . include portals ldiskfs lvfs obdclass lov ldlm ptlrpc      \
-	obdecho osc mdc mds obdfilter ost llite cobd ptlbd snapfs smfs \
-	liblustre doc utils tests conf scripts
+ALWAYS_SUBDIRS := include lvfs obdclass lov ldlm sec ptlrpc	      \
+	obdecho osc lmv cobd ptlbd cmobd doc utils tests conf scripts \
+	autoconf
 
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches kernel-tests/Makefile	\
-	README.kernel-source
+SERVER_SUBDIRS := ldiskfs smfs snapfs obdfilter ost mds
 
-if MODULES
-all-am: modules
+CLIENT_SUBDIRS := mdc llite
 
-if !LINUX25
-DEP = dep
-dep: .depend
+LIBLUSTRE_SUBDIRS := liblustre
 
-.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)"
+SUBDIRS := $(ALWAYS_SUBDIRS)
+
+if SERVER
+SUBDIRS += $(SERVER_SUBDIRS)
+endif
+
+if CLIENT
+SUBDIRS += $(CLIENT_SUBDIRS)
+endif
+
+if LIBLUSTRE
+if !CLIENT
+SUBDIRS += $(CLIENT_SUBDIRS)
+endif
+SUBDIRS += $(LIBLUSTRE_SUBDIRS)
 endif
 
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) \
+	$(LIBLUSTRE_SUBDIRS)
+
+EXTRA_DIST = BUGS FDL Rules.in kernel_patches
+
 if LDISKFS
 LDISKFS = ldiskfs-sources
 ldiskfs-sources:
@@ -32,25 +46,17 @@ endif
 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 $@
+sources: $(LDISKFS) lvfs-sources lustre_build_version
+
+all-recursive: lustre_build_version
 
 lustre_build_version:
-	perl $(top_builddir)/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
+	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
 	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
-	cmp -s $(top_builddir)/include/linux/lustre_build_version.h tmpver \
+	cmp -s $(top_builddir)/lustre/include/linux/lustre_build_version.h tmpver \
                 2> /dev/null &&                                            \
                 $(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
-
-rpms: dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
+                mv tmpver $(top_builddir)/lustre/include/linux/lustre_build_version.h
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig