LU-6635 lfsck: block replacing the OST-object for test

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

diff --git a/autoMakefile.am b/autoMakefile.am
index adffb63..5fb234e 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,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)" -C $(LINUX_OBJ) \
+modules: undef.h ldiskfs-sources
+       $(MAKE) LDFLAGS= 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,17 +90,22 @@ 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                  \
        config.h.in                     \
-       undef.h                         \
        lustre-dkms_pre-build.sh        \
-       lustre-dkms_post-build.sh
+       lustre-dkms_post-build.sh       \
+       LUSTRE-VERSION-GEN              \
+       LUSTRE-VERSION-FILE             \
+       undef.h
+
+# 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
+EXTRA_DIST += rpm
 
 rpm-local:
        @(if test -z "$(RPMBUILD)"; then \
@@ -169,26 +171,19 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
        rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
        $(MAKE) $(AM_MAKEFLAGS) \
                rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+       cp $(top_srcdir)/rpm/* $(top_srcdir); \
        $(RPMBUILD) \
                --define "_tmppath $$rpmbuilddir/TMP" \
                --define "_topdir $$rpmbuilddir" \
-               --define "build_src_rpm 1" \
                --define "dist %{nil}" \
                -ts $(distdir).tar.gz || exit 1; \
        cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \
        rm -rf $$rpmbuilddir
 
 # In the debs target, first make sure what's in the changelog reflects
-# the software version.  Here's how we could dig the version out of the
-# autoconf version file directly:
-# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p'
-#      lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//');
-#
-# However, one cannot really run "make debs" without having done a
-# configure first, so we could use the easier method of digging the
-# version out of the config.h file.
+# the software version.
 debs: undef.h
-       lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \
+       lversion=$$(echo @VERSION@ | tr '_' '-'); \
        cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
        if [ "$$lversion" != "$$cversion" ]; then \
                echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
@@ -252,16 +247,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