LU-8001 nodemap: fix null deref when reclassifying

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 0943370..ed22c70 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -12,7 +12,7 @@ DIST_SUBDIRS := ldiskfs \
        @SNMP_DIST_SUBDIR@ \
        lnet \
        lustre \
-       config contrib
+       config
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -61,20 +61,17 @@ doxygen-%: build/doxyfile.%
        doxygen $<
 
 if MODULES
-.PHONY: ldiskfs-sources lustre-sources
+.PHONY: ldiskfs-sources
 
 ldiskfs-sources:
 if LDISKFS_ENABLED
        $(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
 endif
 
-lustre-sources:
-       $(MAKE) sources -C lustre || exit $$?
-
 if LINUX
 all-am: modules
 
-modules: undef.h ldiskfs-sources lustre-sources
+modules: undef.h ldiskfs-sources
        $(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
        LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
@@ -104,6 +101,11 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec        \
        LUSTRE-VERSION-GEN              \
        LUSTRE-VERSION-FILE
 
+# contrib is a directory.  Putting a directory in EXTRA_DIST
+# recursively includes the entire directory contents in the
+# distribution tarball (the tarball created with "make dist").
+EXTRA_DIST += contrib
+
 rpm-local:
        @(if test -z "$(RPMBUILD)"; then \
                echo -e "\n" \