build: include more files in "make dist" tarball

Include all the documentation, qa, and CMakeLists.txt files in the "make
dist" tarball.

Kraken and newer releases will already do this. This change is
restricted to releases that still use autotools.

The purpose of this change is to make it easier to apply downstream
patches on an unpacked upstream tarball, because often those patches are
cherry-picks of commits that touch files under doc/, qa/, or
CMakeLists.txt.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index a7f0e3ee6c2f4ad6929db4f3b3084dad4698153a..778be29cbb10a6c771371e26071b17e23bc7847c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,8 @@ EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec install-deps.sh
 SUBDIRS = . src man doc systemd selinux
 
 EXTRA_DIST += \
+       CMakeLists.txt \
+       qa \
        src/test/run-cli-tests \
        src/test/run-cli-tests-maybe-unset-ccache \
        src/test/cli \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c4bcfc7c6f10d9341ff04791cea96e0d39fc0058..2ca0addc9d7b5868ed1ec72d446ea062ce03d293 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,37 +1,25 @@
 EXTRA_DIST = \
-       man/8/ceph-authtool.rst \
-       man/8/ceph-clsinfo.rst  \
-       man/8/ceph-conf.rst     \
-       man/8/ceph-create-keys.rst      \
-       man/8/ceph-debugpack.rst        \
-       man/8/ceph-dencoder.rst \
-       man/8/ceph-deploy.rst   \
-       man/8/ceph-detect-init.rst      \
-       man/8/ceph-disk.rst     \
-       man/8/cephfs.rst        \
-       man/8/ceph-fuse.rst     \
-       man/8/ceph-mds.rst      \
-       man/8/ceph-mon.rst      \
-       man/8/ceph-osd.rst      \
-       man/8/ceph-post-file.rst        \
-       man/8/ceph-rbdnamer.rst \
-       man/8/ceph-rest-api.rst \
-       man/8/ceph.rst  \
-       man/8/ceph-run.rst      \
-       man/8/ceph-syn.rst      \
-       man/8/crushtool.rst     \
-       man/8/librados-config.rst       \
-       man/8/monmaptool.rst    \
-       man/8/mount.ceph.rst    \
-       man/8/osdmaptool.rst    \
-       man/8/radosgw-admin.rst \
-       man/8/radosgw.rst       \
-       man/8/rados.rst \
-       man/8/rbd-fuse.rst      \
-       man/8/rbd-mirror.rst    \
-       man/8/rbd-nbd.rst       \
-       man/8/rbd-replay-many.rst       \
-       man/8/rbd-replay-prep.rst       \
-       man/8/rbd-replay.rst    \
-       man/8/rbd.rst           \
-       man/8/rbdmap.rst
+       man \
+       api \
+       architecture.rst \
+       cephfs \
+       conf.py \
+       dev \
+       favicon.ico \
+       glossary.rst /
+       images /
+       index.rst /
+       install /
+       logo.png /
+       Makefile.am /
+       man /
+       mon /
+       rados /
+       radosgw /
+       rbd /
+       release-notes.rst /
+       releases.rst /
+       scripts /
+       start /
+       _templates /
+       _themes

diff --git a/man/Makefile.am b/man/Makefile.am
index 40506babd5e05de6286cc911d41b46eb50160b78..0dcf03826ee360aa893a2d0efd14fc4938c0a40b 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
-EXTRA_DIST = conf.py ceph_selinux.8
+EXTRA_DIST = conf.py ceph_selinux.8 CMakeLists.txt
 
 dist_man_MANS = 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index a11325e7feda6ee3b160945f3796bdc081d41f7f..a3d0ecdd573da1822ae8aff1a6c2538a1cfbefe3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,6 +139,7 @@ EXTRA_DIST += \
        yasm-wrapper
 
 EXTRA_DIST += \
+       CMakeLists.txt \
        unittest_bufferlist.sh
 
 

diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
index 8ddcb1eaeae0a13c9e753d9a4c67db17bf1519d1..3926ac4bec2953c5b03aed069af104f513c96a89 100644 (file)
--- a/src/ceph-detect-init/Makefile.am
+++ b/src/ceph-detect-init/Makefile.am
@@ -22,6 +22,7 @@ check_SCRIPTS += ceph-detect-init/run-tox.sh
 
 EXTRA_DIST += \
        ceph-detect-init/AUTHORS.rst \
+       ceph-detect-init/CMakeLists.txt \
        ceph-detect-init/ceph_detect_init/centos/__init__.py \
        ceph-detect-init/ceph_detect_init/exc.py \
        ceph-detect-init/ceph_detect_init/main.py \

diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
index 900630382a1371d570de8add94a69bf689f80652..a8532878c84e74ebe14367dcf77b14e3d3c4468c 100644 (file)
--- a/src/ceph-disk/Makefile.am
+++ b/src/ceph-disk/Makefile.am
@@ -17,6 +17,7 @@ check_SCRIPTS += ceph-disk/run-tox.sh
 
 EXTRA_DIST += \
        ceph-disk/AUTHORS.rst \
+       ceph-disk/CMakeLists.txt \
        ceph-disk/ceph_disk/__init__.py \
        ceph-disk/ceph_disk/main.py \
        ceph-disk/Makefile.am \

diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am
index bac67e902e02848e7052ed0597a72ecfff87c85b..bb9ec9441902ad2466ecb002629f3d2b7ca9bba6 100644 (file)
--- a/src/cls/Makefile.am
+++ b/src/cls/Makefile.am
@@ -5,3 +5,5 @@ endif
 if ENABLE_SERVER
 include cls/Makefile-server.am
 endif
+
+EXTRA_DIST += cls/CMakeLists.txt

diff --git a/src/compressor/Makefile.am b/src/compressor/Makefile.am
index 9deda3c482bca19c8397f8623c94bb08742c0f1f..4d42803bdd3fa8897d6ed7d14901def1d3ca6131 100644 (file)
--- a/src/compressor/Makefile.am
+++ b/src/compressor/Makefile.am
@@ -19,3 +19,5 @@ noinst_HEADERS += \
        compressor/AsyncCompressor.h \
     compressor/CompressionPlugin.h
 
+
+EXTRA_DIST += compressor/CMakeLists.txt

diff --git a/src/compressor/snappy/Makefile.am b/src/compressor/snappy/Makefile.am
index 49d3db0532980d4ea492693624b46d8b7828aa38..427cea53dffab9e98d99682d25f329a4067b31f0 100644 (file)
--- a/src/compressor/snappy/Makefile.am
+++ b/src/compressor/snappy/Makefile.am
@@ -20,3 +20,5 @@ libceph_snappy_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*'
 endif
 
 compressorlib_LTLIBRARIES += libceph_snappy.la
+
+EXTRA_DIST += compressor/snappy/CMakeLists.txt

diff --git a/src/compressor/zlib/Makefile.am b/src/compressor/zlib/Makefile.am
index 250f396220158645ea904dcafe55c522fa864c7b..623cdcd7f72973686d6ebf8d021ea17d1fbdc49e 100644 (file)
--- a/src/compressor/zlib/Makefile.am
+++ b/src/compressor/zlib/Makefile.am
@@ -19,3 +19,5 @@ libceph_zlib_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*'
 endif
 
 compressorlib_LTLIBRARIES += libceph_zlib.la
+
+EXTRA_DIST += compressor/zlib/CMakeLists.txt

diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am
index 224e67b91e2f6dcf0c6106ea0d3266522598647d..e150556b980fd69f784f7924e8476837e54bf92a 100644 (file)
--- a/src/erasure-code/Makefile.am
+++ b/src/erasure-code/Makefile.am
@@ -26,3 +26,5 @@ noinst_HEADERS += \
        erasure-code/ErasureCode.h \
        erasure-code/ErasureCodeInterface.h \
        erasure-code/ErasureCodePlugin.h
+
+EXTRA_DIST += erasure-code/CMakeLists.txt

diff --git a/src/erasure-code/isa/Makefile.am b/src/erasure-code/isa/Makefile.am
index 6bbb37cd8da88477af097e79129261b278cd2571..971b736288526a49d0981956c982598f063270d2 100644 (file)
--- a/src/erasure-code/isa/Makefile.am
+++ b/src/erasure-code/isa/Makefile.am
@@ -75,3 +75,5 @@ libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 endif
 
 erasure_codelib_LTLIBRARIES += libec_isa.la
+
+EXTRA_DIST += erasure-code/isa/CMakeLists.txt

diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
index adcb95daf3457ca2627e513e02545b2ea292d940..6ffe3ed1a3176ac42385dc5858d08258123b904e 100644 (file)
--- a/src/erasure-code/jerasure/Makefile.am
+++ b/src/erasure-code/jerasure/Makefile.am
@@ -146,3 +146,5 @@ endif
 erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc: ./ceph_ver.h
 
 erasure_codelib_LTLIBRARIES += libec_jerasure.la
+
+EXTRA_DIST += erasure-code/jerasure/CMakeLists.txt

diff --git a/src/erasure-code/lrc/Makefile.am b/src/erasure-code/lrc/Makefile.am
index 44c47d558315a42efe7053cf16e7eb3d4b8463b0..0f914063089c1c78dd87c56d80b6f7949a539f92 100644 (file)
--- a/src/erasure-code/lrc/Makefile.am
+++ b/src/erasure-code/lrc/Makefile.am
@@ -19,3 +19,5 @@ libec_lrc_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 endif
 
 erasure_codelib_LTLIBRARIES += libec_lrc.la
+
+EXTRA_DIST += erasure-code/lrc/CMakeLists.txt

diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
index 6b658d5a575dc5820d7597b32d575a0500723d76..cd931328675ee8f628cead5e0cb8ef097c575d5c 100644 (file)
--- a/src/erasure-code/shec/Makefile.am
+++ b/src/erasure-code/shec/Makefile.am
@@ -160,3 +160,5 @@ endif
 erasure-code/shec/ErasureCodePluginSelectShec.cc: ./ceph_ver.h
 
 erasure_codelib_LTLIBRARIES += libec_shec.la
+
+EXTRA_DIST += erasure-code/shec/CMakeLists.txt

diff --git a/src/json_spirit/Makefile.am b/src/json_spirit/Makefile.am
index f14228cb0627ed22c5bfd2188d46ba962a308b45..21c0dea78936d8eaf39c23932f528ffe4ea82338 100644 (file)
--- a/src/json_spirit/Makefile.am
+++ b/src/json_spirit/Makefile.am
@@ -16,3 +16,5 @@ noinst_HEADERS += \
        json_spirit/json_spirit_writer_options.h \
        json_spirit/json_spirit_writer_template.h
 
+
+EXTRA_DIST += json_spirit/CMakeLists.txt

diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am
index b8761714491f0d086d296b7000a4a718c93d9b89..9dd8b0d8d1e0bd3ca2d93195751855e28e1fc5b6 100644 (file)
--- a/src/kv/Makefile.am
+++ b/src/kv/Makefile.am
@@ -42,3 +42,5 @@ noinst_HEADERS += kv/KineticStore.h
 endif
 
 endif # ENABLE_SERVER
+
+EXTRA_DIST += kv/CMakeLists.txt

diff --git a/src/libradosstriper/Makefile.am b/src/libradosstriper/Makefile.am
index 13b8b28c4935803c4bdf92110cf748fc914da18a..293c8a541cee3e093779b2f7012866cf3b81586b 100644 (file)
--- a/src/libradosstriper/Makefile.am
+++ b/src/libradosstriper/Makefile.am
@@ -25,3 +25,5 @@ noinst_HEADERS += \
 endif # WITH_RADOSSTRIPER
 endif # WITH_RADOS
 endif # ENABLE_CLIENT
+
+EXTRA_DIST += libradosstriper/CMakeLists.txt

diff --git a/src/librbd/Makefile.am b/src/librbd/Makefile.am
index 08c9738806ee21246fd2241625b4c9a675116c5d..548b1ad63863958b1dfae4f2118d6168415cf0cb 100644 (file)
--- a/src/librbd/Makefile.am
+++ b/src/librbd/Makefile.am
@@ -159,3 +159,5 @@ noinst_HEADERS += \
 endif # WITH_RBD
 endif # WITH_RADOS
 endif # ENABLE_CLIENT
+
+EXTRA_DIST += librbd/CMakeLists.txt

diff --git a/src/pybind/Makefile.am b/src/pybind/Makefile.am
index 9f779dd5f8ef47dfc9543b82b0ed39695ee7c8be..9a8181d78452f7c3d158beda0a86194a06477565 100644 (file)
--- a/src/pybind/Makefile.am
+++ b/src/pybind/Makefile.am
@@ -27,3 +27,5 @@ endif # WITH_RADOS
 
 endif # WITH_CYTHON
 endif # ENABLE_CLIENT
+
+EXTRA_DIST += pybind/CMakeLists.txt

diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
index 577431fdd0fbe4f6aec07b194dd825904ab1f2bd..698522daa41d5cf94078010c854a8d9f09ad5af0 100644 (file)
--- a/src/pybind/cephfs/Makefile.am
+++ b/src/pybind/cephfs/Makefile.am
@@ -1,4 +1,7 @@
-EXTRA_DIST += $(srcdir)/pybind/cephfs/setup.py $(srcdir)/pybind/cephfs/cephfs.pyx
+EXTRA_DIST += \
+       $(srcdir)/pybind/cephfs/CMakeLists.txt \
+       $(srcdir)/pybind/cephfs/setup.py \
+       $(srcdir)/pybind/cephfs/cephfs.pyx
 
 cephfs-pybind-all: libcephfs.la ${srcdir}/ceph_ver.h
        cd $(srcdir)/pybind/cephfs; $(PY_DISTUTILS) build \

diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
index ad555c394b91bb24c998c9cfee6343e1ea1af7b8..a4145bf0f4ab2a62cc1e4c37fb4294f3c5ebb17d 100644 (file)
--- a/src/pybind/rados/Makefile.am
+++ b/src/pybind/rados/Makefile.am
@@ -1,4 +1,7 @@
-EXTRA_DIST += $(srcdir)/pybind/rados/setup.py $(srcdir)/pybind/rados/rados.pyx $(srcdir)/pybind/rados/rados.pxd
+EXTRA_DIST += \
+       $(srcdir)/pybind/rados/CMakeLists.txt \
+       $(srcdir)/pybind/rados/setup.py \
+       $(srcdir)/pybind/rados/rados.pyx $(srcdir)/pybind/rados/rados.pxd
 
 rados-pybind-all: librados.la ${srcdir}/ceph_ver.h
        cd $(srcdir)/pybind/rados; $(PY_DISTUTILS) build \

diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
index affd2de5054d65c781911ab8a90b4201e90a3800..7dd49333fa4bd6c29962352f9830960a9d1106ce 100644 (file)
--- a/src/pybind/rbd/Makefile.am
+++ b/src/pybind/rbd/Makefile.am
@@ -1,4 +1,7 @@
-EXTRA_DIST += $(srcdir)/pybind/rbd/setup.py $(srcdir)/pybind/rbd/rbd.pyx
+EXTRA_DIST += \
+       $(srcdir)/pybind/rbd/CMakeLists.txt \
+       $(srcdir)/pybind/rbd/setup.py \
+       $(srcdir)/pybind/rbd/rbd.pyx
 
 rbd-pybind-all: librbd.la ${srcdir}/ceph_ver.h
        cd $(srcdir)/pybind/rbd; $(PY_DISTUTILS) build \

diff --git a/src/rbd_replay/Makefile.am b/src/rbd_replay/Makefile.am
index 23a8e9152e089d934bbd78d1e291850347e40287..775ca0a80adec14da050dcac73f4dc8fa588f6e6 100644 (file)
--- a/src/rbd_replay/Makefile.am
+++ b/src/rbd_replay/Makefile.am
@@ -74,3 +74,5 @@ endif
 endif # WITH_RBD
 endif # WITH_RADOS
 endif # ENABLE_CLIENT
+
+EXTRA_DIST += rbd_replay/CMakeLists.txt

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index c865b6891769ef6251d9eb9d87af48620b46840e..ce6fc2048f7bf0e0aed04f60179a79336a793264 100644 (file)
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,3 +1,40 @@
+EXTRA_DIST += \
+       test/CMakeLists.txt \
+       test/ObjectMap/CMakeLists.txt \
+       test/bench/CMakeLists.txt \
+       test/cls_hello/CMakeLists.txt \
+       test/cls_lock/CMakeLists.txt \
+       test/cls_log/CMakeLists.txt \
+       test/cls_numops/CMakeLists.txt \
+       test/cls_rbd/CMakeLists.txt \
+       test/cls_refcount/CMakeLists.txt \
+       test/cls_replica_log/CMakeLists.txt \
+       test/cls_rgw/CMakeLists.txt \
+       test/cls_statelog/CMakeLists.txt \
+       test/cls_version/CMakeLists.txt \
+       test/common/CMakeLists.txt \
+       test/crush/CMakeLists.txt \
+       test/encoding/CMakeLists.txt \
+       test/filestore/CMakeLists.txt \
+       test/fs/CMakeLists.txt \
+       test/journal/CMakeLists.txt \
+       test/libcephfs/CMakeLists.txt \
+       test/librados/CMakeLists.txt \
+       test/librados_test_stub/CMakeLists.txt \
+       test/libradosstriper/CMakeLists.txt \
+       test/librbd/CMakeLists.txt \
+       test/mds/CMakeLists.txt \
+       test/mon/CMakeLists.txt \
+       test/msgr/CMakeLists.txt \
+       test/objectstore/CMakeLists.txt \
+       test/os/CMakeLists.txt \
+       test/osd/CMakeLists.txt \
+       test/osdc/CMakeLists.txt \
+       test/pybind/CMakeLists.txt \
+       test/rbd_mirror/CMakeLists.txt \
+       test/rgw/CMakeLists.txt \
+       test/system/CMakeLists.txt
+
 include test/erasure-code/Makefile.am
 include test/messenger/Makefile.am
 include test/compressor/Makefile.am

diff --git a/src/test/compressor/Makefile.am b/src/test/compressor/Makefile.am
index 4a41354b88e414c0dd86d1b2633fd156a15b9335..4f0d88114558a94b5ca09446cf5231e2d0d88422 100644 (file)
--- a/src/test/compressor/Makefile.am
+++ b/src/test/compressor/Makefile.am
@@ -69,3 +69,5 @@ check_TESTPROGRAMS += unittest_compression_plugin_zlib
 
 endif # WITH_OSD
 endif # ENABLE_SERVER
+
+EXTRA_DIST += test/compressor/CMakeLists.txt

diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
index 3c45c67c61c368fe743ca93d1df9ccb6fdc3b8ac..f2d2b28c10de5c062b9c9513ef9f9374c4c72378 100644 (file)
--- a/src/test/erasure-code/Makefile.am
+++ b/src/test/erasure-code/Makefile.am
@@ -367,3 +367,5 @@ check_TESTPROGRAMS += unittest_erasure_code_example
 
 endif # WITH_OSD
 endif # ENABLE_SERVER
+
+EXTRA_DIST += test/erasure-code/CMakeLists.txt

diff --git a/src/test/messenger/Makefile.am b/src/test/messenger/Makefile.am
index 9fe2416614ab2625c0d3f36bbd743cef7f7a7520..71a660489de5d17a87f00f34a35659a26e84fd71 100644 (file)
--- a/src/test/messenger/Makefile.am
+++ b/src/test/messenger/Makefile.am
@@ -74,3 +74,5 @@ noinst_PROGRAMS += \
 
 endif # ENABLE_XIO
 endif # ENABLE_SERVER
+
+EXTRA_DIST += test/messenger/CMakeLists.txt

diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am
index 1c2349e5d2b6f9e54b4bbfec6ee66f9ec1e0dfa1..f022acd4c07cba20c8d5e56e4a68a5459008476b 100644 (file)
--- a/src/tracing/Makefile.am
+++ b/src/tracing/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST += \
+       tracing/CMakeLists.txt \
        tracing/tracing-common.h
 
 if WITH_LTTNG