LU-1134 test: can not assume lustre setup before nfs test

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 5d1d839..de00088 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -4,12 +4,16 @@ SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 if LDISKFS_ENABLED
 if !LDISKFS_IN_KERNEL
-EXTRA_SOURCES := @SYMVERFILE@
+SYMVERFILE_DEPENDECY := @SYMVERFILE@
 endif
 endif
 
 @TESTS_TRUE@BUILD_TESTS = true
 @TESTS_FALSE@BUILD_TESTS = false
+@SERVER_TRUE@BUILD_SERVER = true
+@SERVER_FALSE@BUILD_SERVER = false
+@CLIENT_TRUE@BUILD_CLIENT = true
+@CLIENT_FALSE@BUILD_CLIENT = false
 
 include build/autoMakefile.am.toplevel
 
@@ -21,6 +25,9 @@ endif
 
 if LDISKFS_ENABLED
 if !LDISKFS_IN_KERNEL
+
+EXTRA_DIST += @SYMVERFILE@
+
 @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
        touch @SYMVERFILE@
        -grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
@@ -55,15 +62,3 @@ module-dist-hook:
            echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
            exit 1; \
        fi
-       if [ -d .git ]; then \
-               build/extract_patches $(distdir); \
-               if grep -e "^--- .*\/autoconf" -e "^--- .*\/Makefile\.am" -e ".*\/configure\.ac" -e ".*\/configure\.in" $(distdir)/debian/patches/*; then \
-                       cp build/autogen.sh $(distdir)/build; \
-                       cp libsysio/autogen.sh $(distdir)/libsysio; \
-                       cp lustre-iokit/autogen.sh $(distdir)/lustre-iokit; \
-               fi; \
-               mkdir empty; \
-               diff -urN empty $(distdir)/debian > debian.diff; \
-               rm -rf $(distdir)/debian; \
-               rmdir empty; \
-       fi