LU-1047 utils: mkfs shouldn't create loopback files in /dev

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 87f7181..118b82c 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,26 +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
 
@@ -39,9 +53,12 @@ checkstack-clean:
 
 module-dist-hook:
        if [ -d CVS -o -d .git ]; then \
-           perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
-       elif [ -f tree_status ]; then \
-           cp tree_status $(distdir)/tree_status; \
+           perl lustre/scripts/make_META.pl > $(distdir)/META; \
+           cp $(distdir)/META $(distdir)/ldiskfs/META; \
+       elif [ -f META ]; then \
+           cp META $(distdir)/META; \
+           cp $(distdir)/META $(distdir)/ldiskfs/META; \
        else \
-           echo -e "I have no idea how to create a tree_status file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
+           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