LU-1199 build: Simplify autotools version checks

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

diff --git a/autoMakefile.am b/autoMakefile.am
index d40970f..484fdcf 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,11 +1,15 @@
 SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre
-SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+SOURCES_SUBDIRS := @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 MODULE_SYMVERS_DEPS = module-symvers
 
 @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
 
@@ -29,7 +33,31 @@ if LDISKFS_ENABLED
        fi
 endif # LDISKFS_ENABLED
 
-module-symvers: module-symvers-ldiskfs
+module-symvers-zfs:
+if ZFS_ENABLED
+       @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+               cat @SPL_OBJ@/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+       elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+               cat @SPL_OBJ@/module/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+       else \
+               echo -e "\n" \
+               "*** Missing spl symbols. Ensure you have built spl:\n" \
+               "*** - @SPL_OBJ@/@SYMVERFILE@\n"; \
+               exit 1; \
+       fi
+       @if [ -f @ZFS_OBJ@/@ZFS_SYMBOLS@ ]; then \
+               cat @ZFS_OBJ@/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+       elif [ -f @ZFS_OBJ@/module/@ZFS_SYMBOLS@ ]; then \
+               cat @ZFS_OBJ@/module/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+       else \
+               echo -e "\n" \
+               "*** Missing zfs symbols. Ensure you have built zfs:\n" \
+               "*** - @ZFS_OBJ@/@SYMVERFILE@\n"; \
+               exit 1; \
+       fi
+endif # ZFS_ENABLED
+
+module-symvers: module-symvers-ldiskfs module-symvers-zfs
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
@@ -49,12 +77,15 @@ checkstack-clean:
 
 module-dist-hook:
        if [ -d CVS -o -d .git ]; then \
-           perl lustre/scripts/make_META.pl > $(distdir)/META; \
-           cp $(distdir)/META $(distdir)/ldiskfs/META; \
+               perl lustre/scripts/make_META.pl > $(distdir)/META; \
        elif [ -f META ]; then \
-           cp META $(distdir)/META; \
-           cp $(distdir)/META $(distdir)/ldiskfs/META; \
+               cp META $(distdir)/META; \
        else \
-           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; \
+               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 LDISKFS_ENABLED
+       if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \
+               cp $(distdir)/META $(distdir)/ldiskfs/META; \
+       fi
+endif