LU-8001 nodemap: fix null deref when reclassifying

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

diff --git a/autoMakefile.am b/autoMakefile.am
index effac1e..ed22c70 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,18 +1,18 @@
 SUBDIRS := @LDISKFS_SUBDIR@ \
        . \
-       @SNMP_SUBDIR@ \
        @LUSTREIOKIT_SUBDIR@ \
        @LIBCFS_SUBDIR@ \
+       @SNMP_SUBDIR@ \
        lnet \
        lustre
 
 DIST_SUBDIRS := ldiskfs \
-       @SNMP_DIST_SUBDIR@ \
        lustre-iokit \
        @LIBCFS_SUBDIR@ \
+       @SNMP_DIST_SUBDIR@ \
        lnet \
        lustre \
-       config contrib
+       config
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -61,21 +61,18 @@ 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
-       $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)             \
+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)' \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
@@ -93,16 +90,21 @@ dist-hook: undef.h
                        -name .svn -o \
                        -name .git -o \
                        -name .#* -exec rm -rf {} \;
-       $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$(top_distdir)" distdir="$(distdir)" \
-               module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec    \
        build/Makefile                  \
        build/Rules.in                  \
-       build/gen_filelist.sh           \
        config.h.in                     \
-       undef.h
+       undef.h                         \
+       lustre-dkms_pre-build.sh        \
+       lustre-dkms_post-build.sh       \
+       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 \
@@ -251,16 +253,3 @@ checkstack-update:
 
 checkstack-clean:
        rm -f ${CSTK} ${CSTKO}
-
-module-dist-hook:
-       @if [ -d .git ]; then \
-               perl lustre/scripts/version_tag.pl \
-                       --make_META > $(distdir)/META; \
-       elif [ -f META ]; then \
-               cp META $(distdir)/META; \
-       else \
-               echo -e "\n" \
-               "*** I have no idea how to create a META file in $(distdir).\n"\
-               "*** Please file a bug at https://jira.hpdd.intel.com/\n"; \
-               exit 1; \
-       fi