X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=118b82c783f11959afb824eb3db56b4c1bd2040f;hp=251ab1e07cd0cc2cb7c5e25e732e73ab1165838f;hb=54320d7f52e6dd2b32e64997e2f7ae1ff1060f6f;hpb=fd0bd149e66cbc06a17c372e159f9bfba024cc97 diff --git a/autoMakefile.am b/autoMakefile.am index 251ab1e..118b82c 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,29 +1,40 @@ SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre -DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @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 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@ -if LDISKFS_ENABLED -if !LDISKFS_IN_KERNEL -EXTRA_SOURCES := @SYMVERFILE@ -endif -endif +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 -EXTRA_DIST += config.h.in debian/* +EXTRA_DIST += config.h.in -if LDISKFS_ENABLED -if !LDISKFS_IN_KERNEL -@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@ - touch @SYMVERFILE@ - -grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old - cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@ -endif +if USES_DPKG +EXTRA_DIST += debian/* endif +module-symvers-ldiskfs: +if LDISKFS_ENABLED + @if [ -f @LDISKFS_DIR@/@SYMVERFILE@ ]; then \ + cat @LDISKFS_DIR@/@SYMVERFILE@ >>@SYMVERFILE@; \ + elif [ -f @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ ]; then \ + cat @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ >>@SYMVERFILE@; \ + else \ + echo -e "\n" \ + "*** Missing ldiskfs symbols. Ensure you have built ldiskfs:\n"\ + "*** - @LDISKFS_OBJ@/ldiskfs/@SYMVERFILE@\n"; \ + exit 1; \ + fi +endif # LDISKFS_ENABLED + +module-symvers: module-symvers-ldiskfs + CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig