Branch b1_6

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

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index b2097ea..53ae48a 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign
 ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
        mgc doc utils tests scripts autoconf contrib
 
-SERVER_SUBDIRS := ldiskfs ldiskfs2 obdfilter ost mds mgs
+SERVER_SUBDIRS := obdfilter ost mds mgs
 
 CLIENT_SUBDIRS := mdc llite
 
@@ -44,14 +44,6 @@ DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)        \
 
 EXTRA_DIST = BUGS FDL kernel_patches
 
-if LDISKFS
-LDISKFS = ldiskfs-sources ldiskfs2-sources
-ldiskfs-sources:
-       $(MAKE) sources -C ldiskfs
-ldiskfs2-sources:
-       $(MAKE) sources -C ldiskfs2
-endif
-
 lvfs-sources:
        $(MAKE) sources -C lvfs
 obdclass-sources:
@@ -61,7 +53,7 @@ sources: $(LDISKFS) lvfs-sources obdclass-sources lustre_build_version
 
 all-recursive: lustre_build_version
 
-BUILD_VER_H=$(top_builddir)/lustre/include/linux/lustre_build_version.h
+BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
 
 lustre_build_version:
        perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver