From fba798dcad1a341cf72d02f65d840997cdb02caa Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 7 Sep 2016 11:50:14 -0400 Subject: [PATCH] remove autotools Signed-off-by: Sage Weil --- .gitignore | 43 - Makefile.am | 101 -- admin/manpage-howto.txt | 2 +- autogen.sh | 50 - autogen_freebsd.sh | 63 -- ceph.spec.in | 1 - configure.ac | 1426 --------------------------- doc/.gitignore | 1 - doc/Makefile.am | 36 - m4/ac_check_class.m4 | 108 -- m4/ac_check_classpath.m4 | 24 - m4/ac_check_rqrd_class.m4 | 26 - m4/ac_java_options.m4 | 33 - m4/ac_prog_jar.m4 | 39 - m4/ac_prog_java.m4 | 83 -- m4/ac_prog_java_works.m4 | 98 -- m4/ac_prog_javac.m4 | 45 - m4/ac_prog_javac_works.m4 | 36 - m4/ac_prog_javah.m4 | 28 - m4/ac_try_compile_java.m4 | 40 - m4/ac_try_run_javac.m4 | 41 - m4/acx_pthread.m4 | 397 -------- m4/ax_arm.m4 | 41 - m4/ax_c_pretty_func.m4 | 18 - m4/ax_c_var_func.m4 | 66 -- m4/ax_check_compile_flag.m4 | 72 -- m4/ax_check_openssl.m4 | 124 --- m4/ax_cxx_compile_stdcxx_11.m4 | 142 --- m4/ax_cxx_static_cast.m4 | 43 - m4/ax_intel.m4 | 70 -- man/.gitignore | 1 - man/Makefile-client.am | 37 - man/Makefile-server.am | 33 - man/Makefile.am | 31 - selinux/.gitignore | 1 - selinux/Makefile.am | 22 - src/.gitignore | 102 -- src/Makefile-client.am | 112 --- src/Makefile-env.am | 306 ------ src/Makefile-server.am | 65 -- src/Makefile-spdk.am | 48 - src/Makefile.am | 322 ------ src/arch/Makefile.am | 11 - src/auth/Makefile.am | 46 - src/brag/Makefile.am | 4 - src/ceph-detect-init/Makefile.am | 80 -- src/ceph-disk/Makefile.am | 56 -- src/client/Makefile.am | 42 - src/cls/Makefile-client.am | 104 -- src/cls/Makefile-server.am | 84 -- src/cls/Makefile.am | 7 - src/common/Makefile.am | 310 ------ src/common/ceph_crypto.h | 2 +- src/compressor/Makefile.am | 21 - src/compressor/snappy/Makefile.am | 23 - src/compressor/zlib/Makefile.am | 58 -- src/crush/Makefile.am | 35 - src/erasure-code/Makefile.am | 28 - src/erasure-code/isa/Makefile.am | 77 -- src/erasure-code/lrc/Makefile.am | 21 - src/erasure-code/shec/Makefile.am | 162 --- src/global/Makefile.am | 17 - src/java/Makefile.am | 87 -- src/journal/Makefile.am | 39 - src/json_spirit/Makefile.am | 18 - src/key_value_store/Makefile.am | 17 - src/kv/Makefile.am | 58 -- src/librados/Makefile.am | 45 - src/libradosstriper/Makefile.am | 27 - src/librbd/Makefile.am | 183 ---- src/log/Makefile.am | 11 - src/mds/Makefile-client.am | 4 - src/mds/Makefile-server.am | 74 -- src/mds/Makefile.am | 43 - src/messages/Makefile.am | 129 --- src/mon/Makefile.am | 53 - src/msg/Makefile.am | 90 -- src/ocf/Makefile.am | 13 - src/os/Makefile.am | 166 ---- src/osd/Makefile.am | 57 -- src/osdc/Makefile.am | 16 - src/perfglue/Makefile.am | 35 - src/pybind/Makefile.am | 31 - src/pybind/cephfs/Makefile.am | 35 - src/pybind/rados/Makefile.am | 36 - src/pybind/rbd/Makefile.am | 35 - src/rbd_replay/Makefile.am | 76 -- src/rgw/Makefile.am | 285 ------ src/script/make_rocksdb_makefile.sh | 10 - src/test/Makefile-client.am | 814 --------------- src/test/Makefile-server.am | 274 ----- src/test/Makefile.am | 529 ---------- src/test/compressor/Makefile.am | 76 -- src/test/erasure-code/Makefile.am | 367 ------- src/test/messenger/Makefile.am | 76 -- src/tools/Makefile-client.am | 172 ---- src/tools/Makefile-server.am | 66 -- src/tools/Makefile.am | 50 - src/tracing/Makefile.am | 78 -- src/tracing/README.md | 2 +- systemd/Makefile.am | 25 - 101 files changed, 3 insertions(+), 9764 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 autogen_freebsd.sh delete mode 100644 configure.ac delete mode 100644 doc/Makefile.am delete mode 100644 m4/ac_check_class.m4 delete mode 100644 m4/ac_check_classpath.m4 delete mode 100644 m4/ac_check_rqrd_class.m4 delete mode 100644 m4/ac_java_options.m4 delete mode 100644 m4/ac_prog_jar.m4 delete mode 100644 m4/ac_prog_java.m4 delete mode 100644 m4/ac_prog_java_works.m4 delete mode 100644 m4/ac_prog_javac.m4 delete mode 100644 m4/ac_prog_javac_works.m4 delete mode 100644 m4/ac_prog_javah.m4 delete mode 100644 m4/ac_try_compile_java.m4 delete mode 100644 m4/ac_try_run_javac.m4 delete mode 100644 m4/acx_pthread.m4 delete mode 100644 m4/ax_arm.m4 delete mode 100644 m4/ax_c_pretty_func.m4 delete mode 100644 m4/ax_c_var_func.m4 delete mode 100644 m4/ax_check_compile_flag.m4 delete mode 100644 m4/ax_check_openssl.m4 delete mode 100644 m4/ax_cxx_compile_stdcxx_11.m4 delete mode 100644 m4/ax_cxx_static_cast.m4 delete mode 100644 m4/ax_intel.m4 delete mode 100644 man/Makefile-client.am delete mode 100644 man/Makefile-server.am delete mode 100644 man/Makefile.am delete mode 100644 selinux/Makefile.am delete mode 100644 src/Makefile-client.am delete mode 100644 src/Makefile-env.am delete mode 100644 src/Makefile-server.am delete mode 100644 src/Makefile-spdk.am delete mode 100644 src/Makefile.am delete mode 100644 src/arch/Makefile.am delete mode 100644 src/auth/Makefile.am delete mode 100644 src/brag/Makefile.am delete mode 100644 src/ceph-detect-init/Makefile.am delete mode 100644 src/ceph-disk/Makefile.am delete mode 100644 src/client/Makefile.am delete mode 100644 src/cls/Makefile-client.am delete mode 100644 src/cls/Makefile-server.am delete mode 100644 src/cls/Makefile.am delete mode 100644 src/common/Makefile.am delete mode 100644 src/compressor/Makefile.am delete mode 100644 src/compressor/snappy/Makefile.am delete mode 100644 src/compressor/zlib/Makefile.am delete mode 100644 src/crush/Makefile.am delete mode 100644 src/erasure-code/Makefile.am delete mode 100644 src/erasure-code/isa/Makefile.am delete mode 100644 src/erasure-code/lrc/Makefile.am delete mode 100644 src/erasure-code/shec/Makefile.am delete mode 100644 src/global/Makefile.am delete mode 100644 src/java/Makefile.am delete mode 100644 src/journal/Makefile.am delete mode 100644 src/json_spirit/Makefile.am delete mode 100644 src/key_value_store/Makefile.am delete mode 100644 src/kv/Makefile.am delete mode 100644 src/librados/Makefile.am delete mode 100644 src/libradosstriper/Makefile.am delete mode 100644 src/librbd/Makefile.am delete mode 100644 src/log/Makefile.am delete mode 100644 src/mds/Makefile-client.am delete mode 100644 src/mds/Makefile-server.am delete mode 100644 src/mds/Makefile.am delete mode 100644 src/messages/Makefile.am delete mode 100644 src/mon/Makefile.am delete mode 100644 src/msg/Makefile.am delete mode 100644 src/ocf/Makefile.am delete mode 100644 src/os/Makefile.am delete mode 100644 src/osd/Makefile.am delete mode 100644 src/osdc/Makefile.am delete mode 100644 src/perfglue/Makefile.am delete mode 100644 src/pybind/Makefile.am delete mode 100644 src/pybind/cephfs/Makefile.am delete mode 100644 src/pybind/rados/Makefile.am delete mode 100644 src/pybind/rbd/Makefile.am delete mode 100644 src/rbd_replay/Makefile.am delete mode 100644 src/rgw/Makefile.am delete mode 100755 src/script/make_rocksdb_makefile.sh delete mode 100644 src/test/Makefile-client.am delete mode 100644 src/test/Makefile-server.am delete mode 100644 src/test/Makefile.am delete mode 100644 src/test/compressor/Makefile.am delete mode 100644 src/test/erasure-code/Makefile.am delete mode 100644 src/test/messenger/Makefile.am delete mode 100644 src/tools/Makefile-client.am delete mode 100644 src/tools/Makefile-server.am delete mode 100644 src/tools/Makefile.am delete mode 100644 src/tracing/Makefile.am delete mode 100644 systemd/Makefile.am diff --git a/.gitignore b/.gitignore index 7744c92c8137b..da5201439e86d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -*.o -*.lo -*.a *~ *.co *.diff @@ -13,45 +10,15 @@ *.gcov *.gcno *.generated.dot -*.la -*.so *.swp *.swo *.tmp *.orig *.patch -*.pyc -*.pyo -.cproject -.deps -.dirstamp -.metadata -.project -.settings -aclocal.m4 -ar-lib -autom4te.cache -build-stamp ceph.spec -compile -config.guess -config.log -config.status -config.sub -configure -configure-stamp cscope.* -depcomp gmon.out -install-sh -libtool -ltmain.sh -Makefile.in -missing py-compile -release -stamp-h1 -systemd/Makefile # Files generated by crashed programs vgcore.* @@ -64,24 +31,14 @@ core # specific local dir files /build-doc -/config.* -/Makefile /tags -# temporary directory used by e.g. "make distcheck", e.g. ceph-0.42 -/ceph-[0-9]*/ - -# M4 Macro directory -/m4/ - # where is this from? web/*.html # dir from coverity tools cov-int/ -/test-driver - # gtags(1) generated files GPATH GRTAGS diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 18aa8589184f2..0000000000000 --- a/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -AUTOMAKE_OPTIONS = gnu -ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec install-deps.sh -# the "." here makes sure check-local builds googletest and googlemock before they are used -SUBDIRS = . src man doc systemd selinux - -EXTRA_DIST += \ - src/test/run-cli-tests \ - src/test/run-cli-tests-maybe-unset-ccache \ - src/test/cli \ - src/test/downloads \ - systemd/ceph.tmpfiles.d \ - etc/default/ceph \ - etc/sysconfig/ceph \ - etc/sysconfig/SuSEfirewall2.d/services/ceph-mon \ - etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds \ - udev/50-rbd.rules \ - udev/60-ceph-by-parttypeuuid.rules \ - udev/95-ceph-osd.rules \ - share/known_hosts_drop.ceph.com \ - share/id_rsa_drop.ceph.com \ - share/id_rsa_drop.ceph.com.pub - -NPROC = nproc -if FREEBSD - NPROC = sysctl -n hw.ncpu -endif - -# why is it so hard to make autotools to this? -install-data-local:: - -mkdir -p $(DESTDIR)$(datadir)/ceph - -install -m 600 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com - -install -m 600 share/id_rsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_rsa_drop.ceph.com - -install -m 600 share/id_rsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_rsa_drop.ceph.com.pub - -all-local:: -if WITH_DEBUG -# We need gtest to build the rados-api tests. We only build those in -# a debug build, though. - @cd src/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - @cd src/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -endif - -CHECK_ULIMIT := true - -check-local:: all -# We build gtest this way, instead of using SUBDIRS, because with that, -# gtest's own tests would be run and that would slow us down. - @cd src/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - @cd src/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -# exercise cli tools - u=`ulimit -u` ; \ - p=`expr $(shell ${NPROC}) / 2` ; \ - n=`expr $$p \* 1024` ; \ - if ${CHECK_ULIMIT} && echo ${MAKEFLAGS} | grep --quiet -e -j && test $$u -lt $$n ; then \ - echo "ulimit -u is $$u which is lower than $$n = $$p / 2 * 1024" ; \ - echo "If running make -j$$p check you will likely exceed this limit" ; \ - echo "and the tests will fail in mysterious ways." ; \ - echo "Update /etc/security/limits.conf to increase the limit" ; \ - echo "or run make CHECK_ULIMIT=false -j4 check to override this safeguard." ; \ - exit 1 ; \ - fi - -# display the output of failed check_SCRIPTS after a failed make check -export VERBOSE = true - -TESTS = $(check_SCRIPTS) - -check_SCRIPTS = \ - src/test/run-cli-tests - -# "make distclean" both runs this and recurses into src/gtest, if -# gtest is in DIST_SUBDIRS. Take extra care to not fail when -# effectively cleaned twice. -clean-local:: - @if test -e src/googletest/googlemock/Makefile; then \ - echo "Making clean in src/googletest/googlemock"; \ - cd src/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi - - @rm -rf src/test/virtualenv - @rm -rf install-deps-* - - -# NOTE: This only works when enough dependencies are installed for -# autoconf to be happy. These commands should be run manually to -# bootstrap. -install-deps: - ./install-deps.sh - -dist-hook: -# Generates the full list of contributors - if test -d $(srcdir)/.git; then \ - cd $(srcdir); \ - git log --format='%aN <%aE>' | sort -u >$(distdir)/AUTHORS; \ - fi -# Generates ChangeLog from git - if test -d $(srcdir)/.git; then \ - cd $(srcdir); \ - git log --oneline --decorate --no-merges > $(distdir)/ChangeLog; \ - fi diff --git a/admin/manpage-howto.txt b/admin/manpage-howto.txt index db6d9ebbcb266..ccc78b812449c 100644 --- a/admin/manpage-howto.txt +++ b/admin/manpage-howto.txt @@ -2,7 +2,7 @@ Updating the manpages is a semi-manual process: (all paths below relative to top of git tree): 1) make changes to the .rst files in doc/man. -2) if adding or removing pages, update man/Makefile.am +2) if adding or removing pages, update man/CMakeLists.txt 3) use admin/build-doc to build the doc tree into build-doc/output 4) copy changed manpage files from build-doc/output/man to man/ 5) commit both doc/man .rst changes and man/ changes diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index faba9b87be007..0000000000000 --- a/autogen.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -x - -set -e - -test -f src/ceph.in || { - echo "You must run this script in the top-level ceph directory" - exit 1 -} - -check_for_pkg_config() { - which pkg-config >/dev/null && return - - echo - echo "Error: could not find pkg-config" - echo - echo "Please make sure you have pkg-config installed." - echo - exit 1 -} - -if [ `which libtoolize` ]; then - LIBTOOLIZE=libtoolize -elif [ `which glibtoolize` ]; then - LIBTOOLIZE=glibtoolize -else - echo "Error: could not find libtoolize" - echo " Please install libtoolize or glibtoolize." - exit 1 -fi - -if test -d ".git" ; then - force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi) - if ! git submodule sync || ! git submodule update $force --init --recursive; then - echo "Error: could not initialize submodule projects" - echo " Network connectivity might be required." - exit 1 - fi -fi - -rm -f config.cache -aclocal -I m4 --install -check_for_pkg_config -$LIBTOOLIZE --force --copy -aclocal -I m4 --install -autoconf -autoheader -automake -a --add-missing -Wall -( cd src/googletest/googlemock && autoreconf -fvi && ./configure; ) -( cd src/ && script/make_rocksdb_makefile.sh) -exit diff --git a/autogen_freebsd.sh b/autogen_freebsd.sh deleted file mode 100644 index e3a578fda04f0..0000000000000 --- a/autogen_freebsd.sh +++ /dev/null @@ -1,63 +0,0 @@ -# Set the FreeBSD specific configure flags -FREEBSD_CONFIGURE_FLAGS= -if [ x`uname`x = x"FreeBSD"x ]; then - MAKE=gmake - # We need at least something > clang 3.4 - # tested with package clang37 on FreeBSD 10.2 ( Which has 3.4 as default ) - if clang -v 2>&1 | grep -q "3.8" ; then - CC=clang - CXX=clang++ - elif [ -f /usr/local/bin/clang37 ]; then - CC=clang37 - CXX=clang++37 - else - echo "Need a better compiler" - exit 1 - fi - CWARN="" - CLANGWARN="-Wno-unused-function -Wno-unused-local-typedef -Wno-inconsistent-missing-override" - CLANGWARN="$CLANGWARN -Wno-unused-private-field" - CLANGWARN="$CLANGWARN -Wno-varargs" - CLANGWARN="$CLANGWARN -Wno-gnu-designator" - -# "-Wno-unused-local-typedef -Wno-mismatched-tags -Wno-macro-redefined -Wno-unused-function -Wno-unused-label -Wno-undefined-bool-conversion -Wno-unused-private-field -Wno-unused-local-typedef -Wno-uninitialized -Wno-gnu-designator -Wno-inconsistent-missing-override -Wno-deprecated-declarations -Wno-parentheses" - - CFLAGS="-g -I/usr/local/include ${CWARN} ${CLANGWARN}" - CXXFLAGS="-g -DGTEST_USE_OWN_TR1_TUPLE=1 -I/usr/local/include ${CWARN} ${CLANGWARN}" - LDFLAGS="-g ${LDFLAGS} -L/usr/local/lib -export-dynamic -luuid" - FREEBSD_CONFIGURE_FLAGS=" - --disable-silent-rules - --disable-gitversion - --with-debug - --with-rados - --without-rbd - --with-radosgw - --with-radosstriper - --with-mon - --with-osd - --with-mds - --with-radosgw - --with-nss - --without-tcmalloc - --without-libaio - --without-libxfs - --without-fuse - --without-lttng - --with-libzfs=no - --without-rocksdb - --without-cephfs - " -# --without-radosgw -# --with-gnu-ld -fi - -CONFIGURE_FLAGS="${FREEBSD_CONFIGURE_FLAGS}" - -# Export these so that ./configure will pick up -export MAKE -export CC -export CXX -export CFLAGS -export CXXFLAGS -export CONFIGURE_FLAGS -export LDFLAGS diff --git a/ceph.spec.in b/ceph.spec.in index 9f952412be491..a6ab6eabbf202 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1246,7 +1246,6 @@ fi %files resource-agents %defattr(0755,root,root,-) -# N.B. src/ocf/Makefile.am uses $(prefix)/lib %dir %{_prefix}/lib/ocf %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d/ceph diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 1913c8f5e0d61..0000000000000 --- a/configure.ac +++ /dev/null @@ -1,1426 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -# Autoconf -AC_PREREQ(2.59) - -# NOTE: This version is _only_ used for naming the tarball. The -# VERSION define is not used by the code. It gets a version string -# from 'git describe'; see src/ceph_ver.[ch] - -AC_INIT([ceph], [11.0.0], [ceph-devel@vger.kernel.org]) - -AX_CXX_COMPILE_STDCXX_11(, mandatory) - -# Create release string. Used with VERSION for RPMs. -RPM_RELEASE=0 -AC_SUBST(RPM_RELEASE) -if test -d ".git" ; then - AC_CHECK_PROG(GIT_CHECK, git, yes) - if test x"$GIT_CHECK" = x"yes" -a x"$freebsd" != x"yes"; then - RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; else echo "0"; fi` - fi -fi -AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE']) - -AC_ARG_WITH([man-pages], - [AS_HELP_STRING([--with-man-pages], [build man pages])], - [], - [with_man_pages=check]) -AS_IF([test "x$with_man_pages" != "xno"], - [AC_CHECK_PROGS(SPHINX_BUILD, sphinx-1.0-build sphinx-build) - AS_IF([test -z "$SPHINX_BUILD" && \ - test "x$with_man_pages" = "xyes"], - [AC_MSG_ERROR([sphinx-build not found (python-sphinx)])])]) -AM_CONDITIONAL(WITH_MAN_PAGES, test -n "$SPHINX_BUILD") - -AC_CONFIG_MACRO_DIR([m4]) - -AC_CONFIG_SUBDIRS([src/googletest/googlemock]) - -# Environment -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - -# Fix automake problems in 1.12 -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - -# Automake -AM_PROG_CC_C_O -LT_INIT([disable-static]) -AM_PROG_AS - - -AM_INIT_AUTOMAKE([foreign parallel-tests tar-ustar]) -# enable make V=0 (if automake >1.11) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -# Platform -case "${target_os}" in -darwin*) - AC_DEFINE([DARWIN], [1], [Define if darwin/osx]) - darwin="yes" - ;; -linux*) - linux="yes" - CFLAGS="-D_LARGEFILE64_SOURCE ${CFLAGS}" - ;; -freebsd*) - freebsd="yes" - ;; -solaris*) - solaris="yes" - ;; -aix*) - aix="yes" - ;; -esac -AM_CONDITIONAL(LINUX, test x"$linux" = x"yes") -AM_CONDITIONAL(FREEBSD, test x"$freebsd" = x"yes") -AM_CONDITIONAL(DARWIN, test x"$darwin" = x"yes") -AM_CONDITIONAL(SOLARIS, test x"$solaris" = x"yes") -AM_CONDITIONAL(AIX, test x"$aix" = x"yes") - -# Platform -case "${host_cpu}" in -i?86|x86_64) - intel="yes" - ;; -esac -AM_CONDITIONAL(INTEL, test x"$intel" = x"yes") - -# Checks for programs. -AC_PROG_CXX -if test "$CXX" = no || test "$CXX:$GXX" = "g++:"; then - AC_MSG_ERROR([no C++ compiler found]) -fi - -AC_MSG_CHECKING([if compiler is clang]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ -#ifndef __clang__ -#error "Not Clang" -#endif -return 0; -]])], -[CLANG=yes], [CLANG=no]) -AC_MSG_RESULT([$CLANG]) -AM_CONDITIONAL(CLANG, test "$CLANG" = "yes") - -#AC_PROG_CC -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL - -# Compiler flags - -AC_SUBST(AM_CXXFLAGS) -AM_CXXFLAGS="${AM_CXXFLAGS}" - -# Find out what to build (default is most of these) - -# rados? -AC_ARG_WITH([rados], - [AS_HELP_STRING([--with-rados], [build with librados support])], - [], - [with_rados=yes]) -AM_CONDITIONAL(WITH_RADOS, test "$with_rados" = "yes") -#AS_IF([test "$with_rados" = "yes"], [AC_DEFINE([WITH_RADOS])]) - -# rbd? -# rbd requires rados -AC_ARG_WITH([rbd], - [AS_HELP_STRING([--with-rbd], [build rbd files])], - [], - [with_rbd=yes]) -AM_CONDITIONAL(WITH_RBD, test "$with_rbd" = "yes") -#AS_IF([test "$with_rbd" = "yes"], [AC_DEFINE([WITH_RADOS, WITH_RBD])]) - -AC_ARG_WITH([cython], - [AS_HELP_STRING([--with-cython], [build python bindings for libraries])], - [], - [with_cython=yes]) -AM_CONDITIONAL(WITH_CYTHON, test "$with_cython" = "yes") - -# cephfs? -# cephfs requires rados -AC_ARG_WITH([cephfs], - [AS_HELP_STRING([--with-cephfs], [build cephfs files])], - [], - [with_cephfs=yes]) -AM_CONDITIONAL(WITH_CEPHFS, test "$with_cephfs" = "yes") -#AS_IF([test "$with_cephfs" = "yes"], [AC_DEFINE([WITH_RADOS, WITH_CEPHFS])]) - -# radosgw? -# radosgw requires rados -AC_ARG_WITH([radosgw], - [AS_HELP_STRING([--with-radosgw], [build RADOS gateway])], - [], - [with_radosgw=check]) -# AM_CONDITIONAL is defined later -- we need to check whether we can enable radosgw if no option is present -#AS_IF([test "$with_radosgw" = "yes"], [AC_DEFINE([WITH_RADOS, WITH_RADOSGW])]) - -AC_ARG_WITH([selinux], - [AS_HELP_STRING([--with-selinux], [build SELinux policy])], - [], - [with_selinux=no]) -AM_CONDITIONAL(WITH_SELINUX, test "$with_selinux" = "yes") -if test "x$with_selinux" = x"yes"; then - AC_CHECK_FILE([/usr/share/selinux/devel/policyhelp], [true], [AC_MSG_FAILURE([No SELinux found])]) - AC_CHECK_FILE([/usr/share/selinux/devel/include/Makefile], [true], [AC_MSG_FAILURE([No SELinux Makefile found])]) -fi - -# radosstriper? -AC_ARG_WITH([radosstriper], - [AS_HELP_STRING([--with-radosstriper], [build radosstriper files])], - [], - [with_radosstriper=yes]) -AM_CONDITIONAL(WITH_RADOSSTRIPER, test "$with_radosstriper" = "yes") -#AS_IF([test "$with_radostriper" = "yes"], [AC_DEFINE([WITH_RADOS, WITH_RADOSSTRIPER])]) - -# mon? -AC_ARG_WITH([mon], - [AS_HELP_STRING([--with-mon], [build Ceph monitor software files])], - [], - [with_mon=yes]) -AM_CONDITIONAL(WITH_MON, test "$with_mon" = "yes") -#AS_IF([test "$with_mon" = "yes"], [AC_DEFINE([WITH_MON])]) - -# osd? -AC_ARG_WITH([osd], - [AS_HELP_STRING([--with-osd], [build object store daemon files])], - [], - [with_osd=yes]) -AM_CONDITIONAL(WITH_OSD, test "$with_osd" = "yes") -#AS_IF([test "$with_osd" = "yes"], [AC_DEFINE([WITH_OSD])]) - -# mds? -AC_ARG_WITH([mds], - [AS_HELP_STRING([--with-mds], [build mds files])], - [], - [with_mds=yes]) -AM_CONDITIONAL(WITH_MDS, test "$with_mds" = "yes") -#AS_IF([test "$with_mds" = "yes"], [AC_DEFINE([WITH_MDS])]) - -# client? -AC_ARG_ENABLE([client], - [AS_HELP_STRING([--enable-client], [enable client-side build])], - [], - [enable_client=yes]) -AM_CONDITIONAL([ENABLE_CLIENT], test "$enable_client" = "yes") -#AS_IF([test "$enable_client" = "yes"], [AC_DEFINE([WITH_RADOS, WITH_RBD, ENABLE_CLIENT])]) - -# server? -AC_ARG_ENABLE([server], - [AS_HELP_STRING([--enable-server], [enable server-side build ])], - [], - [enable_server=yes]) -AM_CONDITIONAL(ENABLE_SERVER, test "$enable_server" = "yes") -#AS_IF([test "$enable_server" = "yes"], [AC_DEFINE([WITH_MON, WITH_OSD, WITH_MDS, ENABLE_SERVER])]) - -# subscription manager? -AC_ARG_ENABLE([subman], - [AS_HELP_STRING([--enable-subman], [enable subman])], - [], - [enable_subman=no]) -AM_CONDITIONAL([ENABLE_SUBMAN], test "x$enable_subman" != "xno") - -# cython is required to build python bindings for libraries -if test x"$with_cython" = xyes; then - AC_CHECK_PROG(CYTHON_CHECK, cython, yes) - if test x"$CYTHON_CHECK" != xyes; then - AC_MSG_FAILURE([cython not found]) - fi - - # Check if we are running inside a Python virtual environment - # Both `virtualenv' as well as PEP 405 `pyvenv' set the VIRTUAL_ENV - # environment variable upon activation - if test x"$VIRTUAL_ENV" != x; then - PYTHON="python" - fi - - # Set PYTHON to default system Python version if not specified - if test x"$PYTHON" = x; then - PYTHON="python" - fi - - AC_CHECK_PROG(PYTHON_CONFIG_CHECK, "$PYTHON"-config, yes) - if test x"$PYTHON_CONFIG_CHECK" != xyes; then - AC_MSG_FAILURE(["$PYTHON"-config not found]) - fi - - PYTHON_CFLAGS=`"$PYTHON"-config --cflags` - AC_SUBST(PYTHON_CFLAGS) - PYTHON_LDFLAGS=`"$PYTHON"-config --ldflags` - AC_SUBST(PYTHON_LDFLAGS) -fi - -# cond-check if snappy-devel is installed, needed by leveldb that is need by server parts of the project -AS_IF([test "$enable_server" = "yes" -a \( "$with_osd" = "yes" -o "$with_mon" = "yes" \)], - [AC_CHECK_LIB([snappy], [snappy_compress], [true], [AC_MSG_FAILURE([libsnappy not found])])]) - -# cond-check leveldb, necessary if server, osd or mon enabled -AS_IF([test "$enable_server" = "yes" -a \( "$with_osd" = "yes" -o "$with_mon" = "yes" \)], - [AC_CHECK_LIB([leveldb], [leveldb_open], [true], [AC_MSG_FAILURE([libleveldb not found])], [-lsnappy -lpthread])]) - -# Check for yasm -AC_CHECK_PROG(YASM_CHECK, yasm, yes) -if test x"$YASM_CHECK" = x"yes"; then - if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then - echo 'we have a modern and working yasm' - if test x`uname -m`x = x"x86_64"x || test x`uname -m`x = x"amd64"x; then - echo 'we are x86_64' - arch_x32=0 - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ - #if defined(__x86_64__) && defined(__ILP32__) - #error x32 - #endif]])], [], [arch_x32=1]) - if test $arch_x32 -eq 0 ; then - echo 'we are not x32' - AC_DEFINE([HAVE_GOOD_YASM_ELF64], [1], [we have a recent yasm and are x86_64]) - with_good_yasm=yes - - if yasm -f elf64 -i src/erasure-code/isa/isa-l/include/ src/erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s -o /dev/null 2> /dev/null ; then - echo 'yasm can also build the isa-l stuff' - AC_DEFINE([HAVE_BETTER_YASM_ELF64], [1], [yasm can also build the isa-l]) - with_better_yasm=yes - else - echo "yasm doesn't build the isa-l stuff" - fi - else - echo 'we are x32; no yasm for you' - fi - else - echo 'we are not x86_64 && !x32' - fi - else - echo 'we do not have a modern/working yasm' - fi -fi -AM_CONDITIONAL(WITH_GOOD_YASM_ELF64, test "$with_good_yasm" = "yes") -AM_CONDITIONAL(WITH_BETTER_YASM_ELF64, test "$with_better_yasm" = "yes") - -# check for better yasm - -# Checks for compiler warning types - -# AC_CHECK_CC_FLAG(FLAG_TO_TEST, VARIABLE_TO_SET_IF_SUPPORTED) -# --------- -AC_DEFUN([AC_CHECK_CC_FLAG], -[{ - AC_LANG_PUSH([C]) - my_cflags_save="$CFLAGS" - CFLAGS="$my_cflags_save $1" - AC_MSG_CHECKING([whether $CC accepts $1]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ]])], - [AC_MSG_RESULT([yes]); AC_SUBST([$2], ["$1"])], - [AC_MSG_RESULT([no])] - ) - CFLAGS="$my_cflags_save" - AC_LANG_POP([C]) -}]) - -AC_CHECK_CC_FLAG([-Wtype-limits], [WARN_TYPE_LIMITS]) -AC_CHECK_CC_FLAG([-Wignored-qualifiers], [WARN_IGNORED_QUALIFIERS]) -AC_CHECK_CC_FLAG([-Werror=format-security], [WARN_ERROR_FORMAT_SECURITY]) - -AC_CHECK_CC_FLAG([-rdynamic], [RDYNAMIC_FLAG]) - -# Check for compiler VTA support -AX_CHECK_COMPILE_FLAG([-fvar-tracking-assignments], [HAS_VTA_SUPPORT=1], [HAS_VTA_SUPPORT=0]) -AM_CONDITIONAL(COMPILER_HAS_VTA, [test "$HAS_VTA_SUPPORT" = 1]) - -AX_CXX_STATIC_CAST -AX_C_VAR_FUNC -AX_C_PRETTY_FUNC - -# Checks for libraries. -ACX_PTHREAD - - -#Linux only dependencies -if test x"$linux" = x"yes"; then - - # rbd {map,unmap,showmapped} dependencies, Linux only - if test x"$with_rbd" = x"yes"; then - - # libblkid - AC_CHECK_HEADER([blkid/blkid.h], [], - AC_MSG_ERROR([blkid/blkid.h not found (libblkid-dev, libblkid-devel)])) - AC_CHECK_LIB([blkid], [blkid_get_cache], [true], - AC_MSG_FAILURE([libblkid not found])) - AC_CHECK_LIB([blkid], [blkid_find_dev_with_tag], [true], - AC_MSG_FAILURE([libblkid not found])) - AC_CHECK_LIB([blkid], [blkid_dev_devname], [true], - AC_MSG_FAILURE([libblkid not found])) - AC_CHECK_LIB([blkid], [blkid_devno_to_wholedisk], [true], - AC_MSG_FAILURE([libblkid not found])) - - # libudev - AC_CHECK_HEADER([libudev.h], [], - AC_MSG_ERROR([libudev.h not found (libudev-dev, libudev-devel)])) - AC_CHECK_LIB([udev], [udev_monitor_receive_device], [true], - AC_MSG_FAILURE([libudev not found])) - - # libexpat - AC_CHECK_HEADER([expat.h], [], - AC_MSG_ERROR([expat.h not found (libexpat-devel)])) - AC_CHECK_LIB([expat], [XML_Parse], [true], - AC_MSG_FAILURE([libexpat not found])) - fi -fi - -# -# Check for res_nquery or res_query in libresolv. There are several variations. On OSX -# res_nquery is a macro defined in resolv.h, so the typical AC_CHECK_LIB -# doesn't work. On FreeBSD res_nquery can be found in libc. On Alpine res_query can be -# found in libc. The required library for linking (if any) is defined RESOLV_LIBS. -# -AC_CHECK_HEADER([resolv.h], [], [], [#include ]) - -AC_DEFUN([CHECK_RESOLV_LIBS], [{ - AC_MSG_CHECKING([if $1 will link (LIBS=$3)]) - saved_LIBS="${LIBS}" - LIBS="$3" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]], [[$1$2;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE(AS_TR_CPP([HAVE_$1]), 1, [Define if you have $1]) - [$4]], - AC_MSG_RESULT([no])) - LIBS="${saved_LIBS}" -}]) - -RESOLV_LIBS="" -CHECK_RESOLV_LIBS([res_nquery], [(0, 0, 0, 0, 0, 0)], [$RESOLV_LIBS], [resolv_libs="ok"]) -if test x"$resolv_libs" != "xok"; then - RESOLV_LIBS="-lresolv" - CHECK_RESOLV_LIBS([res_nquery], [(0, 0, 0, 0, 0, 0)], [$RESOLV_LIBS], [resolv_libs="ok"]) - if test x"$resolv_libs" != "xok"; then - RESOLV_LIBS="" - CHECK_RESOLV_LIBS([res_query], [(0, 0, 0, 0, 0)], [$RESOLV_LIBS], [resolv_libs="ok"]) - if test x"$resolv_libs" != "xok"; then - AC_MSG_FAILURE([no resolv library found]) - fi - fi -fi -AC_SUBST([RESOLV_LIBS]) - -dnl check for libkeyutils on linux -KEYUTILS_LIB="" -AS_IF([test x"$linux" = x"yes"], [ - AC_CHECK_LIB([keyutils], [add_key], [KEYUTILS_LIB="-lkeyutils"], [ - AC_MSG_FAILURE([libkeyutils not found (libkeyutils-dev, keyutils-libs-devel)])])]) -AC_SUBST(KEYUTILS_LIB) - -AC_CHECK_LIB([m], [pow], [true], AC_MSG_FAILURE([libm not found])) -AC_CHECK_FUNCS([syncfs], AC_DEFINE([HAVE_SYS_SYNCFS], [1], [we have syncfs]), []) - -# Find some crypto library for us to use, while letting user to decide which one to use. -AC_ARG_WITH([nss], - [AS_HELP_STRING([--with-nss], [Use cryptographic functions from nss])], - [], - [with_nss=check]) -have_nss=no -AS_IF([test "x$with_nss" != "xno"], - [PKG_CHECK_MODULES([NSS], [nss], [have_nss=yes], [true])]) -# bail out if given explicit --with-nss -if test "x$have_nss" = "xno" -a "x$with_nss" != "xcheck" -a "x$with_nss" != "xno"; then - AC_MSG_FAILURE([--with-nss was given, but library was not found]) -fi - -if test "x$have_nss" = "xno"; then - AC_ARG_WITH([cryptopp], - [AS_HELP_STRING([--with-cryptopp], [Use cryptographic functions from cryptopp])], - [], - [with_cryptopp=check]) - - have_cryptopp=no - # this looks clumsy but it's just if A then { success } else { if B then success } - AS_IF([test "x$with_cryptopp" != "xno"], - [PKG_CHECK_MODULES([CRYPTOPP], - [libcrypto++], - [have_cryptopp=yes], - [ - AC_LANG_PUSH([C++]) - SAVED_CXXFLAGS="${CXXFLAGS}" - SAVED_LIBS="${LIBS}" - LIBS="${LIBS} ${PTHREAD_LIBS}" - CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" - AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp], - [have_cryptopp=yes], - [true], []) - CRYPTOPP_LIBS="${ac_cv_search__ZTIN8CryptoPP14CBC_EncryptionE}" - LIBS="${SAVED_LIBS}" - CXXFLAGS="${SAVED_CXXFLAGS}" - AC_LANG_POP([C++]) - ])]) - # bail out if given explicit --with-cryptopp - if test "x$have_cryptopp" = "xno" -a "x$with_cryptopp" != "xcheck" -a "x$with_cryptopp" != "xno"; then - AC_MSG_FAILURE([--with-cryptopp was given, but library was not found]) - fi -fi - -# now decide which crypto library to use -if test "x$have_nss" = "xyes"; then - AC_MSG_NOTICE([using nss for cryptography]) - AC_DEFINE([USE_NSS], [1], [Define if using NSS.]) - AC_SUBST([CRYPTO_CFLAGS], [$NSS_CFLAGS]) - # this needs CFLAGS too in practise to get the includes right. ugly. - #AC_SUBST([CRYPTO_CXXFLAGS], [$NSS_CFLAGS $NSS_CXXFLAGS]) - AM_CXXFLAGS="${AM_CXXFLAGS} ${NSS_CFLAGS} ${NSS_CXXFLAGS}" - AC_SUBST([CRYPTO_LIBS], [$NSS_LIBS]) - AC_SUBST([SSL_LIBS], [$NSS_LIBS]) -elif test "x$have_cryptopp" = "xyes"; then - AC_MSG_NOTICE([using cryptopp for cryptography]) - AC_DEFINE([USE_CRYPTOPP], [1], [Define if using CryptoPP.]) - AC_SUBST([CRYPTO_CFLAGS], [$CRYPTOPP_CFLAGS]) - #AC_SUBST([CRYPTO_CXXFLAGS], [$CRYPTOPP_CXXFLAGS]) - AM_CXXFLAGS="${AM_CXXFLAGS} ${CRYPTOPP_CXXFLAGS}" - AC_SUBST([CRYPTO_LIBS], [$CRYPTOPP_LIBS]) - # OpenSSL -- defines OPENSSL_{INCLUDES,LIBS,LDFLAGS} on success - AX_CHECK_OPENSSL([], - [AC_MSG_FAILURE([CryptoPP build selected but OpenSSL not found])]) - AC_SUBST([SSL_INCLUDES], [$OPENSSL_INCLUDES]) - AC_SUBST([SSL_LIBS], [$OPENSSL_LIBS]) -else - AC_MSG_FAILURE([no suitable crypto library found]) -fi - -AC_ARG_ENABLE(gitversion, - [AC_HELP_STRING([--enable-gitversion], [build Ceph with git version string])], - [], [enable_gitversion=yes]) - -AM_CONDITIONAL(NO_GIT_VERSION, [test "x$enable_gitversion" = "xno"]) - -# profiler? -AC_ARG_WITH([profiler], - [AS_HELP_STRING([--with-profiler], [build extra profiler binaries])], - [case "${withval}" in - yes) with_profiler=yes ;; - no) with_profiler=no ;; - *) AC_MSG_ERROR([bad value ${withval} for --with-profiler]) ;; - esac], - [with_profiler=no]) -AS_IF([test "x$with_profiler" = xyes], - [AC_CHECK_LIB([profiler], [ProfilerFlush], [], - [AC_MSG_FAILURE([--with-profiler was given but libprofiler (libgoogle-perftools-dev on debian) not found])]) - ], - []) -AM_CONDITIONAL(WITH_PROFILER, test "$with_profiler" = "yes") -AS_IF([test "$with_profiler" = "yes"], - [AC_DEFINE([HAVE_PROFILER], [1], [Define if you have perftools profiler enabled])], - []) - -# debug crap? -AC_ARG_WITH([debug], - [AS_HELP_STRING([--with-debug], [build extra debug binaries and tests])], - [case "${withval}" in - yes) with_debug=yes ;; - no) with_debug=no ;; - *) AC_MSG_ERROR([bad value ${withval} for --with-debug]) ;; - esac], - [with_debug=no]) -AM_CONDITIONAL(WITH_DEBUG, test "$with_debug" = "yes") - -AC_DEFINE([DEBUG_GATHER], [1], [Define if you want C_Gather debugging]) - -# code coverage? -AC_ARG_ENABLE([coverage], - [AS_HELP_STRING([--enable-coverage], [enable code coverage tracking])], - [], - [enable_coverage=no]) -AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_coverage" != xno) -if test "x$enable_coverage" != xno; then - AC_DEFINE([ENABLE_COVERAGE], [1], [Define if enabling coverage.]) -fi -AC_SUBST(GCOV_PREFIX_STRIP, `echo $(pwd)/src | tr -dc / | wc -c`) - -# is radosgw available? -RADOSGW=0 -AS_IF([test "x$with_radosgw" != xno], - [AC_CHECK_LIB([fcgi], [FCGX_Init], - [AC_CHECK_LIB([expat], [XML_Parse], - [AC_CHECK_LIB([curl], [curl_easy_init], - [RADOSGW=1 - AC_CHECK_HEADER([fastcgi/fcgiapp.h], - [RGW_CXXFLAGS="-I/usr/include/fastcgi"]) - ], - [if test "x$with_radosgw" != "xcheck"; then - AC_MSG_FAILURE([--with-radosgw was given but libcurl (libcurl-dev on debian) not found]) - fi]) - ], - [if test "x$with_radosgw" != "xcheck"; then - AC_MSG_FAILURE([--with-radosgw was given but libexpat (libexpat1-dev on debian) not found]) - fi]) - ], - [if test "x$with_radosgw" != "xcheck"; then - AC_MSG_FAILURE([--with-radosgw was given but libfcgi (libfcgi-dev on debian) not found]) - fi])]) -AC_SUBST(RGW_CXXFLAGS) -AM_CONDITIONAL(WITH_RADOSGW, test "$RADOSGW" = "1") - -AS_IF([test "$RADOSGW" = "1"], [AC_DEFINE([WITH_RADOSGW], [1], [define if radosgw enabled])]) - -AS_IF([test "$RADOSGW" = "1"], - [AC_CHECK_LIB([curl], [curl_multi_wait], - AC_DEFINE([HAVE_CURL_MULTI_WAIT], [1], [Define if have curl_multi_wait()])) - ]) - -# fuse? -AC_ARG_WITH([fuse], - [AS_HELP_STRING([--without-fuse], [disable FUSE userspace client])], - [], - [with_fuse=yes]) -LIBFUSE= -AS_IF([test "x$with_fuse" != xno], [ - PKG_CHECK_MODULES([LIBFUSE], [fuse], - [HAVE_LIBFUSE=1 - AC_DEFINE([HAVE_LIBFUSE], [1], [Define if you have fuse])], - [AC_MSG_FAILURE([no FUSE found (use --without-fuse to disable)])]) -]) -AM_CONDITIONAL(WITH_FUSE, [test "$HAVE_LIBFUSE" = "1"]) - -# jemalloc? -AC_ARG_WITH([jemalloc], - [AS_HELP_STRING([--with-jemalloc], [enable jemalloc for memory allocations])], - [], - [with_jemalloc=no]) -JEMALLOC= -AS_IF([test "x$with_jemalloc" = xyes], - [AC_CHECK_LIB([jemalloc], [malloc], - [AC_SUBST([LIBJEMALLOC], ["-ljemalloc"]) - AC_DEFINE([HAVE_LIBJEMALLOC], [1], - [Define if you have jemalloc]) - HAVE_LIBJEMALLOC=1 - ], - [AC_MSG_FAILURE( - [no jemalloc found (do not use --with-jemalloc)])])]) -AM_CONDITIONAL(WITH_JEMALLOC, [test "$HAVE_LIBJEMALLOC" = "1"]) - -# tcmalloc-minimal? -AC_ARG_WITH([tcmalloc-minimal], - [AS_HELP_STRING([--with-tcmalloc-minimal], [enable minimal tcmalloc support for memory allocations])], - [], - [with_tcmalloc_minimal=no]) - -AS_IF([test "x$with_jemalloc" = "xyes"],[with_tcmalloc_minimal=no],[]) - -TCMALLOC_MINIMAL= -AS_IF([test "x$with_tcmalloc_minimal" != xno], - [AC_CHECK_LIB([tcmalloc_minimal], [malloc], - [AC_SUBST([LIBTCMALLOC], ["-ltcmalloc_minimal"]) - AC_DEFINE([HAVE_LIBTCMALLOC_MINIMAL], [1], - [Define if you have tcmalloc]) - HAVE_LIBTCMALLOC_MINIMAL=1 - ], - [AC_MSG_FAILURE( - [no tcmalloc found (do not use --with-tcmalloc-minimal)])])]) -AM_CONDITIONAL(WITH_TCMALLOC_MINIMAL, [test "$HAVE_LIBTCMALLOC_MINIMAL" = "1"]) - -# tcmalloc? -AC_ARG_WITH([tcmalloc], - [AS_HELP_STRING([--without-tcmalloc], [disable tcmalloc for memory allocations])], - [], - [with_tcmalloc=yes]) - -AS_IF([test "x$with_jemalloc" = "xyes"],[with_tcmalloc=no],[]) -AS_IF([test "x$with_tcmalloc_minimal" = "xyes"],[with_tcmalloc=no],[]) - -TCMALLOC= -AS_IF([test "x$with_tcmalloc" != xno], - [AC_CHECK_LIB([tcmalloc], [malloc], - [AC_SUBST([LIBTCMALLOC], ["-ltcmalloc"]) - AC_DEFINE([HAVE_LIBTCMALLOC], [1], - [Define if you have tcmalloc]) - HAVE_LIBTCMALLOC=1 - ], - [AC_MSG_FAILURE( - [no tcmalloc found (use --without-tcmalloc to disable)])])]) -AM_CONDITIONAL(WITH_TCMALLOC, [test "$HAVE_LIBTCMALLOC" = "1"]) - -AS_IF([test "$with_profiler" = yes -o \ - "$HAVE_LIBTCMALLOC" = "1" -o \ - "$HAVE_LIBTCMALLOC_MINIMAL" = "1"], - [AC_LANG_PUSH([C++]) - AC_CHECK_HEADERS([gperftools/heap-profiler.h \ - gperftools/malloc_extension.h \ - gperftools/profiler.h], [], - [AC_MSG_FAILURE([gperftools headers not found (use --without-profiler or disable tcmalloc)])]) - AC_LANG_POP([C++])]) - -# error out if --with-jemalloc and ! --without-tcmalloc -if test "x$with_jemalloc" = "xyes"; then - if test "x$with_tcmalloc" != "xno"; then - AC_MSG_FAILURE([--with-jemalloc called without --without-tcmalloc]) - fi -fi - -#set pg ref debugging? -AC_ARG_ENABLE([pgrefdebugging], - [AS_HELP_STRING([--enable-pgrefdebugging], [enable pg ref debugging])], - [], [enable_pgrefdebugging=no]) -AS_IF([test "x$enable_pgrefdebugging" = "xyes"], - [AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])], - []) - -# -# Java is painful -# - adapted from OMPI wrappers package -# - this might become bigger. maybe should be own m4 file -# -AC_ARG_ENABLE(cephfs-java, - [AC_HELP_STRING([--enable-cephfs-java], [build libcephfs Java bindings])], - [], [enable_cephfs_java=no]) - -AM_CONDITIONAL(ENABLE_CEPHFS_JAVA, [test "x$enable_cephfs_java" = "xyes"]) - -AC_ARG_WITH(jdk-dir, - AC_HELP_STRING([--with-jdk-dir(=DIR)], [Path to JDK directory])) - -if test "x$enable_cephfs_java" = "xyes"; then - - # setup bin/include dirs from --with-jdk-dir (search for jni.h, javac) - AS_IF([test -n "$with_jdk_dir"], [ - javac_prog=`find $with_jdk_dir/ -name javac | head -n 1` - AS_IF([test -x "$javac_prog"], [ - EXTRA_JDK_BIN_DIR=`dirname $javac_prog`]) - jnih=`find $with_jdk_dir/ -name jni.h | head -n 1` - AS_IF([test -r "$jnih"], [ - EXTRA_JDK_INC_DIR=`dirname $jnih`])]) - - # setup defaults for Debian default-jdk package (without --with-jdk-dir) - AS_IF([test -z "$with_jdk_dir"], [ - # This works with Debian's and CentOS' default-jdk package - for dir in '/usr/lib/jvm/default-java/' '/usr/lib/jvm/java/' '/usr/lib/jvm/java-gcj/'; do - # only test if a suitable path has not yet been found - AS_IF([test "$EXTRA_JDK_BIN_DIR" == ""], [ - AS_IF([test -x "$javac_prog"], [ - EXTRA_JDK_BIN_DIR=`dirname $javac_prog`]) - jnih=`find $dir -name jni.h | head -n 1` - AS_IF([test -r "$jnih"], [ - EXTRA_JDK_INC_DIR=`dirname $jnih`]) - ]) - done - ]) - - # cephfs_java_test only makes sense if java is already turned on - # setup CLASSPATH for Debian default junit4.jar package - # - # Configuring --with-debug and --enable-cephfs-java will throw an error if - # JUnit4 cannot be found. While currently this works for users who have - # installed via the package manager on Ubuntu, we need to expand this - # check to 1 support other distrubtions and 2 allow users to influence - # the search path. - AS_IF([test "x$with_debug" = "xyes"], [ - dir='/usr/share/java' - junit4_jar=`( find $dir -name junit4.jar;find $dir -name junit.jar ) | head -n 1` - AS_IF([test -r "$junit4_jar"], [ - EXTRA_CLASSPATH_JAR="$junit4_jar" - AC_SUBST(EXTRA_CLASSPATH_JAR) - [have_junit4=1]], [ - AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)]) - [have_junit4=0]])]) - - AC_CHECK_CLASSPATH - AC_PROG_JAVAC - AC_PROG_JAVAH - AC_PROG_JAR - - CLASSPATH=$CLASSPATH:$EXTRA_CLASSPATH_JAR - export CLASSPATH - AC_MSG_NOTICE([classpath - $CLASSPATH]) - - # Check for jni.h - CPPFLAGS_save=$CPPFLAGS - - AS_IF([test -n "$EXTRA_JDK_INC_DIR"], - [JDK_CPPFLAGS="-I$EXTRA_JDK_INC_DIR" - AS_IF([test -d "$EXTRA_JDK_INC_DIR/linux"], - [JDK_CPPFLAGS="$JDK_CPPFLAGS -I$EXTRA_JDK_INC_DIR/linux"]) - CPPFLAGS="$CPPFLAGS $JDK_CPPFLAGS"]) - - AC_CHECK_HEADER([jni.h], [], AC_MSG_ERROR([Cannot find header 'jni.h'. Try setting --with-jdk-dir])) - - CPPFLAGS=$CPPFLAGS_save - - # Setup output var - AC_SUBST(JDK_CPPFLAGS) -fi -AM_CONDITIONAL(HAVE_JUNIT4, [test "$have_junit4" = "1"]) - -# -# Accelio and OFED -# -AC_ARG_ENABLE(xio, - [AC_HELP_STRING([--enable-xio], [build Ceph Accelio transport])], - [], [enable_xio=no]) - -AM_CONDITIONAL(ENABLE_XIO, [test "x$enable_xio" = "xyes"]) - -if test "x$enable_xio" = x"yes"; then - AC_CHECK_HEADER([libxio.h], [], AC_MSG_ERROR([Cannot find header 'libxio.h'.])) - AC_CHECK_LIB([xio], [xio_init], [], AC_MSG_FAILURE([Accelio libxio not found])) - - # Also require boost-regex, used in address_helper - AC_CHECK_LIB(boost_regex, main, [], - AC_MSG_FAILURE(["Boost regex library not found."])) - - AC_DEFINE([HAVE_XIO], [1], [Accelio conditional compilation]) - - XIO_LIBS="-lxio" - AC_SUBST(XIO_LIBS) -fi - -# -# SPDK -# -AC_ARG_WITH(spdk, - [AC_HELP_STRING([--with-spdk], [build Ceph SPDK Support])], [], [with_spdk=no]) - -AM_CONDITIONAL(WITH_SPDK, [test "x$with_spdk" != "xno"]) - -if test "x$with_spdk" != x"no"; then - PKG_CHECK_MODULES([LIBPCIACCESS], [pciaccess]) - AC_CHECK_HEADER([dpdk/rte_config.h], [], - AC_MSG_ERROR([dpdk/rte_config.h not found (libdpdk-dev, libdpdk-devel)])) - AC_CHECK_LIB([rte_eal], [rte_eal_init], [true], - AC_MSG_FAILURE([DPDK rte_eal_init not found]), - [-lrte_mempool -lrte_ring -lpthread -ldl]) - AC_SUBST([LIBDPDK_CFLAGS], [-I/usr/include/dpdk]) - AC_SUBST([LIBDPDK_LIBS], ['-lrte_eal -lrte_mempool -lrte_ring -lpthread']) - AC_SUBST([LIBPCIACCESS_LIBS]) - AC_DEFINE([HAVE_SPDK], [1], [SPDK conditional compilation]) -fi - -#libatomic-ops? You want it! -AC_ARG_WITH([libatomic-ops], - [AS_HELP_STRING([--without-libatomic-ops], - [disable libatomic-ops for the atomic_t type])], - [], - [with_libatomic_ops=yes]) -AS_IF([test "x$with_libatomic_ops" != xno], - [AC_CHECK_HEADER([atomic_ops.h], - [HAVE_ATOMIC_OPS=1], - [AC_MSG_FAILURE( - [no libatomic-ops found (use --without-libatomic-ops to disable)]) - ])]) -AS_IF([test "$HAVE_ATOMIC_OPS" = "1"], - [ - AC_CHECK_SIZEOF(AO_t, [], [ - #include - ]) - ], - [AC_DEFINE([NO_ATOMIC_OPS], [1], [Defined if you do not have atomic_ops])]) - - -AM_CONDITIONAL(WITH_LIBATOMIC, [test "$HAVE_ATOMIC_OPS" = "1"]) - -# newsyn? requires mpi. -#AC_ARG_WITH([newsyn], -# [AS_HELP_STRING([--with-newsyn], [build newsyn target requires mpi])], -# [], -# [with_newsyn=no]) - -AC_ARG_WITH([ocf], - [AS_HELP_STRING([--with-ocf], [build OCF-compliant cluster resource agent])], - , - [with_ocf=no]) -AM_CONDITIONAL(WITH_OCF, [ test "$with_ocf" = "yes" ]) - -# cond-check snappy-devel and leveldb, necessary if server + osd or mon enabled -if test "$enable_server" = "yes" -a \( "$with_osd" = "yes" -o "$with_mon" = "yes" \); then - AC_CHECK_LIB([snappy], [snappy_compress], [true], [AC_MSG_FAILURE([libsnappy not found])]) - AC_CHECK_LIB([leveldb], [leveldb_open], [true], [AC_MSG_FAILURE([libleveldb not found])], [-lsnappy -lpthread]) - - # see if we can use bloom filters with leveldb - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER([leveldb/filter_policy.h], [AC_DEFINE([HAVE_LEVELDB_FILTER_POLICY], [1], [Defined if LevelDB supports bloom filters ])]) - AC_LANG_POP([C++]) -fi - -# Find supported SIMD / NEON / SSE extensions supported by the compiler -AX_ARM_FEATURES() -AM_CONDITIONAL(HAVE_NEON, [ test "x$ax_cv_support_neon_ext" = "xyes"]) -AM_CONDITIONAL(HAVE_ARMV8_CRC, [ test "x$ax_cv_support_crc_ext" = "xyes"]) -AX_INTEL_FEATURES() -AM_CONDITIONAL(HAVE_SSSE3, [ test "x$ax_cv_support_ssse3_ext" = "xyes"]) -AM_CONDITIONAL(HAVE_SSE4_PCLMUL, [ test "x$ax_cv_support_pclmuldq_ext" = "xyes"]) - -# kinetic osd backend? -AC_ARG_WITH([kinetic], - [AS_HELP_STRING([--with-kinetic], [build kinetic support])], - [], - [with_kinetic=no]) -# no pkg-config support yet -#AS_IF([test "x$with_kinetic" = "xyes"], -# [PKG_CHECK_MODULES([KINETIC], [kinetic_client], [], [true])]) -AS_IF([test "x$with_kinetic" = "xyes"], - [AC_DEFINE([HAVE_KINETIC], [1], [Defined if you have kinetic enabled])]) -AM_CONDITIONAL(WITH_KINETIC, [ test "$with_kinetic" = "yes" ]) - -# check for c++11 (but do not enable it) -old_cxxflags="$CXXFLAGS" -AX_CXX_COMPILE_STDCXX_11([], [optional]) -CXXFLAGS="$old_cxxflags" - -# use rocksdb -AC_ARG_WITH([librocksdb], - [AS_HELP_STRING([--with-librocksdb], [build rocksdb support])], - [], - [with_librocksdb=no]) -AS_IF([test "x$with_librocksdb" = "xyes"], - [PKG_CHECK_MODULES([LIBROCKSDB], [rocksdb], [], [true])]) -AS_IF([test "x$with_librocksdb" = "xyes"], - [AC_CHECK_LIB([rocksdb], [open], [], [AC_MSG_FAILURE([librocksdb not found])])]) -AM_CONDITIONAL(WITH_DLIBROCKSDB, [ test "$with_librocksdb" = "yes" ]) - -AC_ARG_WITH([librocksdb-static], - [AS_HELP_STRING([--with-librocksdb-static], [build rocksdb support])], - [], - [with_librocksdb_static=check]) -AS_IF([test "x$with_librocksdb_static" = "xcheck" -a "x$HAVE_CXX11" = "x1" ], - [with_librocksdb_static="yes"]) -AS_IF([test "x$with_librocksdb_static" = "xyes"], - [AC_DEFINE([HAVE_LIBROCKSDB], [1], [Defined if you have librocksdb enabled])]) -AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ]) -AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ]) - -# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same. -AS_IF([test "x$with_librocksdb_static" = "xyes"], [ - AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes]) - AC_CHECK_HEADER([lz4.h], [have_lz4=yes])]) -AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"]) -AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"]) - -# needs libcurl and libxml2 -if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then - AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found])) - AC_CHECK_LIB([xml2], [xmlParseChunk], [], AC_MSG_ERROR([libxml2 not found])) -fi - -# use libaio? -AC_ARG_WITH([libaio], - [AS_HELP_STRING([--without-libaio], [disable libaio use by journal])], - , - [with_libaio=yes]) -AS_IF([test "x$with_libaio" != xno], - [AC_CHECK_LIB([aio], [io_submit], [true], AC_MSG_FAILURE([libaio not found]))]) -AS_IF([test "x$with_libaio" != xno], - [AC_CHECK_HEADER([libaio.h])]) -AS_IF([test "$with_libaio" = "yes"], - [AC_DEFINE([HAVE_LIBAIO], [1], [Defined if you don't have atomic_ops])]) -AM_CONDITIONAL(WITH_LIBAIO, [ test "$with_libaio" = "yes" ]) - -# use libxfs? -AC_ARG_WITH([libxfs], - [AS_HELP_STRING([--without-libxfs], [disable libxfs use by FileStore])], - [], - [with_libxfs=yes]) -AS_IF([test "x$with_libxfs" != "xno"], [ - # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define - AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR( - [xfs/xfs.h not found (--without-libxfs to disable)])) - AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h]) - AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [ - #include - #ifdef XFS_XFLAG_EXTSIZE - yes_have_xfs_xflag_extsize - #endif - ], [ - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_LIBXFS], [1], [Define to 1 if you have libxfs]) - ], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([XFS_XFLAG_EXTSIZE not found (--without-libxfs to disable)]) - ]) -]) -AM_CONDITIONAL(WITH_LIBXFS, [test "x$with_libxfs" != "xno"]) - -# use libzfs -AC_ARG_WITH([libzfs], - [AS_HELP_STRING([--with-libzfs], [build ZFS support])], - , - [with_libzfs=no]) -AS_IF([test "x$with_libzfs" = xyes], - [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])]) -AS_IF([test "x$with_libzfs" = xyes], - [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])]) -AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ]) - -# Checks for header files. -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_SYS_WAIT - - -# spirit? -AC_LANG([C++]) - -AC_CHECK_HEADER([boost/spirit/include/classic_core.hpp], [], - [AC_CHECK_HEADER([boost/spirit.hpp], [use_bspirit_old_hdr=yes], - AC_MSG_FAILURE(["Can't find boost spirit headers"]))]) -AM_CONDITIONAL(USE_BOOST_SPIRIT_OLD_HDR, [test "$use_bspirit_old_hdr" = "yes"]) - -AC_CHECK_HEADER([boost/random/discrete_distribution.hpp], - [AC_DEFINE([HAVE_BOOST_RANDOM_DISCRETE_DISTRIBUTION], [], [have boost::random::discrete_distribution])], - []) - -AC_CHECK_HEADER([boost/asio/coroutine.hpp], - [AC_DEFINE([HAVE_BOOST_ASIO_COROUTINE], [], [have boost::asio::coroutine])], - []) -AC_CHECK_HEADER([boost/statechart/state.hpp], [], - AC_MSG_FAILURE(["Can't find boost statechart headers; need 1.34 or later"])) -AC_CHECK_HEADER([boost/regex.hpp], [], - AC_MSG_FAILURE(["Can't find boost regex headers"])) -AC_CHECK_HEADER([boost/program_options/option.hpp], [], - AC_MSG_FAILURE(["Can't find boost program_options headers"])) - -# If we have the boost system library installed, then we may want to link -# with it. -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB(boost_system-mt, main, [], - [AC_CHECK_LIB(boost_system, main, [], - AC_MSG_NOTICE(["Boost system library not found."]))]) -BOOST_SYSTEM_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(BOOST_SYSTEM_LIBS) - -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB(boost_iostreams-mt, main, [], - [AC_CHECK_LIB(boost_iostreams, main, [], - AC_MSG_FAILURE(["Boost iostreams library not found."]))]) -BOOST_IOSTREAMS_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(BOOST_IOSTREAMS_LIBS) - -# Find the right boost_thread library. -BOOST_THREAD_LIBS="" -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB(boost_thread-mt, main, [], - [AC_CHECK_LIB(boost_thread, main, [], - AC_MSG_FAILURE(["Boost thread library not found."]))]) -BOOST_THREAD_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(BOOST_THREAD_LIBS) - -# boost-random -BOOST_RANDOM_LIBS="" -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB(boost_random-mt, main, [], - [AC_CHECK_LIB(boost_random, main, [], - AC_MSG_FAILURE(["Boost random library not found."]))]) -BOOST_RANDOM_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(BOOST_RANDOM_LIBS) - -# boost-regex -BOOST_REGEX_LIBS="" -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB(boost_regex-mt, main, [], - [AC_CHECK_LIB(boost_regex, main, [], - AC_MSG_FAILURE(["Boost regex library not found."]))]) -BOOST_REGEX_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(BOOST_REGEX_LIBS) - -# -# Check for boost_program_options library (defines BOOST_PROGRAM_OPTIONS_LIBS). -# -BOOST_PROGRAM_OPTIONS_LIBS="" -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB(boost_program_options-mt, main, [], - [AC_CHECK_LIB(boost_program_options, main, [], - AC_MSG_FAILURE(["Boost program options library not found."]))]) -BOOST_PROGRAM_OPTIONS_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(BOOST_PROGRAM_OPTIONS_LIBS) - -AC_LANG([C]) - -AC_CHECK_MEMBER([struct fiemap_extent.fe_logical], - [AC_DEFINE([HAVE_FIEMAP_H], [], [linux/fiemap.h was found, fiemap ioctl will be used])], - [AC_MSG_NOTICE([linux/fiemap.h was not found or not usable; using local Ceph copy])], - [[#include ]]) - -AC_CHECK_HEADERS([ \ - arpa/inet.h \ - arpa/nameser_compat.h \ - linux/version.h \ - netdb.h \ - netinet/in.h \ - sys/file.h \ - sys/ioctl.h \ - sys/mount.h \ - sys/param.h \ - sys/socket.h \ - sys/statvfs.h \ - sys/time.h \ - sys/vfs.h \ - sys/xattr.h \ - sys/cdefs.h \ - syslog.h \ - utime.h \ - execinfo.h -]) - -# name_to_handle_at -AC_CHECK_FUNC([name_to_handle_at], - [AC_DEFINE([HAVE_NAME_TO_HANDLE_AT], [], [name_to_handle_at exists])], - []) - -# sync_file_range -AC_CHECK_FUNC([sync_file_range], - [AC_DEFINE([HAVE_SYNC_FILE_RANGE], [], [sync_file_range(2) is supported])], - []) - -# fallocate -AC_CHECK_FUNC([fallocate], - [AC_DEFINE([CEPH_HAVE_FALLOCATE], [], [fallocate(2) is supported])], - []) - -# mallinfo -AC_CHECK_FUNC([mallinfo], - [AC_DEFINE(HAVE_MALLINFO, 1, [Define if you have mallinfo])]) - -# getgrouplist -AC_CHECK_FUNCS([getgrouplist]) - -# -# Test for time-related `struct stat` members. -# - -AC_CHECK_MEMBER([struct stat.st_mtim.tv_nsec], - [AC_DEFINE(HAVE_STAT_ST_MTIM_TV_NSEC, 1, - [Define if you have struct stat.st_mtim.tv_nsec])]) - -AC_CHECK_MEMBER([struct stat.st_mtimespec.tv_nsec], - [AC_DEFINE(HAVE_STAT_ST_MTIMESPEC_TV_NSEC, 1, - [Define if you have struct stat.st_mtimespec.tv_nsec])]) - -# splice/tee -case "${target_os}" in -aix*) - # AIX splice() is something else - ;; -*) - AC_CHECK_FUNC([splice], - [AC_DEFINE([CEPH_HAVE_SPLICE], [], [splice(2) is supported])], - []) - ;; -esac - -# F_SETPIPE_SZ in fcntl.h -AC_MSG_CHECKING([for F_SETPIPE_SZ in fcntl.h]) -AC_EGREP_CPP([yes_have_f_setpipe_sz], [ - #define _GNU_SOURCE - #include - #ifdef F_SETPIPE_SZ - yes_have_f_setpipe_sz - #endif -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE([CEPH_HAVE_SETPIPE_SZ], [], [F_SETPIPE_SZ is supported]) -], [ - AC_MSG_RESULT([no]) - AC_MSG_NOTICE([F_SETPIPE_SZ not found, zero-copy may be less efficent]) -]) - -AC_CHECK_FUNCS([posix_fallocate]) -AC_CHECK_HEADERS([sys/prctl.h]) -AC_CHECK_FUNCS([prctl]) -AC_CHECK_FUNCS([pipe2]) -AC_CHECK_FUNCS([posix_fadvise]) -AC_CHECK_FUNCS([pwritev], AC_DEFINE([HAVE_PWRITEV], [1], [we have pwritev])) - -AC_MSG_CHECKING([for fdatasync]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -]], [[ -#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0 -return fdatasync(0); -#else -#error Not supported -#endif -]])], [ -AC_MSG_RESULT([yes]) -AC_DEFINE([HAVE_FDATASYNC], 1, [Define to 1 if you have fdatasync.]) -], [ -AC_MSG_RESULT([no]) -]) - -AC_MSG_CHECKING([for sched.h]) -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#define _GNU_SOURCE -#include -]], [[ -cpu_set_t cpuset; -CPU_ZERO(&cpuset); -CPU_SET(sched_getcpu(), &cpuset); -sched_setaffinity(0, sizeof(cpuset), &cpuset); -sched_yield(); -return 0; -]])], [ -AC_MSG_RESULT([yes]) -AC_DEFINE([HAVE_SCHED], 1, [Define to 1 if you have sched.h.]) -], [ -AC_MSG_RESULT([no]) -]) -AC_LANG_POP([C++]) - - -# -# Check for pthread spinlock (depends on ACX_PTHREAD) -# -saved_LIBS="$LIBS" -saved_CFLAGS="$CFLAGS" -LIBS="$PTHREAD_LIBS $LIBS" -CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -AC_CHECK_FUNC([pthread_spin_init], - [AC_DEFINE(HAVE_PTHREAD_SPINLOCK, 1, [Define if you have pthread_spin_init])]) -AC_CHECK_FUNCS([pthread_getname_np pthread_setname_np pthread_set_name_np]) -LIBS="$saved_LIBS" -CFLAGS="$saved_CFLAGS" - -AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, - int64_t, uint64_t]) - -dnl check for Linux types -AC_CHECK_HEADERS([linux/types.h]) -AC_CHECK_TYPES([__u8, __s8, __u16, __s16, __u32, __s32, __u64, __s64, __le16, - __be16, __le32, __be32, __le64, __be64], [], [], [[#include ]]) - - -dnl Old versions of lttng-gen-tp leave out includes, and they break our stuff. -AC_MSG_CHECKING([if lttng-gen-tp is sane]) -lttng_gen_tp_dir=`mktemp -d` -echo "#include " > "$lttng_gen_tp_dir/foo.tp" -if ( ( cd "$lttng_gen_tp_dir" && lttng-gen-tp foo.tp -o foo.h && grep "#include " foo.h ) > /dev/null 2>&1 ) ; then - have_good_lttng_gen_tp=yes -else - have_good_lttng_gen_tp=no -fi -rm -rf "$lttng_gen_tp_dir" -AC_MSG_RESULT([$have_good_lttng_gen_tp]) - -AC_ARG_WITH([lttng], - [AS_HELP_STRING([--with-lttng], [Trace with LTTng])]) -AS_IF([test "x$with_lttng" = "xno"], [use_lttng=no], - [test "x$with_lttng" = "xyes"], [use_lttng=yes], - [test "x$have_good_lttng_gen_tp" = "xyes"], [use_lttng=yes; AC_MSG_NOTICE([lttng auto-enabled])], - [use_lttng=no; AC_MSG_NOTICE([lttng auto-disabled])]) -AM_CONDITIONAL([WITH_LTTNG], test x"$use_lttng" = x"yes") -AM_COND_IF([WITH_LTTNG], [ - AC_DEFINE([WITH_LTTNG], [1], [Define if you want to use LTTng]) - - AC_CHECK_HEADER([lttng/tracepoint.h], [], - AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev, lttng-ust-devel)])) - - AC_CHECK_PROG([LTTNG_GEN_TP_CHECK], [lttng-gen-tp], [yes]) - if test x"$LTTNG_GEN_TP_CHECK" != "xyes"; then - AC_MSG_FAILURE([lttng-gen-tp not found]) - fi - AC_SUBST([LTTNG_GEN_TP_PROG], [lttng-gen-tp]) - - if test x"$have_good_lttng_gen_tp" != "xyes"; then - AC_MSG_FAILURE([lttng-gen-tp does not behave properly]) - fi - - AC_MSG_CHECKING([if time_t is an integer]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ - struct { - unsigned int time_t_is_integer: ((time_t) 1.5 == 1) ? 1 : -1; - } x; - return 0; - ]])], [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - AC_MSG_FAILURE([time_t is not an integer. We assume this for tracing.]) - ]) - - AC_MSG_CHECKING([if time_t fits in uint64_t]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], [[ - struct { - unsigned int time_t_fits_in_uin64_t: (sizeof(time_t) <= sizeof(uint64_t)) ? 1 : -1; - } x; - return 0; - ]])], [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - AC_MSG_FAILURE([time_t is larger than uint64_t. We assume it can be cast to uint64_t, for tracing.]) - ]) -], [ - AC_DEFINE([tracepoint(...)], [], [LTTng is disabled, so define this macro to be nothing.]) -]) - - -AC_CHECK_HEADERS([babeltrace/ctf/events.h babeltrace/babeltrace.h]) -AC_CHECK_DECL([BT_CLOCK_REAL], - [have_good_babeltrace=yes], - [have_good_babeltrace=no], - [[#include ]]) -AC_ARG_WITH([babeltrace], - [AS_HELP_STRING([--with-babeltrace], [Enable Babeltrace])]) -AS_IF([test "x$with_babeltrace" = "xno"], [use_babeltrace=no], - [test "x$with_babeltrace" = "xyes"], [use_babeltrace=yes], - [test "x$ac_cv_header_babeltrace_ctf_events_h$ac_cv_header_babeltrace_babeltrace_h$have_good_babeltrace" = "xyesyesyes"], [use_babeltrace=yes; AC_MSG_NOTICE([babeltrace auto-enabled])], - [use_babeltrace=no; AC_MSG_NOTICE([babeltrace auto-disabled])]) -AM_CONDITIONAL([WITH_BABELTRACE], test x"$use_babeltrace" = x"yes") -AM_COND_IF([WITH_BABELTRACE], [ - AC_DEFINE([WITH_BABELTRACE], [1], [Define if you want to use Babeltrace]) - - AC_CHECK_HEADER([babeltrace/babeltrace.h], [], - AC_MSG_ERROR([babeltrace/babeltrac.h not found (libbabeltrace-dev, libbabeltrace-devel)])) - - AC_CHECK_HEADER([babeltrace/ctf/events.h], [], - AC_MSG_ERROR([babeltrace/ctf/events.h not found (libbabeltrace-ctf-dev, libbabeltrace-devel)])) -]) - -dnl check for valgrind -AC_ARG_ENABLE([valgrind], - [AS_HELP_STRING([--enable-valgrind], [enable valgrind unit tests])], - [enable_valgrind=$enableval], [enable_valgrind=]) -AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes) -AS_IF( - [test "x$HAVE_VALGRIND" = "x"], AS_IF([test "x$enable_valgrind" = "xyes"], [AC_MSG_ERROR([valgrind not found])]), - [test "x$enable_valgrind" = "x"], [enable_valgrind=yes]) - -AM_CONDITIONAL([VALGRIND_ENABLED], [test "x$enable_valgrind" = "xyes"]) -if test "x$enable_valgrind" = "xyes"; then - AC_CHECK_HEADERS([valgrind/helgrind.h]) -fi - -AC_SUBST(systemd_unit_dir) -AC_ARG_WITH( - systemd-unit-dir, - AS_HELP_STRING( - [--with-systemdsystemunitdir=DIR], - [systemd unit directory @<:@SYSTEMD_UNIT_DIR@:>@ - Defaults to the correct value for debian /etc/systemd/system/] - ), - [ - systemd_unit_dir="$withval" - ], - [ - # default to the systemd admin unit directory - which pkg-config - pkg_config_exists=$? - if test x"$pkg_config_exists" = x"0"; then - systemd_unit_dir=`pkg-config systemd --variable=systemdsystemunitdir` - else - systemd_unit_dir="/etc/systemd/system/" - fi - ] -) - -# Force not to use eventfd -AC_ARG_WITH([eventfd], - [AS_HELP_STRING([--without-eventfd], [disable eventfd [default=no]])], - , - [with_eventfd=yes]) -AS_IF([test "x$with_eventfd" != xno], - [AC_CHECK_HEADERS(sys/eventfd.h, - [AC_DEFINE(HAVE_EVENTFD, 1, [Have eventfd extension.])])]) -AM_CONDITIONAL(WITH_EVENTFD, [ test "$with_eventfd" = "yes" ]) - -# disable OpenLDAP support -AC_ARG_WITH([openldap], - [AS_HELP_STRING([--without-openldap], [Disable OpenLDAP support (RGW)])]) -if test "x$with_openldap" != "xno"; then - AC_CHECK_HEADER([ldap.h], [], - AC_MSG_ERROR([ldap.h not found (openldap-dev, openldap-devel)])) - AC_CHECK_LIB([ldap], [ldap_initialize], [true], - AC_MSG_FAILURE([libldap not found])) - AC_DEFINE([HAVE_OPENLDAP], [1], [Defined if OpenLDAP enabled]) - have_openldap="yes" -fi -AM_CONDITIONAL(WITH_OPENLDAP, [ test "$have_openldap" = "yes" ]) - -AC_ARG_WITH([reentrant-strsignal], - [AS_HELP_STRING([--with-reentrant-strsignal], [Use strsignal(3) instead of sys_siglist[]])], - [], - [with_reentrant_strsignal=no]) -AS_IF([test "x$with_reentrant_strsignal" != xno], - [AC_DEFINE(HAVE_REENTRANT_STRSIGNAL, 1, [Define if strsignal(3) is reentrant])]) - -AC_ARG_WITH([thread-safe-res-query], - [AS_HELP_STRING([--with-thread-safe-res-query], [Use res_query(3) without locking])], - [], - [with_thread_safe_res_query=no]) -AS_IF([test "x$with_thread_safe_res_query" != xno], - [AC_DEFINE(HAVE_THREAD_SAFE_RES_QUERY, 1, [Define if res_query(3) is thread safe])]) - -# Checks for typedefs, structures, and compiler characteristics. -#AC_HEADER_STDBOOL -#AC_C_CONST -#AC_TYPE_UID_T -#AC_C_INLINE -#AC_TYPE_INT16_T -#AC_TYPE_INT32_T -#AC_TYPE_INT64_T -#AC_TYPE_INT8_T -#AC_TYPE_MODE_T -#AC_TYPE_OFF_T -#AC_TYPE_PID_T -#AC_TYPE_SIZE_T -#AC_TYPE_SSIZE_T -#AC_CHECK_MEMBERS([struct stat.st_blksize]) -#AC_STRUCT_ST_BLOCKS -#AC_CHECK_MEMBERS([struct stat.st_rdev]) -#AC_HEADER_TIME -#AC_STRUCT_TM -#AC_TYPE_UINT16_T -#AC_TYPE_UINT32_T -#AC_TYPE_UINT64_T -#AC_TYPE_UINT8_T - -# Checks for library functions. -#AC_FUNC_CHOWN -#AC_FUNC_CLOSEDIR_VOID -#AC_FUNC_ERROR_AT_LINE -#AC_FUNC_FORK -#AC_PROG_GCC_TRADITIONAL -#AC_FUNC_LSTAT -#AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -#AC_FUNC_MALLOC # this causes annoying rpl_malloc error on some machines; skip it -#AC_FUNC_MEMCMP -#AC_FUNC_MMAP -#AC_FUNC_REALLOC -#AC_FUNC_SELECT_ARGTYPES -#AC_TYPE_SIGNAL -#AC_FUNC_STAT -#AC_FUNC_UTIME_NULL -#AC_CHECK_FUNCS([bzero fchdir fdatasync floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa localtime_r memmove memset mkdir munmap pow rmdir select socket sqrt strcasecmp strchr strerror strstr utime]) - -# check for return type (and presence) if strerror_r in C++ mode -AC_LANG_PUSH([C++]) -AC_FUNC_STRERROR_R -AC_LANG_POP([C++]) - -AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1") - -AM_PATH_PYTHON([2.4], - [], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])]) - -AC_CONFIG_HEADERS([src/acconfig.h]) -AC_CONFIG_FILES([Makefile - src/Makefile - src/ocf/Makefile - src/ocf/rbd - src/java/Makefile - systemd/Makefile - man/Makefile - doc/Makefile - selinux/Makefile - ceph.spec]) -AC_OUTPUT diff --git a/doc/.gitignore b/doc/.gitignore index aca7518a3ee0a..0c7c74746ae94 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,3 +1,2 @@ /overview.png /object_store.png -/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 7720b49e69299..0000000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -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/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 diff --git a/m4/ac_check_class.m4 b/m4/ac_check_class.m4 deleted file mode 100644 index 17932c59cf1b1..0000000000000 --- a/m4/ac_check_class.m4 +++ /dev/null @@ -1,108 +0,0 @@ -dnl @synopsis AC_CHECK_CLASS -dnl -dnl AC_CHECK_CLASS tests the existence of a given Java class, either in -dnl a jar or in a '.class' file. -dnl -dnl *Warning*: its success or failure can depend on a proper setting of -dnl the CLASSPATH env. variable. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_CHECK_CLASS],[ -AC_REQUIRE([AC_PROG_JAVA]) -ac_var_name=`echo $1 | sed 's/\./_/g'` -dnl Normaly I'd use a AC_CACHE_CHECK here but since the variable name is -dnl dynamic I need an extra level of extraction -AC_MSG_CHECKING([for $1 class]) -AC_CACHE_VAL(ac_cv_class_$ac_var_name, [ -if test x$ac_cv_prog_uudecode_base64 = xyes; then -dnl /** -dnl * Test.java: used to test dynamicaly if a class exists. -dnl */ -dnl public class Test -dnl { -dnl -dnl public static void -dnl main( String[] argv ) -dnl { -dnl Class lib; -dnl if (argv.length < 1) -dnl { -dnl System.err.println ("Missing argument"); -dnl System.exit (77); -dnl } -dnl try -dnl { -dnl lib = Class.forName (argv[0]); -dnl } -dnl catch (ClassNotFoundException e) -dnl { -dnl System.exit (1); -dnl } -dnl lib = null; -dnl System.exit (0); -dnl } -dnl -dnl } -cat << \EOF > Test.uue -begin-base64 644 Test.class -yv66vgADAC0AKQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE -bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51 -bWJlclRhYmxlDAAKAAsBAANlcnIBABVMamF2YS9pby9QcmludFN0cmVhbTsJ -AA0ACQcADgEAEGphdmEvbGFuZy9TeXN0ZW0IABABABBNaXNzaW5nIGFyZ3Vt -ZW50DAASABMBAAdwcmludGxuAQAVKExqYXZhL2xhbmcvU3RyaW5nOylWCgAV -ABEHABYBABNqYXZhL2lvL1ByaW50U3RyZWFtDAAYABkBAARleGl0AQAEKEkp -VgoADQAXDAAcAB0BAAdmb3JOYW1lAQAlKExqYXZhL2xhbmcvU3RyaW5nOylM -amF2YS9sYW5nL0NsYXNzOwoAHwAbBwAgAQAPamF2YS9sYW5nL0NsYXNzBwAi -AQAgamF2YS9sYW5nL0NsYXNzTm90Rm91bmRFeGNlcHRpb24BAAY8aW5pdD4B -AAMoKVYMACMAJAoAAwAlAQAKU291cmNlRmlsZQEACVRlc3QuamF2YQAhAAEA -AwAAAAAAAgAJAAUABgABAAcAAABtAAMAAwAAACkqvgSiABCyAAwSD7YAFBBN -uAAaKgMyuAAeTKcACE0EuAAaAUwDuAAasQABABMAGgAdACEAAQAIAAAAKgAK -AAAACgAAAAsABgANAA4ADgATABAAEwASAB4AFgAiABgAJAAZACgAGgABACMA -JAABAAcAAAAhAAEAAQAAAAUqtwAmsQAAAAEACAAAAAoAAgAAAAQABAAEAAEA -JwAAAAIAKA== -==== -EOF - if uudecode$EXEEXT Test.uue; then - : - else - echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AC_FD_CC - echo "configure: failed file was:" >&AC_FD_CC - cat Test.uue >&AC_FD_CC - ac_cv_prog_uudecode_base64=no - fi - rm -f Test.uue - if AC_TRY_COMMAND($JAVA $JAVAFLAGS Test $1) >/dev/null 2>&1; then - eval "ac_cv_class_$ac_var_name=yes" - else - eval "ac_cv_class_$ac_var_name=no" - fi - rm -f Test.class -else - AC_TRY_COMPILE_JAVA([$1], , [eval "ac_cv_class_$ac_var_name=yes"], - [eval "ac_cv_class_$ac_var_name=no"]) -fi -eval "ac_var_val=$`eval echo ac_cv_class_$ac_var_name`" -eval "HAVE_$ac_var_name=$`echo ac_cv_class_$ac_var_val`" -HAVE_LAST_CLASS=$ac_var_val -if test x$ac_var_val = xyes; then - ifelse([$2], , :, [$2]) -else - ifelse([$3], , :, [$3]) -fi -]) -dnl for some reason the above statment didn't fall though here? -dnl do scripts have variable scoping? -eval "ac_var_val=$`eval echo ac_cv_class_$ac_var_name`" -AC_MSG_RESULT($ac_var_val) -]) diff --git a/m4/ac_check_classpath.m4 b/m4/ac_check_classpath.m4 deleted file mode 100644 index 1782b5d3f8fd8..0000000000000 --- a/m4/ac_check_classpath.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl @synopsis AC_CHECK_CLASSPATH -dnl -dnl AC_CHECK_CLASSPATH just displays the CLASSPATH, for the edification -dnl of the user. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_CHECK_CLASSPATH],[ -if test "x$CLASSPATH" = x; then - echo "You have no CLASSPATH, I hope it is good" -else - echo "You have CLASSPATH $CLASSPATH, hope it is correct" -fi -]) diff --git a/m4/ac_check_rqrd_class.m4 b/m4/ac_check_rqrd_class.m4 deleted file mode 100644 index 24b3d37937a8b..0000000000000 --- a/m4/ac_check_rqrd_class.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl @synopsis AC_CHECK_RQRD_CLASS -dnl -dnl AC_CHECK_RQRD_CLASS tests the existence of a given Java class, -dnl either in a jar or in a '.class' file and fails if it doesn't -dnl exist. Its success or failure can depend on a proper setting of the -dnl CLASSPATH env. variable. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_CHECK_RQRD_CLASS],[ -CLASS=`echo $1|sed 's/\./_/g'` -AC_CHECK_CLASS($1) -if test "$HAVE_LAST_CLASS" = "no"; then - AC_MSG_ERROR([Required class $1 missing, exiting.]) -fi -]) diff --git a/m4/ac_java_options.m4 b/m4/ac_java_options.m4 deleted file mode 100644 index aee384466d0c3..0000000000000 --- a/m4/ac_java_options.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl @synopsis AC_JAVA_OPTIONS -dnl -dnl AC_JAVA_OPTIONS adds configure command line options used for Java -dnl m4 macros. This Macro is optional. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Devin Weaver -dnl @version 2000-07-19 -dnl @license AllPermissive - -AC_DEFUN([AC_JAVA_OPTIONS],[ -AC_ARG_WITH(java-prefix, - [ --with-java-prefix=PFX prefix where Java runtime is installed (optional)]) -AC_ARG_WITH(javac-flags, - [ --with-javac-flags=FLAGS flags to pass to the Java compiler (optional)]) -AC_ARG_WITH(java-flags, - [ --with-java-flags=FLAGS flags to pass to the Java VM (optional)]) -JAVAPREFIX=$with_java_prefix -JAVACFLAGS=$with_javac_flags -JAVAFLAGS=$with_java_flags -AC_SUBST(JAVAPREFIX)dnl -AC_SUBST(JAVACFLAGS)dnl -AC_SUBST(JAVAFLAGS)dnl -AC_SUBST(JAVA)dnl -AC_SUBST(JAVAC)dnl -]) diff --git a/m4/ac_prog_jar.m4 b/m4/ac_prog_jar.m4 deleted file mode 100644 index e5bf57c03c93f..0000000000000 --- a/m4/ac_prog_jar.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl @synopsis AC_PROG_JAR -dnl -dnl AC_PROG_JAR tests for an existing jar program. It uses the -dnl environment variable JAR then tests in sequence various common jar -dnl programs. -dnl -dnl If you want to force a specific compiler: -dnl -dnl - at the configure.in level, set JAR=yourcompiler before calling -dnl AC_PROG_JAR -dnl -dnl - at the configure level, setenv JAR -dnl -dnl You can use the JAR variable in your Makefile.in, with @JAR@. -dnl -dnl Note: This macro depends on the autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download that whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. -dnl -dnl The general documentation of those macros, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Egon Willighagen -dnl @version 2000-07-19 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_JAR],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test "x$JAVAPREFIX" = x; then - test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar$EXEEXT) -else - test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar, $JAVAPREFIX) -fi -test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH]) -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_java.m4 b/m4/ac_prog_java.m4 deleted file mode 100644 index d16c2d684130b..0000000000000 --- a/m4/ac_prog_java.m4 +++ /dev/null @@ -1,83 +0,0 @@ -dnl @synopsis AC_PROG_JAVA -dnl -dnl Here is a summary of the main macros: -dnl -dnl AC_PROG_JAVAC: finds a Java compiler. -dnl -dnl AC_PROG_JAVA: finds a Java virtual machine. -dnl -dnl AC_CHECK_CLASS: finds if we have the given class (beware of -dnl CLASSPATH!). -dnl -dnl AC_CHECK_RQRD_CLASS: finds if we have the given class and stops -dnl otherwise. -dnl -dnl AC_TRY_COMPILE_JAVA: attempt to compile user given source. -dnl -dnl AC_TRY_RUN_JAVA: attempt to compile and run user given source. -dnl -dnl AC_JAVA_OPTIONS: adds Java configure options. -dnl -dnl AC_PROG_JAVA tests an existing Java virtual machine. It uses the -dnl environment variable JAVA then tests in sequence various common -dnl Java virtual machines. For political reasons, it starts with the -dnl free ones. You *must* call [AC_PROG_JAVAC] before. -dnl -dnl If you want to force a specific VM: -dnl -dnl - at the configure.in level, set JAVA=yourvm before calling -dnl AC_PROG_JAVA -dnl -dnl (but after AC_INIT) -dnl -dnl - at the configure level, setenv JAVA -dnl -dnl You can use the JAVA variable in your Makefile.in, with @JAVA@. -dnl -dnl *Warning*: its success or failure can depend on a proper setting of -dnl the CLASSPATH env. variable. -dnl -dnl TODO: allow to exclude virtual machines (rationale: most Java -dnl programs cannot run with some VM like kaffe). -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. -dnl -dnl A Web page, with a link to the latest CVS snapshot is at -dnl . -dnl -dnl This is a sample configure.in Process this file with autoconf to -dnl produce a configure script. -dnl -dnl AC_INIT(UnTag.java) -dnl -dnl dnl Checks for programs. -dnl AC_CHECK_CLASSPATH -dnl AC_PROG_JAVAC -dnl AC_PROG_JAVA -dnl -dnl dnl Checks for classes -dnl AC_CHECK_RQRD_CLASS(org.xml.sax.Parser) -dnl AC_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver) -dnl -dnl AC_OUTPUT(Makefile) -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_JAVA],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test x$JAVAPREFIX = x; then - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT) -else - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX) -fi -test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) -AC_PROG_JAVA_WORKS -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_java_works.m4 b/m4/ac_prog_java_works.m4 deleted file mode 100644 index bb14a88e40164..0000000000000 --- a/m4/ac_prog_java_works.m4 +++ /dev/null @@ -1,98 +0,0 @@ -dnl @synopsis AC_PROG_JAVA_WORKS -dnl -dnl Internal use ONLY. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_JAVA_WORKS], [ -AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes) -if test x$uudecode = xyes; then -AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [ -dnl /** -dnl * Test.java: used to test if java compiler works. -dnl */ -dnl public class Test -dnl { -dnl -dnl public static void -dnl main( String[] argv ) -dnl { -dnl System.exit (0); -dnl } -dnl -dnl } -cat << \EOF > Test.uue -begin-base64 644 Test.class -yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE -bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51 -bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s -YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG -aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB -AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB -AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ= -==== -EOF -if uudecode$EXEEXT Test.uue; then - ac_cv_prog_uudecode_base64=yes -else - echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AC_FD_CC - echo "configure: failed file was:" >&AC_FD_CC - cat Test.uue >&AC_FD_CC - ac_cv_prog_uudecode_base64=no -fi -rm -f Test.uue]) -fi -if test x$ac_cv_prog_uudecode_base64 != xyes; then - rm -f Test.class - AC_MSG_WARN([I have to compile Test.class from scratch]) - if test x$ac_cv_prog_javac_works = xno; then - AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly]) - fi - if test x$ac_cv_prog_javac_works = x; then - AC_PROG_JAVAC - fi -fi -AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [ -JAVA_TEST=Test.java -CLASS_TEST=Test.class -TEST=Test -changequote(, )dnl -cat << \EOF > $JAVA_TEST -/* [#]line __oline__ "configure" */ -public class Test { -public static void main (String args[]) { - System.exit (0); -} } -EOF -changequote([, ])dnl -if test x$ac_cv_prog_uudecode_base64 != xyes; then - if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s $CLASS_TEST; then - : - else - echo "configure: failed program was:" >&AC_FD_CC - cat $JAVA_TEST >&AC_FD_CC - AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)) - fi -fi -if AC_TRY_COMMAND($JAVA $JAVAFLAGS $TEST) >/dev/null 2>&1; then - ac_cv_prog_java_works=yes -else - echo "configure: failed program was:" >&AC_FD_CC - cat $JAVA_TEST >&AC_FD_CC - AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?)) -fi -rm -fr $JAVA_TEST $CLASS_TEST Test.uue -]) -AC_PROVIDE([$0])dnl -] -) diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 deleted file mode 100644 index f6a2fb27cb84d..0000000000000 --- a/m4/ac_prog_javac.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl @synopsis AC_PROG_JAVAC -dnl -dnl AC_PROG_JAVAC tests an existing Java compiler. It uses the -dnl environment variable JAVAC then tests in sequence various common -dnl Java compilers. For political reasons, it starts with the free -dnl ones. -dnl -dnl If you want to force a specific compiler: -dnl -dnl - at the configure.in level, set JAVAC=yourcompiler before calling -dnl AC_PROG_JAVAC -dnl -dnl - at the configure level, setenv JAVAC -dnl -dnl You can use the JAVAC variable in your Makefile.in, with @JAVAC@. -dnl -dnl *Warning*: its success or failure can depend on a proper setting of -dnl the CLASSPATH env. variable. -dnl -dnl TODO: allow to exclude compilers (rationale: most Java programs -dnl cannot compile with some compilers like guavac). -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_JAVAC],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT) -else - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT, $JAVAPREFIX) -fi -test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) -AC_PROG_JAVAC_WORKS -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4 deleted file mode 100644 index 8727e7fddb1b7..0000000000000 --- a/m4/ac_prog_javac_works.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl @synopsis AC_PROG_JAVAC_WORKS -dnl -dnl Internal use ONLY. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_JAVAC_WORKS],[ -AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [ -JAVA_TEST=Test.java -CLASS_TEST=Test.class -cat << \EOF > $JAVA_TEST -/* [#]line __oline__ "configure" */ -public class Test { -} -EOF -if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then - ac_cv_prog_javac_works=yes -else - AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)]) - echo "configure: failed program was:" >&AC_FD_CC - cat $JAVA_TEST >&AC_FD_CC -fi -rm -f $JAVA_TEST $CLASS_TEST -]) -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_javah.m4 b/m4/ac_prog_javah.m4 deleted file mode 100644 index a1c0556afd4fb..0000000000000 --- a/m4/ac_prog_javah.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl @synopsis AC_PROG_JAVAH -dnl -dnl AC_PROG_JAVAH tests the availability of the javah header generator -dnl and looks for the jni.h header file. If available, JAVAH is set to -dnl the full path of javah and CPPFLAGS is updated accordingly. -dnl -dnl @category Java -dnl @author Luc Maisonobe -dnl @version 2002-03-25 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_JAVAH],[ -AC_REQUIRE([AC_CANONICAL_TARGET])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_PATH_PROG(JAVAH,javah) -if test x"`eval 'echo $ac_cv_path_JAVAH'`" != x ; then - AC_TRY_CPP([#include ],,[ - ac_save_CPPFLAGS="$CPPFLAGS" -changequote(, )dnl - ac_dir=`echo $ac_cv_path_JAVAH | sed 's,\(.*\)/[^/]*/[^/]*$,\1/include,'` - ac_machdep=`echo $build_os | sed 's,[-0-9].*,,' | sed 's,cygwin,win32,'` -changequote([, ])dnl - CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep" - AC_TRY_CPP([#include ], - ac_save_CPPFLAGS="$CPPFLAGS", - AC_MSG_WARN([unable to include ])) - CPPFLAGS="$ac_save_CPPFLAGS"]) -fi]) diff --git a/m4/ac_try_compile_java.m4 b/m4/ac_try_compile_java.m4 deleted file mode 100644 index 102a04c409755..0000000000000 --- a/m4/ac_try_compile_java.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl @synopsis AC_TRY_COMPILE_JAVA -dnl -dnl AC_TRY_COMPILE_JAVA attempt to compile user given source. -dnl -dnl *Warning*: its success or failure can depend on a proper setting of -dnl the CLASSPATH env. variable. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Devin Weaver -dnl @version 2000-07-19 -dnl @license AllPermissive - -AC_DEFUN([AC_TRY_COMPILE_JAVA],[ -AC_REQUIRE([AC_PROG_JAVAC])dnl -cat << \EOF > Test.java -/* [#]line __oline__ "configure" */ -ifelse([$1], , , [import $1;]) -public class Test { -[$2] -} -EOF -if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class -then -dnl Don't remove the temporary files here, so they can be examined. - ifelse([$3], , :, [$3]) -else - echo "configure: failed program was:" >&AC_FD_CC - cat Test.java >&AC_FD_CC -ifelse([$4], , , [ rm -fr Test* - $4 -])dnl -fi -rm -fr Test*]) diff --git a/m4/ac_try_run_javac.m4 b/m4/ac_try_run_javac.m4 deleted file mode 100644 index e8e975c3e35c8..0000000000000 --- a/m4/ac_try_run_javac.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl @synopsis AC_TRY_RUN_JAVA -dnl -dnl AC_TRY_RUN_JAVA attempt to compile and run user given source. -dnl -dnl *Warning*: its success or failure can depend on a proper setting of -dnl the CLASSPATH env. variable. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Devin Weaver -dnl @version 2000-07-19 -dnl @license AllPermissive - -AC_DEFUN([AC_TRY_RUN_JAVA],[ -AC_REQUIRE([AC_PROG_JAVAC])dnl -AC_REQUIRE([AC_PROG_JAVA])dnl -cat << \EOF > Test.java -/* [#]line __oline__ "configure" */ -ifelse([$1], , , [include $1;]) -public class Test { -[$2] -} -EOF -if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class && ($JAVA $JAVAFLAGS Test; exit) 2>/dev/null -then -dnl Don't remove the temporary files here, so they can be examined. - ifelse([$3], , :, [$3]) -else - echo "configure: failed program was:" >&AC_FD_CC - cat Test.java >&AC_FD_CC -ifelse([$4], , , [ rm -fr Test* - $4 -])dnl -fi -rm -fr Test*]) diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 deleted file mode 100644 index 89d42c7449ef3..0000000000000 --- a/m4/acx_pthread.m4 +++ /dev/null @@ -1,397 +0,0 @@ -# This was retrieved from -# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?revision=1277&root=avahi -# See also (perhaps for new versions?) -# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?root=avahi -# -# We've rewritten the inconsistency check code (from avahi), to work -# more broadly. In particular, it no longer assumes ld accepts -zdefs. -# This caused a restructing of the code, but the functionality has only -# changed a little. - -dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -dnl -dnl @summary figure out how to build C programs using POSIX threads -dnl -dnl This macro figures out how to build C programs using POSIX threads. -dnl It sets the PTHREAD_LIBS output variable to the threads library and -dnl linker flags, and the PTHREAD_CFLAGS output variable to any special -dnl C compiler flags that are needed. (The user can also force certain -dnl compiler flags/libs to be tested by setting these environment -dnl variables.) -dnl -dnl Also sets PTHREAD_CC to any special C compiler that is needed for -dnl multi-threaded programs (defaults to the value of CC otherwise). -dnl (This is necessary on AIX to use the special cc_r compiler alias.) -dnl -dnl NOTE: You are assumed to not only compile your program with these -dnl flags, but also link it with them as well. e.g. you should link -dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS -dnl $LIBS -dnl -dnl If you are only building threads programs, you may wish to use -dnl these variables in your default LIBS, CFLAGS, and CC: -dnl -dnl LIBS="$PTHREAD_LIBS $LIBS" -dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -dnl CC="$PTHREAD_CC" -dnl -dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute -dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to -dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -dnl -dnl ACTION-IF-FOUND is a list of shell commands to run if a threads -dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to -dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the -dnl default action will define HAVE_PTHREAD. -dnl -dnl Please let the authors know if this macro fails on any platform, or -dnl if you have any other suggestions or comments. This macro was based -dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with -dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros -dnl posted by Alejandro Forero Cuervo to the autoconf macro repository. -dnl We are also grateful for the helpful feedback of numerous users. -dnl -dnl @category InstalledPackages -dnl @author Steven G. Johnson -dnl @version 2006-05-29 -dnl @license GPLWithACException -dnl -dnl Checks for GCC shared/pthread inconsistency based on work by -dnl Marcin Owsiany - - -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_TRY_LINK([#include ], [int attr=$attr; return attr;], - [attr_name=$attr; break]) - done - AC_MSG_RESULT($attr_name) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) - else - PTHREAD_CC=$CC - fi - - # The next part tries to detect GCC inconsistency with -shared on some - # architectures and systems. The problem is that in certain - # configurations, when -shared is specified, GCC "forgets" to - # internally use various flags which are still necessary. - - # - # Prepare the flags - # - save_CFLAGS="$CFLAGS" - save_LIBS="$LIBS" - save_CC="$CC" - - # Try with the flags determined by the earlier checks. - # - # -Wl,-z,defs forces link-time symbol resolution, so that the - # linking checks with -shared actually have any value - # - # FIXME: -fPIC is required for -shared on many architectures, - # so we specify it here, but the right way would probably be to - # properly detect whether it is actually required. - CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CC="$PTHREAD_CC" - - # In order not to create several levels of indentation, we test - # the value of "$done" until we find the cure or run out of ideas. - done="no" - - # First, make sure the CFLAGS we added are actually accepted by our - # compiler. If not (and OS X's ld, for instance, does not accept -z), - # then we can't do this test. - if test x"$done" = xno; then - AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies]) - AC_TRY_LINK(,, , [done=yes]) - - if test "x$done" = xyes ; then - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi - fi - - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - fi - - # - # Linux gcc on some architectures such as mips/mipsel forgets - # about -lpthread - # - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -lpthread fixes that]) - LIBS="-lpthread $PTHREAD_LIBS $save_LIBS" - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - PTHREAD_LIBS="-lpthread $PTHREAD_LIBS" - else - AC_MSG_RESULT([no]) - fi - fi - # - # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc - # - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -lc_r fixes that]) - LIBS="-lc_r $PTHREAD_LIBS $save_LIBS" - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - PTHREAD_LIBS="-lc_r $PTHREAD_LIBS" - else - AC_MSG_RESULT([no]) - fi - fi - if test x"$done" = xno; then - # OK, we have run out of ideas - AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries]) - - # so it's not safe to assume that we may use pthreads - acx_pthread_ok=no - fi - - AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib]) - CFLAGS="-nostdlib $CFLAGS" - # we need c with nostdlib - LIBS="$LIBS -lc" - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes],[done=no]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -lpthread saves the day]) - LIBS="-lpthread $LIBS" - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes],[done=no]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - PTHREAD_LIBS="$PTHREAD_LIBS -lpthread" - else - AC_MSG_RESULT([no]) - AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries and -nostdlib]) - fi - fi - - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - CC="$save_CC" -else - PTHREAD_CC="$CC" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff --git a/m4/ax_arm.m4 b/m4/ax_arm.m4 deleted file mode 100644 index 37ea0aaf1d16a..0000000000000 --- a/m4/ax_arm.m4 +++ /dev/null @@ -1,41 +0,0 @@ -AC_DEFUN([AX_ARM_FEATURES], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - - case $target_cpu in - arm*) - AX_CHECK_COMPILE_FLAG(-mfpu=neon, ax_cv_support_neon_ext=yes, []) - if test x"$ax_cv_support_neon_ext" = x"yes"; then - ARM_NEON_FLAGS="-mfpu=neon -DARM_NEON" - AC_SUBST(ARM_NEON_FLAGS) - ARM_FLAGS="$ARM_FLAGS $ARM_NEON_FLAGS" - AC_DEFINE(HAVE_NEON,,[Support NEON instructions]) - fi - ;; - aarch64*) - AX_CHECK_COMPILE_FLAG(-march=armv8-a, ax_cv_support_armv8=yes, []) - if test x"$ax_cv_support_armv8" = x"yes"; then - ARM_ARCH_FLAGS="-march=armv8-a" - ARM_DEFINE_FLAGS="-DARCH_AARCH64" - fi - AX_CHECK_COMPILE_FLAG(-march=armv8-a+simd, ax_cv_support_neon_ext=yes, []) - if test x"$ax_cv_support_neon_ext" = x"yes"; then - ARM_ARCH_FLAGS="$ARM_ARCH_FLAGS+simd" - ARM_DEFINE_FLAGS="$ARM_DEFINE_FLAGS -DARM_NEON" - ARM_NEON_FLAGS="-march=armv8-a+simd -DARCH_AARCH64 -DARM_NEON" - AC_DEFINE(HAVE_NEON,,[Support NEON instructions]) - AC_SUBST(ARM_NEON_FLAGS) - fi - AX_CHECK_COMPILE_FLAG(-march=armv8-a+crc, ax_cv_support_crc_ext=yes, []) - if test x"$ax_cv_support_crc_ext" = x"yes"; then - ARM_ARCH_FLAGS="$ARM_ARCH_FLAGS+crc" - ARM_CRC_FLAGS="-march=armv8-a+crc -DARCH_AARCH64" - AC_DEFINE(HAVE_ARMV8_CRC,,[Support ARMv8 CRC instructions]) - AC_SUBST(ARM_CRC_FLAGS) - fi - ARM_FLAGS="$ARM_ARCH_FLAGS $ARM_DEFINE_FLAGS" - ;; - esac - - AC_SUBST(ARM_FLAGS) -]) diff --git a/m4/ax_c_pretty_func.m4 b/m4/ax_c_pretty_func.m4 deleted file mode 100644 index ad76709c33a54..0000000000000 --- a/m4/ax_c_pretty_func.m4 +++ /dev/null @@ -1,18 +0,0 @@ -# -# Test for C compiler support of __PRETTY_FUNCTION__ -# -# - Adapted from ax_c_var_func (Noah Watkins) -# - -AU_ALIAS([AC_C_PRETTY_FUNC], [AX_C_PRETTY_FUNC]) -AC_DEFUN([AX_C_PRETTY_FUNC], -[AC_REQUIRE([AC_PROG_CC]) -AC_CACHE_CHECK(whether $CC recognizes __PRETTY_FUNCTION__, ac_cv_c_pretty_func, -AC_TRY_COMPILE(, -[ -char *s = __PRETTY_FUNCTION__; -], -AC_DEFINE(HAVE_PRETTY_FUNC,, -[Define if the C complier supports __PRETTY_FUNCTION__]) ac_cv_c_pretty_func=yes, -ac_cv_c_pretty_func=no) ) -])dnl diff --git a/m4/ax_c_var_func.m4 b/m4/ax_c_var_func.m4 deleted file mode 100644 index 8b57563621d8f..0000000000000 --- a/m4/ax_c_var_func.m4 +++ /dev/null @@ -1,66 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_c_var_func.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_C_VAR_FUNC -# -# DESCRIPTION -# -# This macro tests if the C complier supports the C9X standard __func__ -# indentifier. -# -# The new C9X standard for the C language stipulates that the identifier -# __func__ shall be implictly declared by the compiler as if, immediately -# following the opening brace of each function definition, the declaration -# -# static const char __func__[] = "function-name"; -# -# appeared, where function-name is the name of the function where the -# __func__ identifier is used. -# -# LICENSE -# -# Copyright (c) 2008 Christopher Currie -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 5 - -AU_ALIAS([AC_C_VAR_FUNC], [AX_C_VAR_FUNC]) -AC_DEFUN([AX_C_VAR_FUNC], -[AC_REQUIRE([AC_PROG_CC]) -AC_CACHE_CHECK(whether $CC recognizes __func__, ac_cv_c_var_func, -AC_TRY_COMPILE(, -[ -char *s = __func__; -], -AC_DEFINE(HAVE_FUNC,, -[Define if the C complier supports __func__]) ac_cv_c_var_func=yes, -ac_cv_c_var_func=no) ) -])dnl diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 deleted file mode 100644 index c3a8d695a1bcd..0000000000000 --- a/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,72 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 2 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 deleted file mode 100644 index a87c5a6b6f93b..0000000000000 --- a/m4/ax_check_openssl.m4 +++ /dev/null @@ -1,124 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]]) -# -# DESCRIPTION -# -# Look for OpenSSL in a number of default spots, or in a user-selected -# spot (via --with-openssl). Sets -# -# OPENSSL_INCLUDES to the include directives required -# OPENSSL_LIBS to the -l directives required -# OPENSSL_LDFLAGS to the -L or -R flags required -# -# and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately -# -# This macro sets OPENSSL_INCLUDES such that source files should use the -# openssl/ directory in include directives: -# -# #include -# -# LICENSE -# -# Copyright (c) 2009,2010 Zmanda Inc. -# Copyright (c) 2009,2010 Dustin J. Mitchell -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 8 - -AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL]) -AC_DEFUN([AX_CHECK_OPENSSL], [ - found=false - AC_ARG_WITH([openssl], - [AS_HELP_STRING([--with-openssl=DIR], - [root of the OpenSSL directory])], - [ - case "$withval" in - "" | y | ye | yes | n | no) - AC_MSG_ERROR([Invalid --with-openssl value]) - ;; - *) ssldirs="$withval" - ;; - esac - ], [ - # if pkg-config is installed and openssl has installed a .pc file, - # then use that information and don't search ssldirs - AC_PATH_PROG([PKG_CONFIG], [pkg-config]) - if test x"$PKG_CONFIG" != x""; then - OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null` - if test $? = 0; then - OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null` - OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null` - found=true - fi - fi - - # no such luck; use some default ssldirs - if ! $found; then - ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr" - fi - ] - ) - - - # note that we #include , so the OpenSSL headers have to be in - # an 'openssl' subdirectory - - if ! $found; then - OPENSSL_INCLUDES= - for ssldir in $ssldirs; do - AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) - if test -f "$ssldir/include/openssl/ssl.h"; then - OPENSSL_INCLUDES="-I$ssldir/include" - OPENSSL_LDFLAGS="-L$ssldir/lib" - OPENSSL_LIBS="-lssl -lcrypto" - found=true - AC_MSG_RESULT([yes]) - break - else - AC_MSG_RESULT([no]) - fi - done - - # if the file wasn't found, well, go ahead and try the link anyway -- maybe - # it will just work! - fi - - # try the preprocessor and linker with our new flags, - # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS - - AC_MSG_CHECKING([whether compiling and linking against OpenSSL works]) - echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \ - "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD - - save_LIBS="$LIBS" - save_LDFLAGS="$LDFLAGS" - save_CPPFLAGS="$CPPFLAGS" - LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" - LIBS="$OPENSSL_LIBS $LIBS" - CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], [SSL_new(NULL)])], - [ - AC_MSG_RESULT([yes]) - $1 - ], [ - AC_MSG_RESULT([no]) - $2 - ]) - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - - AC_SUBST([OPENSSL_INCLUDES]) - AC_SUBST([OPENSSL_LIBS]) - AC_SUBST([OPENSSL_LDFLAGS]) -]) diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 deleted file mode 100644 index 163a4c646f762..0000000000000 --- a/m4/ax_cxx_compile_stdcxx_11.m4 +++ /dev/null @@ -1,142 +0,0 @@ -# ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++11 -# standard; if necessary, add switches to CXXFLAGS to enable support. -# -# The first argument, if specified, indicates whether you insist on an -# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -# -std=c++11). If neither is specified, you get whatever works, with -# preference for an extended mode. -# -# The second argument, if specified 'mandatory' or if left unspecified, -# indicates that baseline C++11 support is required and that the macro -# should error out if no mode with that support is found. If specified -# 'optional', then configuration proceeds regardless, after defining -# HAVE_CXX11 if and only if a supporting mode is found. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# Copyright (c) 2012 Zack Weinberg -# Copyright (c) 2013 Roy Stogner -# Copyright (c) 2014 Alexey Sokolov -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 4 - -m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - struct Base { - virtual void f() {} - }; - struct Child : public Base { - virtual void f() override {} - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c); - - auto d = a; - auto l = [](){}; -]]) - -AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl - m4_if([$1], [], [], - [$1], [ext], [], - [$1], [noext], [], - [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl - m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], - [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], - [$2], [optional], [ax_cxx_compile_cxx11_required=false], - [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) - AC_LANG_PUSH([C++])dnl - ac_success=no - AC_CACHE_CHECK(whether $CXX supports C++11 features by default, - ax_cv_cxx_compile_cxx11, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [ax_cv_cxx_compile_cxx11=yes], - [ax_cv_cxx_compile_cxx11=no])]) - if test x$ax_cv_cxx_compile_cxx11 = xyes; then - ac_success=yes - fi - - m4_if([$1], [noext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=gnu++11 -std=gnu++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - - m4_if([$1], [ext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=c++11 -std=c++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - AC_LANG_POP([C++]) - if test x$ax_cxx_compile_cxx11_required = xtrue; then - if test x$ac_success = xno; then - AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) - fi - else - if test x$ac_success = xno; then - HAVE_CXX11=0 - AC_MSG_NOTICE([No compiler with C++11 support was found]) - else - HAVE_CXX11=1 - AC_DEFINE(HAVE_CXX11,1, - [define if the compiler supports basic C++11 syntax]) - fi - - AC_SUBST(HAVE_CXX11) - fi -]) diff --git a/m4/ax_cxx_static_cast.m4 b/m4/ax_cxx_static_cast.m4 deleted file mode 100644 index e09e6c46cb2da..0000000000000 --- a/m4/ax_cxx_static_cast.m4 +++ /dev/null @@ -1,43 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_cxx_static_cast.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_STATIC_CAST -# -# DESCRIPTION -# -# If the compiler supports static_cast<>, define HAVE_STATIC_CAST. -# -# LICENSE -# -# Copyright (c) 2008 Todd Veldhuizen -# Copyright (c) 2008 Luc Maisonobe -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 6 - -AU_ALIAS([AC_CXX_STATIC_CAST], [AX_CXX_STATIC_CAST]) -AC_DEFUN([AX_CXX_STATIC_CAST], -[AC_CACHE_CHECK(whether the compiler supports static_cast<>, -ax_cv_cxx_static_cast, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -class Base { public : Base () {} virtual void f () = 0; }; -class Derived : public Base { public : Derived () {} virtual void f () {} }; -int g (Derived&) { return 0; }],[ -Derived d; Base& b = d; Derived& s = static_cast (b); return g (s);], - ax_cv_cxx_static_cast=yes, ax_cv_cxx_static_cast=no) - AC_LANG_RESTORE -]) -if test "$ax_cv_cxx_static_cast" = yes; then - AC_DEFINE(HAVE_STATIC_CAST,, - [define if the compiler supports static_cast<>]) -fi -]) diff --git a/m4/ax_intel.m4 b/m4/ax_intel.m4 deleted file mode 100644 index 347a3a60fedbc..0000000000000 --- a/m4/ax_intel.m4 +++ /dev/null @@ -1,70 +0,0 @@ -AC_DEFUN([AX_INTEL_FEATURES], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - - case $target_cpu in - i[[3456]]86*|x86_64*|amd64*) - AX_CHECK_COMPILE_FLAG(-msse, ax_cv_support_sse_ext=yes, []) - if test x"$ax_cv_support_sse_ext" = x"yes"; then - INTEL_SSE_FLAGS="-msse -DINTEL_SSE" - AC_SUBST(INTEL_SSE_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE_FLAGS" - AC_DEFINE(HAVE_SSE,,[Support SSE (Streaming SIMD Extensions) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse2, ax_cv_support_sse2_ext=yes, []) - if test x"$ax_cv_support_sse2_ext" = x"yes"; then - INTEL_SSE2_FLAGS="-msse2 -DINTEL_SSE2" - AC_SUBST(INTEL_SSE2_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE2_FLAGS" - AC_DEFINE(HAVE_SSE2,,[Support SSE2 (Streaming SIMD Extensions 2) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse3, ax_cv_support_sse3_ext=yes, []) - if test x"$ax_cv_support_sse3_ext" = x"yes"; then - INTEL_SSE3_FLAGS="-msse3 -DINTEL_SSE3" - AC_SUBST(INTEL_SSE3_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE3_FLAGS" - AC_DEFINE(HAVE_SSE3,,[Support SSE3 (Streaming SIMD Extensions 3) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-mssse3, ax_cv_support_ssse3_ext=yes, []) - if test x"$ax_cv_support_ssse3_ext" = x"yes"; then - INTEL_SSSE3_FLAGS="-mssse3 -DINTEL_SSSE3" - AC_SUBST(INTEL_SSSE3_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSSE3_FLAGS" - AC_DEFINE(HAVE_SSSE3,,[Support SSSE3 (Supplemental Streaming SIMD Extensions 3) instructions]) - fi - ;; - esac - - case $target_cpu in - x86_64*|amd64*) - AX_CHECK_COMPILE_FLAG(-mpclmul, ax_cv_support_pclmuldq_ext=yes, []) - if test x"$ax_cv_support_pclmuldq_ext" = x"yes"; then - INTEL_PCLMUL_FLAGS="-mpclmul -DINTEL_SSE4_PCLMUL" - AC_SUBST(INTEL_PCLMUL_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_PCLMUL_FLAGS" - AC_DEFINE(HAVE_PCLMUL,,[Support (PCLMUL) Carry-Free Muliplication]) - fi - - AX_CHECK_COMPILE_FLAG(-msse4.1, ax_cv_support_sse41_ext=yes, []) - if test x"$ax_cv_support_sse41_ext" = x"yes"; then - INTEL_SSE4_1_FLAGS="-msse4.1 -DINTEL_SSE4" - AC_SUBST(INTEL_SSE4_1_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE4_1_FLAGS" - AC_DEFINE(HAVE_SSE4_1,,[Support SSE4.1 (Streaming SIMD Extensions 4.1) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse4.2, ax_cv_support_sse42_ext=yes, []) - if test x"$ax_cv_support_sse42_ext" = x"yes"; then - INTEL_SSE4_2_FLAGS="-msse4.2 -DINTEL_SSE4" - AC_SUBST(INTEL_SSE4_2_FLAGS) - INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE4_2_FLAGS" - AC_DEFINE(HAVE_SSE4_2,,[Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions]) - fi - ;; - esac - - AC_SUBST(INTEL_FLAGS) -]) diff --git a/man/.gitignore b/man/.gitignore index b60d7fc395a29..26b02c47cc506 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -1,3 +1,2 @@ -/Makefile /*.8 /doctrees diff --git a/man/Makefile-client.am b/man/Makefile-client.am deleted file mode 100644 index 0c4b6129f2049..0000000000000 --- a/man/Makefile-client.am +++ /dev/null @@ -1,37 +0,0 @@ -dist_man_MANS += \ - ceph-syn.8 \ - ceph-conf.8 \ - ceph.8 \ - ceph-authtool.8 \ - rados.8 \ - rbd.8 \ - ceph-post-file.8 \ - ceph-dencoder.8 - -if WITH_RADOS -dist_man_MANS += \ - librados-config.8 -endif - -if WITH_RBD -dist_man_MANS += \ - ceph-rbdnamer.8 \ - rbd-mirror.8 \ - rbd-nbd.8 \ - rbd-replay.8 \ - rbd-replay-many.8 \ - rbd-replay-prep.8 \ - rbdmap.8 -endif - -if WITH_FUSE -dist_man_MANS += \ - rbd-fuse.8 \ - ceph-fuse.8 -endif - -if WITH_RADOSGW -dist_man_MANS += \ - radosgw.8 \ - radosgw-admin.8 -endif diff --git a/man/Makefile-server.am b/man/Makefile-server.am deleted file mode 100644 index 6387346e060e6..0000000000000 --- a/man/Makefile-server.am +++ /dev/null @@ -1,33 +0,0 @@ -dist_man_MANS += \ - ceph-deploy.8 \ - crushtool.8 \ - ceph-run.8 \ - mount.ceph.8 \ - ceph-create-keys.8 \ - ceph-rest-api.8 \ - ceph-debugpack.8 - -if WITH_SELINUX -dist_man_MANS += \ - ceph_selinux.8 -endif - -if WITH_MON -dist_man_MANS += \ - ceph-mon.8 \ - monmaptool.8 -endif - -if WITH_OSD -dist_man_MANS += \ - ceph-clsinfo.8 \ - ceph-detect-init.8 \ - ceph-disk.8 \ - ceph-osd.8 \ - osdmaptool.8 -endif - -if WITH_MDS -dist_man_MANS += \ - ceph-mds.8 -endif diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 6a8ffea2e9307..0000000000000 --- a/man/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -AUTOMAKE_OPTIONS = gnu - -EXTRA_DIST = conf.py ceph_selinux.8 - -dist_man_MANS = - -if WITH_MAN_PAGES -if ENABLE_CLIENT -include Makefile-client.am -endif - -if ENABLE_SERVER -include Makefile-server.am -endif - -# prevent `make` from running in parallel, sphinx runs better in batch mode. -.PHONY: sphinx-build.stamp - -$(dist_man_MANS): sphinx-build.stamp - -# in a tree populated from dist tarball, the $(top_srcdir)/doc is not included -sphinx-build.stamp: - if [ -d $(top_srcdir)/doc/man ] ; then \ - ${SPHINX_BUILD} -b man -t man -d doctrees -c $(top_srcdir)/man $(top_srcdir)/doc/man $(top_builddir)/man; \ - fi - -clean-local:: - @rm -rf doctrees - -MAINTAINERCLEANFILES = $(dist_man_MANS) -endif diff --git a/selinux/.gitignore b/selinux/.gitignore index a26234fdd8713..6c00c988d5828 100644 --- a/selinux/.gitignore +++ b/selinux/.gitignore @@ -1,3 +1,2 @@ -/Makefile /ceph.pp /tmp diff --git a/selinux/Makefile.am b/selinux/Makefile.am deleted file mode 100644 index a4281c11ac6aa..0000000000000 --- a/selinux/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -EXTRA_DIST = \ - ceph.te \ - ceph.fc \ - ceph.if - -SELINUXROOT = $(DESTDIR)$(datadir)/selinux - -ceph.pp: ceph.te ceph.fc ceph.if - $(MAKE) -j1 -f $(datadir)/selinux/devel/Makefile ceph.pp - -if ENABLE_SERVER -if WITH_SELINUX -all-local:: ceph.pp - -install-exec-local:: - $(INSTALL) -d $(SELINUXROOT)/packages - $(INSTALL) -m 644 ceph.pp $(SELINUXROOT)/packages/ - $(INSTALL) -d $(SELINUXROOT)/devel/include/contrib - $(INSTALL) -m 644 ceph.if $(SELINUXROOT)/devel/include/contrib/ - -endif -endif diff --git a/src/.gitignore b/src/.gitignore index bece7abbbe779..2fa1c6df2b4c8 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,105 +1,3 @@ -# generic entries -Makefile -*.csv - # local directory specific entries /.git_version -/.libs -/acconfig.h* -/build -/ceph -/cephfs -/crushtool -/ceph-authtool -/ceph-client-debug -/cephfs-journal-tool -/cephfs-table-tool -/cephfs-data-scan -/ceph-conf -/ceph-coverage -/ceph-crush-location -/ceph-debugpack -/ceph-post-file -/ceph-dencoder -/ceph-fuse -/ceph-mds -/ceph-mon -/ceph-osd -/ceph-syn -/ceph.tmpe -/ceph.conf -/ceph_bench_log -/ceph-objectstore-tool -/ceph_multi_stress_watch -/ceph_erasure_code -/ceph_erasure_code_benchmark -/ceph_erasure_code_non_regression -/ceph_perf_local -/ceph_perf_msgr_server -/ceph_perf_msgr_client -/ceph_perf_objectstore -/ceph_psim -/ceph_radosacl -/ceph_rgw_jsonparser -/ceph_rgw_multiparser -/ceph_scratchtool -/ceph_scratchtoolpp -/ceph_test_* -/ceph_tpbench -/ceph_xattr_bench -/ceph_kvstorebench -/ceph_omapbench -/ceph_objectstore_bench -/ceph_smalliobench -/ceph_smalliobenchdumb -/ceph_smalliobenchfs -/ceph_smalliobenchrbd -/ceph-monstore-tool -/ceph-osdomap-tool -/ceph-kvstore-tool -/ceph-bluefs-tool /ceph_ver.h -/dev -/get_command_descriptions -/init-ceph -/keyring -/librados-config -/librgw_file* -/massif.out.* -/mnt -/monmaptool -/mount.ceph -/osdmaptool -/out -/rados -/radosgw -/radosgw-admin -/radosgw-token -/radosgw-object-expirer -/rbd -/rbd-mirror -/rbd-nbd -/rbd-fuse -/rbd-replay -/rbd-replay-prep -/sample.fetch_config -/simple_client -/simple_server -/TAGS -/tags -/testmsgr -/test_* -/test-suite.log -/cls_test_* -/unittest_* -/xio_client -/xio_server - -# old dir, may in use by older branches -/leveldb -/mkcephfs -/.ceph_port -/store_test_temp_dir - -# not sure what generates this... -/ceph.tmpe diff --git a/src/Makefile-client.am b/src/Makefile-client.am deleted file mode 100644 index 62b78c4c36026..0000000000000 --- a/src/Makefile-client.am +++ /dev/null @@ -1,112 +0,0 @@ -bash_completiondir = $(sysconfdir)/bash_completion.d -bash_completion_DATA = $(srcdir)/bash_completion/ceph - -bin_SCRIPTS += \ - ceph \ - ceph-post-file - -python_PYTHON += \ - pybind/ceph_argparse.py \ - pybind/ceph_daemon.py - -ceph_syn_SOURCES = ceph_syn.cc -ceph_syn_SOURCES += client/SyntheticClient.cc # uses g_conf.. needs cleanup -ceph_syn_LDADD = $(LIBCLIENT) $(CEPH_GLOBAL) -bin_PROGRAMS += ceph-syn - -# assemble Python script with global version variables -# NB: depends on format of ceph_ver.h - -ceph: ceph.in ./ceph_ver.h Makefile - rm -f $@ $@.tmp - cp $@.in $@.tmp - sed -ie "s|@PYTHON_EXECUTABLE@|/usr/bin/env python|" $@.tmp - grep CEPH_GIT_NICE_VER ./ceph_ver.h | cut -f 3 -d " " | sed s/\"//g | xargs -I "{}" sed -ie "s/@CEPH_GIT_NICE_VER@/{}/g" $@.tmp - grep CEPH_GIT_VER ./ceph_ver.h | cut -f 3 -d " " | sed s/\"//g | xargs -I "{}" sed -ie "s/@CEPH_GIT_VER@/{}/g" $@.tmp - chmod a+x $@.tmp - chmod a-w $@.tmp - mv $@.tmp $@ - - -if WITH_RADOS - -bash_completion_DATA += \ - $(srcdir)/bash_completion/rados \ - $(srcdir)/bash_completion/radosgw-admin - -librados_config_SOURCES = librados-config.cc -librados_config_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += librados-config - -if WITH_RBD - -bash_completion_DATA += \ - $(srcdir)/bash_completion/rbd - -bin_SCRIPTS += \ - ceph-rbdnamer \ - rbd-replay-many \ - rbdmap - -libkrbd_la_SOURCES = krbd.cc -libkrbd_la_LIBADD = $(LIBSECRET) $(LIBCOMMON) -lblkid -ludev -if LINUX -noinst_LTLIBRARIES += libkrbd.la -endif # LINUX - -endif # WITH_RBD - -# Fuse targets - -if WITH_FUSE -ceph_fuse_SOURCES = ceph_fuse.cc -ceph_fuse_LDADD = $(LIBCLIENT_FUSE) $(CEPH_GLOBAL) -ceph_fuse_CXXFLAGS = $(AM_CXXFLAGS) $(LIBFUSE_CFLAGS) -bin_PROGRAMS += ceph-fuse -sbin_SCRIPTS += mount.fuse.ceph - -if WITH_RBD -rbd_fuse_SOURCES = rbd_fuse/rbd-fuse.cc -rbd_fuse_CXXFLAGS = $(AM_CXXFLAGS) $(LIBFUSE_CFLAGS) -rbd_fuse_LDADD = $(LIBFUSE_LIBS) $(LIBRBD) $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += rbd-fuse -endif # WITH_RBD -endif # WITH_FUSE - - -if WITH_CEPHFS -mount_ceph_SOURCES = mount/mount.ceph.c -mount_ceph_LDADD = $(LIBSECRET) $(LIBCOMMON) -if LINUX -sbin_PROGRAMS += mount.ceph -endif # LINUX - -python_PYTHON += pybind/ceph_volume_client.py - -# libcephfs (this should go somewhere else in the future) - -libcephfs_la_SOURCES = libcephfs.cc -libcephfs_la_LIBADD = $(LIBCLIENT) $(LIBCOMMON) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -libcephfs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*' -if LINUX -libcephfs_la_LDFLAGS += -Xcompiler -Xlinker -Xcompiler '--exclude-libs=libcommon.a' -endif # LINUX -lib_LTLIBRARIES += libcephfs.la - -# jni library (java source is in src/java) - -if ENABLE_CEPHFS_JAVA -libcephfs_jni_la_SOURCES = \ - java/native/libcephfs_jni.cc \ - java/native/ScopedLocalRef.h \ - java/native/JniConstants.cpp \ - java/native/JniConstants.h -libcephfs_jni_la_LIBADD = $(LIBCEPHFS) $(LIBCOMMON) $(EXTRALIBS) -libcephfs_jni_la_CPPFLAGS = $(JDK_CPPFLAGS) $(AM_CPPFLAGS) -libcephfs_jni_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -lib_LTLIBRARIES += libcephfs_jni.la -endif # ENABLE_CEPHFS_JAVA - -endif # WITH_CEPHFS - -endif # WITH_RADOS diff --git a/src/Makefile-env.am b/src/Makefile-env.am deleted file mode 100644 index 98fdb01f46795..0000000000000 --- a/src/Makefile-env.am +++ /dev/null @@ -1,306 +0,0 @@ -AUTOMAKE_OPTIONS = gnu subdir-objects - -SUBDIRS = -DIST_SUBDIRS = -BUILT_SOURCES = -EXTRA_DIST = -CLEANFILES = -dist_noinst_DATA = - -noinst_HEADERS = -bin_PROGRAMS = -noinst_PROGRAMS = -bin_SCRIPTS = -sbin_PROGRAMS = -sbin_SCRIPTS = -su_sbin_PROGRAMS = -su_sbin_SCRIPTS = -dist_bin_SCRIPTS = -lib_LTLIBRARIES = -noinst_LTLIBRARIES = -noinst_LIBRARIES = -radoslib_LTLIBRARIES = - -# like bin_PROGRAMS, but these targets are only built for debug builds -bin_DEBUGPROGRAMS = - -# like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin -ceph_sbindir = $(sbindir) - -# certain things go straight into /sbin, though! -su_sbindir = /sbin - -# C/C++ tests to build and executed will be appended to this -check_TESTPROGRAMS = -check_PROGRAMS = $(check_TESTPROGRAMS) - -# tests scripts will be appended to this -check_SCRIPTS = - -# display the output of failed check_SCRIPTS after a failed make check -export VERBOSE = true - -# python unit tests need to know where the scripts are located -export PYTHONPATH=$(top_srcdir)/src/pybind - -# when doing a debug build, make sure to make the targets -if WITH_DEBUG -bin_PROGRAMS += $(bin_DEBUGPROGRAMS) -endif - - -################################## -## automake environment - -HARDENING_CFLAGS = \ - -O2 \ - -g \ - -pipe \ - -Wall \ - -Wp,-U_FORTIFY_SOURCE \ - -Wp,-D_FORTIFY_SOURCE=2 \ - -fexceptions \ - --param=ssp-buffer-size=4 \ - -fPIE - -SET_STACK_PROTECTOR_STRONG = $(shell expr `$(CC) -dumpversion` \>= 4.9) - - ifeq ($(SET_STACK_PROTECTOR_STRONG),1) - HARDENING_CFLAGS += -fstack-protector-strong - else - HARDENING_CFLAGS += -fstack-protector - endif - - -HARDENING_LDFLAGS = \ - -pie \ - -Wl,-z,relro \ - -Wl,-z,now - - -AM_COMMON_CPPFLAGS = \ - -D__CEPH__ \ - -D_FILE_OFFSET_BITS=64 \ - -D_THREAD_SAFE \ - -D__STDC_FORMAT_MACROS \ - -D_GNU_SOURCE \ - -DCEPH_LIBDIR=\"${libdir}\" \ - -DCEPH_PKGLIBDIR=\"${pkglibdir}\" - -if LINUX -AM_COMMON_CPPFLAGS += \ - -DGTEST_USE_OWN_TR1_TUPLE=0 \ - -D_REENTRANT -endif - -if FREEBSD -AM_COMMON_CPPFLAGS += \ - -D_REENTRANT -endif - -if DARWIN -AM_COMMON_CPPFLAGS += \ - -D_REENTRANT -endif - -if SOLARIS -AM_COMMON_CPPFLAGS += \ - -D_PTHREADS \ - -D_POSIX_C_SOURCE -endif - -AM_COMMON_CFLAGS = \ - -Wall \ - ${WARN_TYPE_LIMITS} \ - ${WARN_IGNORED_QUALIFIERS} \ - -Winit-self \ - -Wpointer-arith \ - ${WARN_ERROR_FORMAT_SECURITY} \ - -fno-strict-aliasing \ - -fsigned-char -if !CLANG - AM_COMMON_CFLAGS += ${RDYNAMIC_FLAG} -endif -if SOLARIS - AM_COMMON_CFLAGS += -Wno-unused-local-typedefs -endif - -AM_CFLAGS = $(AM_COMMON_CFLAGS) -if LINUX -AM_CFLAGS += $(HARDENING_CFLAGS) -endif -AM_CPPFLAGS = $(AM_COMMON_CPPFLAGS) -AM_CXXFLAGS = \ - @AM_CXXFLAGS@ \ - $(AM_COMMON_CFLAGS) \ - -ftemplate-depth-1024 \ - -Wnon-virtual-dtor \ - -Wno-invalid-offsetof -if LINUX -AM_CXXFLAGS += $(HARDENING_CFLAGS) -endif -if !CLANG - AM_CXXFLAGS += -Wstrict-null-sentinel -endif - - -# note: this is position dependant, it affects the -l options that -# come after it on the command line. when you use ${AM_LDFLAGS} in -# later rules, take care where you place it. for more information, see -# http://blog.flameeyes.eu/2008/11/19/relationship-between-as-needed-and-no-undefined-part-1-what-do-they-do -# http://blog.flameeyes.eu/2008/11/20/misguided-link-and-as-needed -# http://www.gentoo.org/proj/en/qa/asneeded.xml -# http://gcc.gnu.org/ml/gcc-help/2010-12/msg00338.html -# http://sigquit.wordpress.com/2011/02/16/why-asneeded-doesnt-work-as-expected-for-your-libraries-on-your-autotools-project/ -AM_LDFLAGS = -if LINUX -AM_LDFLAGS += -Wl,--as-needed $(HARDENING_LDFLAGS) -endif -if AIX -AM_LDFLAGS += -Wl,-brtl -endif - -if USE_BOOST_SPIRIT_OLD_HDR -AM_CXXFLAGS += -DUSE_BOOST_SPIRIT_OLD_HDR -endif - -if WITH_LIBATOMIC -AM_LDFLAGS += -latomic_ops -endif - -if ENABLE_COVERAGE -AM_CFLAGS += -fprofile-arcs -ftest-coverage -AM_CXXFLAGS += -fprofile-arcs -ftest-coverage -O0 -endif - -CCAS = ${srcdir}/yasm-wrapper -AM_CCASFLAGS = -f elf64 - - -##################### -## library definitions and dependencies - -EXTRALIBS = -lm -if FREEBSD -EXTRALIBS += -lexecinfo -endif # FREEBSD - -if LINUX -EXTRALIBS += -lrt -endif # LINUX - -if WITH_PROFILER -EXTRALIBS += -lprofiler -endif # PROFILER - -LIBGLOBAL = libglobal.la -LIBCOMMON = libcommon.la -LIBSECRET = libsecret.la -LIBARCH = libarch.la -LIBPERFGLUE = libperfglue.la -LIBAUTH = libauth.la -LIBMSG = libmsg.la -LIBCRUSH = libcrush.la -LIBCOMPRESSOR = libcompressor.la -LIBJSON_SPIRIT = libjson_spirit.la -LIBKV = libkv.a -LIBLOG = liblog.la -LIBOS = libos.a -LIBOS_TYPES = libos_types.a -LIBOSD = libosd.a -LIBOSD_TYPES = libosd_types.la -LIBOSDC = libosdc.la -LIBMON = libmon.a -LIBMON_TYPES = libmon_types.la -LIBMDS = libmds.la -LIBCLIENT = libclient.la -LIBCLIENT_FUSE = libclient_fuse.la -LIBRADOS = librados.la -LIBRADOSSTRIPER = libradosstriper.la -LIBRGW = librgw.la -LIBCIVETWEB = libcivetweb.la -LIBRBD = librbd.la -LIBRBD_TYPES = librbd_types.la -LIBKRBD = libkrbd.la -LIBCEPHFS = libcephfs.la -LIBERASURE_CODE = liberasure_code.la - -if WITH_LIBAIO -LIBOS += -laio -endif # WITH_LIBAIO - -if WITH_LIBZFS -LIBOS += libos_zfs.a -lzfs -endif # WITH_LIBZFS - -if WITH_SPDK -LIBOS += ${LIBSPDK_LIBS} ${LIBDPDK_LIBS} ${LIBPCIACCESS_LIBS} -endif # WITH_SPDK - -if WITH_TCMALLOC_MINIMAL -LIBPERFGLUE += -ltcmalloc_minimal -endif # WITH_TCMALLOC_MINIMAL - -if WITH_TCMALLOC -LIBPERFGLUE += -ltcmalloc -endif # WITH_TCMALLOC - -if WITH_JEMALLOC -LIBMON += -ljemalloc -LIBOSD += -ljemalloc -LIBMDS += -ljemalloc -LIBRGW += -ljemalloc -LIBCLIENT_FUSE += -ljemalloc -endif # WITH_JEMALLOC - -if ENABLE_COVERAGE -EXTRALIBS += -lgcov -endif # ENABLE_COVERAGE - -# Libosd always needs osdc and os -LIBOSD += $(LIBOSDC) $(LIBOS) - -# These have references to syms like ceph_using_tcmalloc(), glue libperfglue to them -LIBMON += $(LIBPERFGLUE) -LIBOSD += $(LIBPERFGLUE) -LIBMDS += $(LIBPERFGLUE) -LIBCLIENT_FUSE += $(LIBPERFGLUE) - -# OSD needs types -LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES) - -# libkv/libos linking order is ornery -if WITH_SLIBROCKSDB -LIBKV += rocksdb/librocksdb.a -if HAVE_BZLIB -LIBKV += -lbz2 -endif -if HAVE_LZ4 -LIBKV += -llz4 -endif -endif # WITH_SLIBROCKSDB -LIBKV += -lz -lleveldb -lsnappy -LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS) - -LIBMON += $(LIBMON_TYPES) - -# Use this for binaries requiring libglobal -CEPH_GLOBAL = $(LIBGLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) - -# This is set by [lib]/Makefile.am and used for build tests -LIBCOMMON_DEPS = -LIBRADOS_DEPS = -LIBRGW_DEPS = -LIBCIVETWEB_DEPS = - -# This is used by the dencoder test -DENCODER_SOURCES = -DENCODER_DEPS = - -# put virtualenvs in this directory -# otherwise it may overflow #! 80 kernel limit -# beware that some build environments might not be able to write to /tmp -export TMPDIR ?= /tmp -export CEPH_BUILD_VIRTUALENV = $(TMPDIR) - -radoslibdir = $(libdir)/rados-classes diff --git a/src/Makefile-server.am b/src/Makefile-server.am deleted file mode 100644 index fecae94b35e62..0000000000000 --- a/src/Makefile-server.am +++ /dev/null @@ -1,65 +0,0 @@ -ceph_sbin_SCRIPTS = ceph-create-keys - -bin_SCRIPTS += \ - ceph-run \ - ceph-rest-api \ - ceph-debugpack \ - ceph-crush-location - -python_PYTHON += pybind/ceph_rest_api.py - -shell_scripts += ceph-coverage - -bin_SCRIPTS += ceph-coverage - -BUILT_SOURCES += init-ceph - -shell_scripts += init-ceph - - -if WITH_MON - -ceph_mon_SOURCES = ceph_mon.cc -ceph_mon_LDADD = $(LIBMON) $(LIBOS) $(CEPH_GLOBAL) $(LIBCOMMON) $(LIBAUTH) $(LIBCOMMON) $(LIBMON_TYPES) -bin_PROGRAMS += ceph-mon - -endif # WITH_MON - - -if WITH_OSD - -ceph_sbin_SCRIPTS += \ - ceph-disk-udev - -bin_SCRIPTS += \ - ceph-clsinfo - -ceph_osd_SOURCES = ceph_osd.cc -ceph_osd_LDADD = \ - $(LIBOSDC) $(LIBOSD) $(LIBOSD_TYPES) $(LIBOS_TYPES) \ - $(LIBOS) \ - $(CEPH_GLOBAL) $(LIBCOMMON) -if WITH_LTTNG -ceph_osd_LDADD += $(LIBOSD_TP) -endif -bin_PROGRAMS += ceph-osd - -endif # WITH_OSD - - -if WITH_MDS - -ceph_mds_SOURCES = ceph_mds.cc -ceph_mds_LDADD = $(LIBMDS) $(LIBOSDC) $(CEPH_GLOBAL) $(LIBCOMMON) -bin_PROGRAMS += ceph-mds - -endif # WITH_MDS - - -if ENABLE_COVERAGE - -COV_DIR = $(DESTDIR)$(libdir)/ceph/coverage -COV_FILES = $(srcdir)/*.gcno -COV_LIB_FILES = $(srcdir)/.libs/*.gcno - -endif # ENABLE_COVERAGE diff --git a/src/Makefile-spdk.am b/src/Makefile-spdk.am deleted file mode 100644 index ce086673f4ff3..0000000000000 --- a/src/Makefile-spdk.am +++ /dev/null @@ -1,48 +0,0 @@ -EXTRA_DIST += \ - spdk/PORTING.md \ - spdk/README.md \ - spdk/LICENSE \ - spdk/CONFIG \ - spdk/autotest.sh \ - spdk/autopackage.sh \ - spdk/Makefile \ - spdk/autobuild.sh \ - spdk/lib/nvme/nvme_ns.c \ - spdk/lib/nvme/nvme_qpair.c \ - spdk/lib/nvme/nvme_impl.h \ - spdk/lib/nvme/nvme.c \ - spdk/lib/nvme/nvme_ns_cmd.c \ - spdk/lib/nvme/nvme_ctrlr.c \ - spdk/lib/nvme/Makefile \ - spdk/lib/nvme/nvme_internal.h \ - spdk/lib/nvme/nvme_ctrlr_cmd.c \ - spdk/lib/memory/vtophys.c \ - spdk/lib/memory/Makefile \ - spdk/lib/util/file.c \ - spdk/lib/util/string.c \ - spdk/lib/util/Makefile \ - spdk/lib/util/pci.c \ - spdk/lib/Makefile \ - spdk/lib/ioat/ioat.c \ - spdk/lib/ioat/ioat_pci.h \ - spdk/lib/ioat/ioat_impl.h \ - spdk/lib/ioat/Makefile \ - spdk/lib/ioat/ioat_internal.h \ - spdk/mk/spdk.deps.mk \ - spdk/mk/spdk.subdirs.mk \ - spdk/mk/spdk.common.mk \ - spdk/include/spdk/string.h \ - spdk/include/spdk/ioat.h \ - spdk/include/spdk/queue.h \ - spdk/include/spdk/pci_ids.h \ - spdk/include/spdk/nvme.h \ - spdk/include/spdk/ioat_spec.h \ - spdk/include/spdk/nvme_spec.h \ - spdk/include/spdk/nvme_intel.h \ - spdk/include/spdk/pci.h \ - spdk/include/spdk/vtophys.h \ - spdk/include/spdk/queue_extras.h \ - spdk/include/spdk/file.h \ - spdk/include/spdk/assert.h \ - spdk/include/spdk/barrier.h \ - spdk/include/spdk/mmio.h diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 4e96326036fa8..0000000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,322 +0,0 @@ -include Makefile-env.am - -# a workaround for http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18744, this -# bug was fixed in automake 1.15, but automake 1.13 is supported by us. so -# we can not just require 1.15 using `AM_INIT_AUTOMAKE` -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} - -SUBDIRS += ocf java -DIST_SUBDIRS += googletest/googlemock ocf java - -LOCAL_ALL = -LOCAL_CLEAN = -LOCAL_INSTALLDATA = -LOCAL_INSTALLEXEC = - -if NO_GIT_VERSION -export NO_VERSION="yes" -endif - -# subdirs - -include arch/Makefile.am -include auth/Makefile.am -include brag/Makefile.am -include ceph-detect-init/Makefile.am -include ceph-disk/Makefile.am -include crush/Makefile.am -include kv/Makefile.am -include mon/Makefile.am -include mds/Makefile.am -include os/Makefile.am -include osd/Makefile.am -include erasure-code/Makefile.am -include compressor/Makefile.am -include osdc/Makefile.am -include client/Makefile.am -include global/Makefile.am -include json_spirit/Makefile.am -include log/Makefile.am -include perfglue/Makefile.am -include common/Makefile.am -include msg/Makefile.am -include messages/Makefile.am -include include/Makefile.am -include librados/Makefile.am -include libradosstriper/Makefile.am -include journal/Makefile.am -include librbd/Makefile.am -include rgw/Makefile.am -include cls/Makefile.am -include key_value_store/Makefile.am -include rbd_replay/Makefile.am -include test/Makefile.am -include tools/Makefile.am -include Makefile-rocksdb.am -include Makefile-spdk.am -include tracing/Makefile.am -include pybind/Makefile.am - - -# shell scripts - -editpaths = sed \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@sbindir[@]|$(sbindir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ - -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@datadir[@]|$(pkgdatadir)|g' \ - -e 's|@prefix[@]|$(prefix)|g' \ - -e 's|@libexecdir[@]|$(libexecdir)|g' \ - -e 's|@@GCOV_PREFIX_STRIP[@][@]|$(GCOV_PREFIX_STRIP)|g' -shell_scripts = ceph-debugpack ceph-post-file ceph-crush-location -$(shell_scripts): Makefile -$(shell_scripts): %: %.in - rm -f $@ $@.tmp - $(editpaths) '$(srcdir)/$@.in' >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv $@.tmp $@ - -EXTRA_DIST += $(srcdir)/$(shell_scripts:%=%.in) -CLEANFILES += $(shell_scripts) - - -# extra bits - -EXTRA_DIST += \ - $(srcdir)/vstart.sh \ - $(srcdir)/stop.sh \ - ceph-run \ - $(srcdir)/ceph-osd-prestart.sh \ - $(srcdir)/ceph_common.sh \ - $(srcdir)/init-radosgw \ - $(srcdir)/init-rbdmap \ - $(srcdir)/ceph-clsinfo \ - $(srcdir)/make_version \ - $(srcdir)/.git_version \ - $(srcdir)/ceph-rbdnamer \ - $(srcdir)/tools/ceph-monstore-update-crush.sh \ - $(srcdir)/script/subman \ - $(srcdir)/upstart/ceph-all.conf \ - $(srcdir)/upstart/ceph-disk.conf \ - $(srcdir)/upstart/ceph-mon.conf \ - $(srcdir)/upstart/ceph-mon-all.conf \ - $(srcdir)/upstart/ceph-mon-all-starter.conf \ - $(srcdir)/upstart/ceph-create-keys.conf \ - $(srcdir)/upstart/ceph-osd.conf \ - $(srcdir)/upstart/ceph-osd-all.conf \ - $(srcdir)/upstart/ceph-osd-all-starter.conf \ - $(srcdir)/upstart/ceph-mds.conf \ - $(srcdir)/upstart/ceph-mds-all.conf \ - $(srcdir)/upstart/ceph-mds-all-starter.conf \ - $(srcdir)/upstart/ceph-rbd-mirror.conf \ - $(srcdir)/upstart/ceph-rbd-mirror-all.conf \ - $(srcdir)/upstart/ceph-rbd-mirror-all-starter.conf \ - $(srcdir)/upstart/radosgw.conf \ - $(srcdir)/upstart/radosgw-all.conf \ - $(srcdir)/upstart/radosgw-all-starter.conf \ - $(srcdir)/upstart/rbdmap.conf \ - ceph.in \ - ceph-disk-udev \ - ceph-create-keys \ - ceph-rest-api \ - ceph-crush-location \ - mount.fuse.ceph \ - rbd-replay-many \ - rbdmap \ - etc-rbdmap \ - yasm-wrapper - -EXTRA_DIST += \ - unittest_bufferlist.sh - - -# work around old versions of automake that don't define $docdir -# NOTE: this won't work on suse, where docdir is /usr/share/doc/packages/$package. -docdir ?= ${datadir}/doc/ceph -doc_DATA = $(srcdir)/sample.ceph.conf sample.fetch_config - - -# various scripts in $(libexecdir) - -ceph_libexecdir = $(libexecdir)/ceph -ceph_libexec_SCRIPTS = ceph_common.sh ceph-osd-prestart.sh - -if ENABLE_SUBMAN -submandir = /etc/cron.hourly -subman_DATA = script/subman -endif - -# tests to actually run on "make check"; if you need extra, non-test, -# executables built, you need to replace this with manual assignments -# target by target - -TESTS = \ - $(check_TESTPROGRAMS) \ - $(check_SCRIPTS) - -check_SCRIPTS += \ - ../qa/workunits/erasure-code/encode-decode-non-regression.sh \ - test/encoding/readable.sh - -if WITH_LTTNG -# TODO: If we're running the parallel test harness (the preferred harness), this should be AM_TESTS_ENVIRONMENT instead. -# See: https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html -# I don't see the serial-tests Automake option anywhere, but my AM_TESTS_ENVIRONMENT was being ignored. -TESTS_ENVIRONMENT = LD_PRELOAD=liblttng-ust-fork.so; export LD_PRELOAD; echo "LD_PRELOAD=$${LD_PRELOAD}"; -endif - -AM_TESTS_ENVIRONMENT = export CEPH_ROOT="$(abs_top_srcdir)"; -AM_TESTS_ENVIRONMENT += export CEPH_BUILD_DIR="$(abs_srcdir)"; -AM_TESTS_ENVIRONMENT += export CEPH_BIN="$(abs_srcdir)"; -AM_TESTS_ENVIRONMENT += export CEPH_LIB="$(abs_srcdir)/.libs"; -AM_TESTS_ENVIRONMENT += export PATH="$(abs_srcdir):$$PATH"; - -# base targets - -core-daemons: ceph-mon ceph-osd ceph-mds radosgw -admin-tools: monmaptool osdmaptool crushtool ceph-authtool -base: core-daemons admin-tools \ - cephfs ceph-fuse ceph-syn ceph-conf \ - rados radosgw-admin librados-config \ - init-ceph ceph-post-file \ - ceph - - -# version stuff - -FORCE: -.git_version: FORCE - $(srcdir)/make_version -g $(srcdir)/.git_version - -# if NO_VERSION is set, only generate a new ceph_ver.h if there currently -# is none, and call "make_version -n" to fill it with a fixed string. -# Otherwise, set it from the contents of .git_version. - -ceph_ver.h: .git_version FORCE - if [ -n "$$NO_VERSION" ] ; then \ - $(srcdir)/make_version -g $(srcdir)/.git_version -c $(srcdir)/ceph_ver.h -n ; \ - else \ - $(srcdir)/make_version -g $(srcdir)/.git_version -c $(srcdir)/ceph_ver.h ; \ - fi - -ceph_ver.c: ./ceph_ver.h -common/version.cc: ./ceph_ver.h -test/encoding/ceph_dencoder.cc: ./ceph_ver.h - -sample.fetch_config: fetch_config - cp -f $(srcdir)/fetch_config ./sample.fetch_config - -dist-hook: - $(srcdir)/make_version -g $(srcdir)/.git_version - -CLEANFILES += ceph_ver.h sample.fetch_config - - -# cleaning - -base-clean-local:: - rm -f *.so - find . -name '*.gcno' -o -name '*.gcda' -o -name '*.lcov' -o -name "*.o" -o -name "*.lo" | xargs rm -f - rm -f ceph java/java/com/ceph/crush/Bucket.class - -LOCAL_CLEAN += base-clean-local - -# pybind - -python_PYTHON = - -# everything else we want to include in a 'make dist' - -noinst_HEADERS += \ - cls_acl.cc\ - cls_crypto.cc\ - fetch_config\ - logrotate.conf\ - sample.ceph.conf\ - bash_completion/ceph \ - bash_completion/rados \ - bash_completion/rbd \ - bash_completion/radosgw-admin \ - mount/canonicalize.c \ - mount/mtab.c \ - objclass/objclass.h - - -# coverage - - -install-coverage: -if ENABLE_COVERAGE - -mkdir -p $(COV_DIR)/.libs - -$(INSTALL_DATA) $(COV_FILES) $(COV_DIR) - -$(INSTALL_DATA) $(COV_LIB_FILES) $(COV_DIR)/.libs -endif - -uninstall-coverage: -if ENABLE_COVERAGE - -rm $(COV_DIR)/*.gcno - -rm $(COV_DIR)/.libs/*.gcno - -rmdir -p $(COV_DIR)/.libs - -rmdir -p $(COV_DIR) -endif - -check-coverage: -if ENABLE_COVERAGE - -test/coverage.sh -d $(srcdir) -o check-coverage make check -endif - -base-install-data-local:: install-coverage - -mkdir -p $(DESTDIR)$(sysconfdir)/ceph - -mkdir -p $(DESTDIR)$(localstatedir)/log/ceph - -mkdir -p $(DESTDIR)$(localstatedir)/lib/ceph/tmp - -LOCAL_INSTALLDATA += base-install-data-local - -uninstall-local:: uninstall-coverage - -rmdir -p $(DESTDIR)$(sysconfdir)/ceph/ - -rmdir -p $(DESTDIR)$(localstatedir)/log/ceph - -rmdir -p $(DESTDIR)$(localstatedir)/lib/ceph/tmp - -# -# coverity rules expect: -# - cov-build to be in the path -# - password in ~/coverity.build.pass.txt -# - ability to scp into the ceph.com directory -# -project.tgz: clean - rm -rf cov-int - cov-build --dir cov-int make - echo Sage Weil sage@newdream.net ceph >> README - tar czvf project.tgz README cov-int - rm -f README - -coverity-submit: - scp project.tgz ceph.com:/home/ceph_site/ceph.com/coverity/`git describe`.tgz - curl --data "project=ceph&password=`cat ~/coverity.build.pass.txt`&email=sage@newdream.net&url=http://ceph.com/coverity/`git describe`.tgz" http://scan5.coverity.com/cgi-bin/submit_build.py - -if ENABLE_CLIENT -include Makefile-client.am -endif - -if ENABLE_SERVER -include Makefile-server.am -endif - -# local targets - -all-local:: $(LOCAL_ALL) -clean-local:: $(LOCAL_CLEAN) -install-exec-local:: $(LOCAL_INSTALLEXEC) -install-data-local:: $(LOCAL_INSTALLDATA) diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am deleted file mode 100644 index 81df60e0e2d51..0000000000000 --- a/src/arch/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -libarch_la_SOURCES = \ - arch/intel.c \ - arch/arm.c \ - arch/probe.cc - -noinst_LTLIBRARIES += libarch.la - -noinst_HEADERS += \ - arch/intel.h \ - arch/arm.h \ - arch/probe.h diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am deleted file mode 100644 index f7f3b386df5ea..0000000000000 --- a/src/auth/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -libauth_la_SOURCES = \ - auth/AuthAuthorizeHandler.cc \ - auth/AuthClientHandler.cc \ - auth/AuthSessionHandler.cc \ - auth/AuthServiceHandler.cc \ - auth/AuthMethodList.cc \ - auth/cephx/CephxAuthorizeHandler.cc \ - auth/cephx/CephxClientHandler.cc \ - auth/cephx/CephxProtocol.cc \ - auth/cephx/CephxServiceHandler.cc \ - auth/cephx/CephxSessionHandler.cc \ - auth/cephx/CephxKeyServer.cc \ - auth/none/AuthNoneAuthorizeHandler.cc \ - auth/unknown/AuthUnknownAuthorizeHandler.cc \ - auth/Crypto.cc \ - auth/KeyRing.cc \ - auth/RotatingKeyRing.cc -noinst_LTLIBRARIES += libauth.la - -noinst_HEADERS += \ - auth/cephx/CephxAuthorizeHandler.h \ - auth/cephx/CephxKeyServer.h \ - auth/cephx/CephxProtocol.h \ - auth/cephx/CephxClientHandler.h \ - auth/cephx/CephxServiceHandler.h \ - auth/cephx/CephxSessionHandler.h \ - auth/none/AuthNoneAuthorizeHandler.h \ - auth/none/AuthNoneClientHandler.h \ - auth/none/AuthNoneServiceHandler.h \ - auth/none/AuthNoneSessionHandler.h \ - auth/none/AuthNoneProtocol.h \ - auth/unknown/AuthUnknownAuthorizeHandler.h \ - auth/unknown/AuthUnknownClientHandler.h \ - auth/unknown/AuthUnknownServiceHandler.h \ - auth/unknown/AuthUnknownSessionHandler.h \ - auth/unknown/AuthUnknownProtocol.h \ - auth/Auth.h \ - auth/AuthMethodList.h \ - auth/AuthClientHandler.h \ - auth/AuthServiceHandler.h \ - auth/AuthSessionHandler.h \ - auth/AuthAuthorizeHandler.h \ - auth/KeyRing.h \ - auth/RotatingKeyRing.h \ - auth/Crypto.h - diff --git a/src/brag/Makefile.am b/src/brag/Makefile.am deleted file mode 100644 index 32456b01c751c..0000000000000 --- a/src/brag/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -if ENABLE_CLIENT -bin_SCRIPTS += brag/client/ceph-brag -EXTRA_DIST += brag/server brag/README.md brag/client -endif # ENABLE_CLIENT diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am deleted file mode 100644 index a2d1879c28ed1..0000000000000 --- a/src/ceph-detect-init/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (C) 2015 SUSE LINUX GmbH -# Copyright (C) 2015 -# -# Author: Owen Synge -# Author: Loic Dachary -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see ``. -# -check_SCRIPTS += ceph-detect-init/run-tox.sh - -EXTRA_DIST += \ - ceph-detect-init/AUTHORS.rst \ - 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 \ - ceph-detect-init/ceph_detect_init/__init__.py \ - ceph-detect-init/ceph_detect_init/rhel/__init__.py \ - ceph-detect-init/ceph_detect_init/fedora/__init__.py \ - ceph-detect-init/ceph_detect_init/debian/__init__.py \ - ceph-detect-init/ceph_detect_init/suse/__init__.py \ - ceph-detect-init/integration/centos-6.dockerfile \ - ceph-detect-init/integration/debian-wheezy.dockerfile \ - ceph-detect-init/integration/debian-sid.dockerfile \ - ceph-detect-init/integration/debian-jessie.dockerfile \ - ceph-detect-init/integration/opensuse-13.1.dockerfile \ - ceph-detect-init/integration/fedora-21.dockerfile \ - ceph-detect-init/integration/ubuntu-14.04.dockerfile \ - ceph-detect-init/integration/test_main.py \ - ceph-detect-init/integration/opensuse-13.2.dockerfile \ - ceph-detect-init/integration/ubuntu-12.04.dockerfile \ - ceph-detect-init/integration/centos-7.dockerfile \ - ceph-detect-init/integration/ubuntu-15.04.dockerfile \ - ceph-detect-init/integration/debian-squeeze.dockerfile \ - ceph-detect-init/Makefile.am \ - ceph-detect-init/MANIFEST.in \ - ceph-detect-init/README.rst \ - ceph-detect-init/requirements.txt \ - ceph-detect-init/run-tox.sh \ - ceph-detect-init/setup.py \ - ceph-detect-init/test-requirements.txt \ - ceph-detect-init/tests/test_all.py \ - ceph-detect-init/tox.ini - -export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv - -ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV} - -${CEPH_DETECT_INIT_VIRTUALENV}: - cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . - -ceph-detect-init-clean: - cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info - -ceph-detect-init-install-data: - cd $(srcdir)/ceph-detect-init ; \ - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=$(prefix) ; \ - fi ; \ - root="--root=$(DESTDIR)" ; \ - fi ; \ - python setup.py install $$root $$options - -LOCAL_ALL += ceph-detect-init-all -LOCAL_CLEAN += ceph-detect-init-clean -LOCAL_INSTALLDATA += ceph-detect-init-install-data diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am deleted file mode 100644 index 0cf1d6bad022f..0000000000000 --- a/src/ceph-disk/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2015 -# -# Author: Loic Dachary -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Library Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Library Public License for more details. -# -check_SCRIPTS += ceph-disk/run-tox.sh - -EXTRA_DIST += \ - ceph-disk/AUTHORS.rst \ - ceph-disk/ceph_disk/__init__.py \ - ceph-disk/ceph_disk/main.py \ - ceph-disk/Makefile.am \ - ceph-disk/MANIFEST.in \ - ceph-disk/README.rst \ - ceph-disk/requirements.txt \ - ceph-disk/run-tox.sh \ - ceph-disk/setup.py \ - ceph-disk/test-requirements.txt \ - ceph-disk/tests/test_main.py \ - ceph-disk/tox.ini - -export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv - -ceph-disk-all: ${CEPH_DISK_VIRTUALENV} - -${CEPH_DISK_VIRTUALENV}: - cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . - -ceph-disk-clean: - cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info - -ceph-disk-install-data: - cd $(srcdir)/ceph-disk ; \ - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=$(prefix) ; \ - fi ; \ - root="--root=$(DESTDIR) --install-script=$(sbindir)" ; \ - fi ; \ - python setup.py install $$root $$options - -LOCAL_ALL += ceph-disk-all -LOCAL_CLEAN += ceph-disk-clean -LOCAL_INSTALLDATA += ceph-disk-install-data diff --git a/src/client/Makefile.am b/src/client/Makefile.am deleted file mode 100644 index fa0dc80f4cf8b..0000000000000 --- a/src/client/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -if ENABLE_CLIENT -libclient_la_SOURCES = \ - client/Client.cc \ - client/Inode.cc \ - client/Dentry.cc \ - client/MetaRequest.cc \ - client/ClientSnapRealm.cc \ - client/MetaSession.cc \ - client/Trace.cc \ - client/posix_acl.cc -libclient_la_LIBADD = $(LIBOSDC) -noinst_LTLIBRARIES += libclient.la - -noinst_HEADERS += \ - client/Client.h \ - client/Dentry.h \ - client/Dir.h \ - client/Fh.h \ - client/Inode.h \ - client/InodeRef.h \ - client/MetaRequest.h \ - client/MetaSession.h \ - client/ClientSnapRealm.h \ - client/SyntheticClient.h \ - client/Trace.h \ - client/ioctl.h \ - client/ObjecterWriteback.h \ - client/posix_acl.h \ - client/UserGroups.h - -if WITH_FUSE -libclient_fuse_la_SOURCES = client/fuse_ll.cc -libclient_fuse_la_LIBADD = libclient.la $(LIBFUSE_LIBS) -libclient_fuse_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBFUSE_CFLAGS) -noinst_LTLIBRARIES += libclient_fuse.la -noinst_HEADERS += client/fuse_ll.h -endif - -ceph_test_ioctls_SOURCES = client/test_ioctls.c -bin_DEBUGPROGRAMS += ceph_test_ioctls - -endif # ENABLE_CLIENT diff --git a/src/cls/Makefile-client.am b/src/cls/Makefile-client.am deleted file mode 100644 index 3e26db05a7c39..0000000000000 --- a/src/cls/Makefile-client.am +++ /dev/null @@ -1,104 +0,0 @@ -## Rados object client classes - -libcls_lock_client_la_SOURCES = \ - cls/lock/cls_lock_client.cc \ - cls/lock/cls_lock_types.cc \ - cls/lock/cls_lock_ops.cc -noinst_LTLIBRARIES += libcls_lock_client.la -DENCODER_DEPS += libcls_lock_client.la - -libcls_refcount_client_la_SOURCES = \ - cls/refcount/cls_refcount_client.cc \ - cls/refcount/cls_refcount_ops.cc -noinst_LTLIBRARIES += libcls_refcount_client.la -DENCODER_DEPS += libcls_refcount_client.la - -libcls_version_client_la_SOURCES = \ - cls/version/cls_version_client.cc \ - cls/version/cls_version_types.cc -noinst_LTLIBRARIES += libcls_version_client.la - -libcls_log_client_la_SOURCES = cls/log/cls_log_client.cc -noinst_LTLIBRARIES += libcls_log_client.la - -libcls_statelog_client_la_SOURCES = cls/statelog/cls_statelog_client.cc -noinst_LTLIBRARIES += libcls_statelog_client.la - -libcls_timeindex_client_la_SOURCES = cls/timeindex/cls_timeindex_client.cc -noinst_LTLIBRARIES += libcls_timeindex_client.la - -libcls_replica_log_client_la_SOURCES = \ - cls/replica_log/cls_replica_log_types.cc \ - cls/replica_log/cls_replica_log_ops.cc \ - cls/replica_log/cls_replica_log_client.cc -noinst_LTLIBRARIES += libcls_replica_log_client.la -DENCODER_DEPS += libcls_replica_log_client.la - -libcls_rgw_client_la_SOURCES = \ - cls/rgw/cls_rgw_client.cc \ - cls/rgw/cls_rgw_types.cc \ - cls/rgw/cls_rgw_ops.cc -noinst_LTLIBRARIES += libcls_rgw_client.la -DENCODER_DEPS += libcls_rgw_client.la - -libcls_rbd_client_la_SOURCES = \ - cls/rbd/cls_rbd_client.cc \ - cls/rbd/cls_rbd_types.cc -noinst_LTLIBRARIES += libcls_rbd_client.la -DENCODER_DEPS += libcls_rbd_client.la - -libcls_user_client_la_SOURCES = cls/user/cls_user_client.cc \ - cls/user/cls_user_types.cc \ - cls/user/cls_user_ops.cc -DENCODER_DEPS += libcls_user_client.la - -noinst_LTLIBRARIES += libcls_user_client.la - -libcls_cephfs_client_la_SOURCES = cls/cephfs/cls_cephfs_client.cc -noinst_LTLIBRARIES += libcls_cephfs_client.la - -libcls_numops_client_la_SOURCES = cls/numops/cls_numops_client.cc -noinst_LTLIBRARIES += libcls_numops_client.la -DENCODER_DEPS += libcls_numops_client.la - -libcls_journal_client_la_SOURCES = \ - cls/journal/cls_journal_client.cc \ - cls/journal/cls_journal_types.cc -noinst_LTLIBRARIES += libcls_journal_client.la -DENCODER_DEPS += libcls_journal_client.la - -noinst_HEADERS += \ - cls/lock/cls_lock_types.h \ - cls/lock/cls_lock_ops.h \ - cls/lock/cls_lock_client.h \ - cls/numops/cls_numops_client.h \ - cls/rbd/cls_rbd.h \ - cls/rbd/cls_rbd_client.h \ - cls/rbd/cls_rbd_types.h \ - cls/refcount/cls_refcount_ops.h \ - cls/refcount/cls_refcount_client.h \ - cls/version/cls_version_types.h \ - cls/version/cls_version_ops.h \ - cls/version/cls_version_client.h \ - cls/log/cls_log_types.h \ - cls/log/cls_log_ops.h \ - cls/log/cls_log_client.h \ - cls/statelog/cls_statelog_types.h \ - cls/statelog/cls_statelog_ops.h \ - cls/statelog/cls_statelog_client.h \ - cls/timeindex/cls_timeindex_types.h \ - cls/timeindex/cls_timeindex_ops.h \ - cls/timeindex/cls_timeindex_client.h \ - cls/replica_log/cls_replica_log_types.h \ - cls/replica_log/cls_replica_log_ops.h \ - cls/replica_log/cls_replica_log_client.h \ - cls/rgw/cls_rgw_client.h \ - cls/rgw/cls_rgw_ops.h \ - cls/rgw/cls_rgw_types.h \ - cls/user/cls_user_client.h \ - cls/user/cls_user_ops.h \ - cls/user/cls_user_types.h \ - cls/cephfs/cls_cephfs.h \ - cls/cephfs/cls_cephfs_client.h \ - cls/journal/cls_journal_client.h \ - cls/journal/cls_journal_types.h diff --git a/src/cls/Makefile-server.am b/src/cls/Makefile-server.am deleted file mode 100644 index 9b081bc97189d..0000000000000 --- a/src/cls/Makefile-server.am +++ /dev/null @@ -1,84 +0,0 @@ -## Rados object classes - -if WITH_OSD -libcls_hello_la_SOURCES = cls/hello/cls_hello.cc -libcls_hello_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_hello.la - -libcls_numops_la_SOURCES = cls/numops/cls_numops.cc -libcls_numops_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_numops.la - -libcls_rbd_la_SOURCES = \ - cls/rbd/cls_rbd.cc \ - cls/rbd/cls_rbd_types.cc -libcls_rbd_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_rbd.la - -libcls_lock_la_SOURCES = cls/lock/cls_lock.cc -libcls_lock_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_lock.la - -libcls_refcount_la_SOURCES = \ - cls/refcount/cls_refcount.cc \ - cls/refcount/cls_refcount_ops.cc \ - common/ceph_json.cc -libcls_refcount_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_refcount.la - -libcls_version_la_SOURCES = cls/version/cls_version.cc -libcls_version_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_version.la - -libcls_log_la_SOURCES = cls/log/cls_log.cc -libcls_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_log.la - -libcls_statelog_la_SOURCES = cls/statelog/cls_statelog.cc -libcls_statelog_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_statelog.la - -libcls_timeindex_la_SOURCES = cls/timeindex/cls_timeindex.cc -libcls_timeindex_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_timeindex_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_timeindex.la - -libcls_replica_log_la_SOURCES = cls/replica_log/cls_replica_log.cc -libcls_replica_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_replica_log.la - -libcls_user_la_SOURCES = cls/user/cls_user.cc -libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_user.la - -libcls_rgw_la_SOURCES = \ - cls/rgw/cls_rgw.cc \ - cls/rgw/cls_rgw_ops.cc \ - cls/rgw/cls_rgw_types.cc \ - common/ceph_json.cc -libcls_rgw_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_rgw.la - -libcls_cephfs_la_SOURCES = cls/cephfs/cls_cephfs.cc -libcls_cephfs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_cephfs_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_cephfs.la - -libcls_journal_la_SOURCES = \ - cls/journal/cls_journal.cc \ - cls/journal/cls_journal_types.cc -libcls_journal_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_journal_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_journal.la - -endif # WITH_OSD diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am deleted file mode 100644 index bac67e902e028..0000000000000 --- a/src/cls/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if ENABLE_CLIENT -include cls/Makefile-client.am -endif - -if ENABLE_SERVER -include cls/Makefile-server.am -endif diff --git a/src/common/Makefile.am b/src/common/Makefile.am deleted file mode 100644 index 5c8311611c7f0..0000000000000 --- a/src/common/Makefile.am +++ /dev/null @@ -1,310 +0,0 @@ -libcommon_internal_la_SOURCES = \ - ceph_ver.c \ - common/DecayCounter.cc \ - common/LogClient.cc \ - common/LogEntry.cc \ - common/Graylog.cc \ - common/PrebufferedStreambuf.cc \ - common/SloppyCRCMap.cc \ - common/BackTrace.cc \ - common/perf_counters.cc \ - common/mutex_debug.cc \ - common/Mutex.cc \ - common/OutputDataSocket.cc \ - common/admin_socket.cc \ - common/admin_socket_client.cc \ - common/cmdparse.cc \ - common/escape.c \ - common/io_priority.cc \ - common/ceph_time.cc \ - common/Clock.cc \ - common/Throttle.cc \ - common/Timer.cc \ - common/Finisher.cc \ - common/environment.cc\ - common/assert.cc \ - xxHash/xxhash.c \ - common/run_cmd.cc \ - common/WorkQueue.cc \ - common/ConfUtils.cc \ - common/MemoryModel.cc \ - common/armor.c \ - common/fd.cc \ - common/fs_types.cc \ - common/safe_io.c \ - common/snap_types.cc \ - common/str_list.cc \ - common/str_map.cc \ - common/errno.cc \ - common/RefCountedObj.cc \ - common/common_init.cc \ - common/pipe.c \ - common/ceph_argparse.cc \ - common/ceph_context.cc \ - common/types.cc \ - common/code_environment.cc \ - common/dout.cc \ - common/histogram.cc \ - common/signal.cc \ - common/simple_spin.cc \ - common/Thread.cc \ - common/Formatter.cc \ - common/HTMLFormatter.cc \ - common/HeartbeatMap.cc \ - common/config.cc \ - common/utf8.c \ - common/mime.c \ - common/strtol.cc \ - common/page.cc \ - common/lockdep.cc \ - common/version.cc \ - common/hex.cc \ - common/entity_name.cc \ - common/ceph_crypto.cc \ - common/ceph_crypto_cms.cc \ - common/TextTable.cc \ - common/ceph_fs.cc \ - common/ceph_hash.cc \ - common/ceph_strings.cc \ - common/ceph_frag.cc \ - common/addr_parsing.c \ - common/hobject.cc \ - common/bloom_filter.cc \ - common/module.c \ - common/Readahead.cc \ - common/Cycles.cc \ - common/ContextCompletion.cc \ - common/TracepointProvider.cc \ - common/PluginRegistry.cc \ - common/scrub_types.cc \ - common/blkdev.cc \ - common/dns_resolve.cc - -common/PluginRegistry.cc: ./ceph_ver.h - -if ENABLE_SERVER -libcommon_internal_la_SOURCES += \ - common/xattr.c \ - common/ipaddr.cc \ - common/ceph_json.cc \ - common/util.cc \ - common/pick_address.cc -endif - -if LINUX -libcommon_internal_la_SOURCES += \ - common/linux_version.c -endif - -if SOLARIS -libcommon_internal_la_SOURCES += \ - common/solaris_errno.cc -endif - -if AIX -libcommon_internal_la_SOURCES += \ - common/aix_errno.cc -endif - -if DARWIN -libcommon_internal_la_SOURCES += \ - common/darwin_errno.cc -endif - -if ENABLE_XIO -libcommon_internal_la_SOURCES += \ - common/address_helper.cc -endif - -# these should go out of libcommon_internal -libcommon_internal_la_SOURCES += \ - mon/MonCap.cc \ - mon/MonClient.cc \ - mon/MonMap.cc \ - osd/OSDMap.cc \ - osd/osd_types.cc \ - osd/ECMsgTypes.cc \ - osd/HitSet.cc \ - mds/MDSMap.cc \ - mds/FSMap.cc \ - mds/FSMapUser.cc \ - mds/inode_backtrace.cc \ - mds/mdstypes.cc \ - mds/flock.cc - -LIBCOMMON_DEPS += libcommon_internal.la -noinst_LTLIBRARIES += libcommon_internal.la - -# inject crc in common -libcommon_crc_la_SOURCES = \ - common/sctp_crc32.c \ - common/crc32c.cc \ - common/crc32c_intel_baseline.c \ - common/crc32c_intel_fast.c - -if WITH_GOOD_YASM_ELF64 -libcommon_crc_la_SOURCES += common/crc32c_intel_fast_asm.S common/crc32c_intel_fast_zero_asm.S -libcommon_crc_la_LIBTOOLFLAGS = --tag=CC -endif -LIBCOMMON_DEPS += libcommon_crc.la -noinst_LTLIBRARIES += libcommon_crc.la - -if HAVE_ARMV8_CRC -libcommon_crc_aarch64_la_SOURCES = common/crc32c_aarch64.c -libcommon_crc_aarch64_la_CFLAGS = $(AM_CFLAGS) $(ARM_CRC_FLAGS) -LIBCOMMON_DEPS += libcommon_crc_aarch64.la -noinst_LTLIBRARIES += libcommon_crc_aarch64.la -endif - -noinst_HEADERS += \ - common/bloom_filter.hpp \ - common/sctp_crc32.h \ - common/crc32c_intel_baseline.h \ - common/crc32c_intel_fast.h \ - common/crc32c_aarch64.h \ - common/cohort_lru.h \ - common/sstring.hh \ - xxHash/xxhash.h - - -# important; libmsg before libauth! -LIBCOMMON_DEPS += \ - $(LIBERASURE_CODE) \ - $(LIBCOMPRESSOR) \ - $(LIBMSG) $(LIBAUTH) \ - $(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \ - $(BOOST_SYSTEM_LIBS) \ - $(BOOST_IOSTREAMS_LIBS) \ - $(BOOST_RANDOM_LIBS) \ - $(RESOLV_LIBS) - -if LINUX -LIBCOMMON_DEPS += -lrt -lblkid -endif # LINUX - -libcommon_la_SOURCES = common/buffer.cc -libcommon_la_LIBADD = $(LIBCOMMON_DEPS) -noinst_LTLIBRARIES += libcommon.la - -noinst_HEADERS += \ - common/BackTrace.h \ - common/Checksummer.h \ - common/RefCountedObj.h \ - common/HeartbeatMap.h \ - common/LogClient.h \ - common/LogEntry.h \ - common/Graylog.h \ - common/Preforker.h \ - common/SloppyCRCMap.h \ - common/WorkQueue.h \ - common/OpQueue.h \ - common/PrioritizedQueue.h \ - common/WeightedPriorityQueue.h \ - common/ceph_argparse.h \ - common/ceph_context.h \ - common/xattr.h \ - common/blkdev.h \ - common/compiler_extensions.h \ - common/debug.h \ - common/dout.h \ - common/escape.h \ - common/fd.h \ - common/version.h \ - common/hex.h \ - common/histogram.h \ - common/entity_name.h \ - common/errno.h \ - common/environment.h \ - common/likely.h \ - common/lockdep.h \ - common/obj_bencher.h \ - common/snap_types.h \ - common/Clock.h \ - common/Cond.h \ - common/ConfUtils.h \ - common/DecayCounter.h \ - common/Finisher.h \ - common/Formatter.h \ - common/HTMLFormatter.h \ - common/perf_counters.h \ - common/OutputDataSocket.h \ - common/admin_socket.h \ - common/admin_socket_client.h \ - common/random_cache.hpp \ - common/shared_cache.hpp \ - common/tracked_int_ptr.hpp \ - common/simple_cache.hpp \ - common/sharedptr_registry.hpp \ - common/map_cacher.hpp \ - common/MemoryModel.h \ - common/Mutex.h \ - common/QueueRing.h \ - common/PrebufferedStreambuf.h \ - common/RWLock.h \ - common/Semaphore.h \ - common/SimpleRNG.h \ - common/TextTable.h \ - common/Thread.h \ - common/Throttle.h \ - common/Timer.h \ - common/TrackedOp.h \ - common/arch.h \ - common/armor.h \ - common/common_init.h \ - common/io_priority.h \ - common/pipe.h \ - common/code_environment.h \ - common/signal.h \ - common/simple_spin.h \ - common/run_cmd.h \ - common/safe_io.h \ - common/config.h \ - common/config_obs.h \ - common/config_opts.h \ - common/ceph_crypto.h \ - common/ceph_crypto_cms.h \ - common/ceph_json.h \ - common/lru_map.h \ - common/utf8.h \ - common/mime.h \ - common/pick_address.h \ - common/strtol.h \ - common/static_assert.h \ - common/AsyncReserver.h \ - common/sync_filesystem.h \ - common/cmdparse.h \ - common/hobject.h \ - common/linux_version.h \ - common/module.h \ - common/Continuation.h \ - common/Readahead.h \ - common/Cycles.h \ - common/Initialize.h \ - common/ContextCompletion.h \ - common/bit_vector.hpp \ - common/SubProcess.h \ - common/valgrind.h \ - common/TracepointProvider.h \ - common/event_socket.h \ - common/PluginRegistry.h \ - common/scrub_types.h \ - common/ceph_time.h \ - common/ceph_timer.h \ - common/align.h \ - common/mutex_debug.h \ - common/shunique_lock.h \ - common/dns_resolve.h - -if ENABLE_XIO -noinst_HEADERS += \ - common/address_helper.h -endif - - -libsecret_la_SOURCES = common/secret.c -libsecret_la_LIBADD = $(KEYUTILS_LIB) -if LINUX -noinst_LTLIBRARIES += libsecret.la -endif - -noinst_HEADERS += common/secret.h diff --git a/src/common/ceph_crypto.h b/src/common/ceph_crypto.h index 689128fd1c22e..6a65139433ce2 100644 --- a/src/common/ceph_crypto.h +++ b/src/common/ceph_crypto.h @@ -49,7 +49,7 @@ namespace ceph { } } #elif defined(USE_NSS) -// you *must* use CRYPTO_CXXFLAGS in Makefile.am for including this include +// you *must* use CRYPTO_CXXFLAGS in CMakeLists.txt for including this include # include # include diff --git a/src/compressor/Makefile.am b/src/compressor/Makefile.am deleted file mode 100644 index 9deda3c482bca..0000000000000 --- a/src/compressor/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -compressorlibdir = $(pkglibdir)/compressor -compressorlib_LTLIBRARIES = - -include compressor/zlib/Makefile.am -include compressor/snappy/Makefile.am - -libcompressor_la_SOURCES = \ - compressor/Compressor.cc \ - compressor/AsyncCompressor.cc -compressor/CompressionPlugin.cc: ./ceph_ver.h -libcompressor_la_DEPENDENCIES = $(compressorlib_LTLIBRARIES) -if LINUX -libcompressor_la_LIBADD = -ldl -endif # LINUX -noinst_LTLIBRARIES += libcompressor.la - -noinst_HEADERS += \ - compressor/Compressor.h \ - compressor/AsyncCompressor.h \ - compressor/CompressionPlugin.h - diff --git a/src/compressor/snappy/Makefile.am b/src/compressor/snappy/Makefile.am deleted file mode 100644 index 8981d77596157..0000000000000 --- a/src/compressor/snappy/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# snappy plugin -noinst_HEADERS += \ - compressor/snappy/SnappyCompressor.h - -snappy_sources = \ - common/buffer.cc \ - compressor/Compressor.cc \ - compressor/snappy/CompressionPluginSnappy.cc - -compressor/snappy/CompressionPluginSnappy.cc: ./ceph_ver.h - -libceph_snappy_la_SOURCES = ${snappy_sources} -libceph_snappy_la_CFLAGS = ${AM_CFLAGS} \ - -I$(srcdir)/compressor/snappy/snappy-1.2.8 -libceph_snappy_la_CXXFLAGS= ${AM_CXXFLAGS} \ - -I$(srcdir)/compressor/snappy/snappy-1.2.8 -libceph_snappy_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libceph_snappy_la_LDFLAGS = ${AM_LDFLAGS} -lsnappy -version-info 2:0:0 -if LINUX -libceph_snappy_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*' -endif - -compressorlib_LTLIBRARIES += libceph_snappy.la diff --git a/src/compressor/zlib/Makefile.am b/src/compressor/zlib/Makefile.am deleted file mode 100644 index d05f9c532138f..0000000000000 --- a/src/compressor/zlib/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -# zlib plugin - -MACHINE = $(shell uname -p) - -.asm.s: - @echo " MKTMP " $@; - @cp $< $@ - -noinst_HEADERS += \ - compressor/zlib/ZlibCompressor.h \ - isa-l/include/igzip_lib.h \ - isa-l/include/types.h - -zlib_sources = \ - common/buffer.cc \ - compressor/Compressor.cc \ - compressor/zlib/CompressionPluginZlib.cc \ - compressor/zlib/ZlibCompressor.cc - -if INTEL -zlib_sources += \ - isa-l/igzip/igzip.c \ - isa-l/igzip/hufftables_c.c \ - isa-l/igzip/crc_utils_01.asm \ - isa-l/igzip/crc_utils_04.asm \ - isa-l/igzip/igzip_body_01.asm \ - isa-l/igzip/igzip_body_04.asm \ - isa-l/igzip/igzip_finish.asm \ - isa-l/igzip/igzip_stateless_01.asm \ - isa-l/igzip/igzip_stateless_04.asm \ - isa-l/igzip/crc_data.asm \ - isa-l/igzip/crc32_gzip.asm \ - isa-l/igzip/detect_repeated_char.asm \ - isa-l/igzip/igzip_multibinary.asm \ - isa-l/igzip/igzip_stateless_base.c \ - isa-l/igzip/igzip_base.c -endif - -compressor/zlib/CompressionPluginZlib.cc: ./ceph_ver.h - -libceph_zlib_la_SOURCES = ${zlib_sources} -libceph_zlib_la_CFLAGS = ${AM_CFLAGS} \ - -I $(srcdir)/isa-l/include/ - -if INTEL -libceph_zlib_la_CCASFLAGS = ${AM_CCASFLAGS} \ - -I $(srcdir)/isa-l/include/ -endif - -libceph_zlib_la_CXXFLAGS= ${AM_CXXFLAGS} -libceph_zlib_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libceph_zlib_la_LDFLAGS = ${AM_LDFLAGS} -lz -version-info 2:0:0 -libceph_zlib_la_LIBTOOLFLAGS = --tag=CC -if LINUX -libceph_zlib_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*' -endif - -compressorlib_LTLIBRARIES += libceph_zlib.la diff --git a/src/crush/Makefile.am b/src/crush/Makefile.am deleted file mode 100644 index dafdc37bd5ae8..0000000000000 --- a/src/crush/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -libcrush_la_SOURCES = \ - crush/builder.c \ - crush/mapper.c \ - crush/crush.c \ - crush/hash.c \ - crush/CrushWrapper.cc \ - crush/CrushCompiler.cc \ - crush/CrushTester.cc \ - crush/CrushLocation.cc -noinst_LTLIBRARIES += libcrush.la - -noinst_HEADERS += \ - crush/CrushCompiler.h \ - crush/CrushLocation.h \ - crush/CrushTester.h \ - crush/CrushTreeDumper.h \ - crush/CrushWrapper.h \ - crush/CrushWrapper.i \ - crush/builder.h \ - crush/crush.h \ - crush/crush_compat.h \ - crush/crush_ln_table.h \ - crush/grammar.h \ - crush/hash.h \ - crush/mapper.h \ - crush/sample.txt \ - crush/types.h - -#crush_includedir = $(includedir)/crush -#crush_include_DATA = \ -# $(srcdir)/crush/hash.h \ -# $(srcdir)/crush/crush.h \ -# $(srcdir)/crush/mapper.h \ -# $(srcdir)/crush/types.h - diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am deleted file mode 100644 index 224e67b91e2f6..0000000000000 --- a/src/erasure-code/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## erasure code plugins - -erasure_codelibdir = $(pkglibdir)/erasure-code -erasure_codelib_LTLIBRARIES = - -check_LTLIBRARIES = - -include erasure-code/jerasure/Makefile.am -include erasure-code/lrc/Makefile.am -include erasure-code/shec/Makefile.am - -if WITH_BETTER_YASM_ELF64 -include erasure-code/isa/Makefile.am -endif # WITH_BETTER_YASM_ELF64 - -liberasure_code_la_SOURCES = \ - erasure-code/ErasureCodePlugin.cc -erasure-code/ErasureCodePlugin.cc: ./ceph_ver.h -liberasure_code_la_DEPENDENCIES = $(erasure_codelib_LTLIBRARIES) -if LINUX -liberasure_code_la_LIBADD = -ldl -endif # LINUX -noinst_LTLIBRARIES += liberasure_code.la - -noinst_HEADERS += \ - erasure-code/ErasureCode.h \ - erasure-code/ErasureCodeInterface.h \ - erasure-code/ErasureCodePlugin.h diff --git a/src/erasure-code/isa/Makefile.am b/src/erasure-code/isa/Makefile.am deleted file mode 100644 index 6bbb37cd8da88..0000000000000 --- a/src/erasure-code/isa/Makefile.am +++ /dev/null @@ -1,77 +0,0 @@ -# ISA -noinst_HEADERS += \ - erasure-code/isa/ErasureCodeIsa.h \ - erasure-code/isa/ErasureCodeIsaTableCache.h \ - erasure-code/isa/xor_op.h \ - erasure-code/isa/isa-l/erasure_code/ec_base.h \ - erasure-code/isa/isa-l/include/erasure_code.h \ - erasure-code/isa/isa-l/include/reg_sizes.asm \ - erasure-code/isa/isa-l/include/erasure_code.h \ - erasure-code/isa/isa-l/include/gf_vect_mul.h \ - erasure-code/isa/isa-l/include/types.h - -isa_sources = \ - erasure-code/ErasureCode.cc \ - erasure-code/isa/isa-l/erasure_code/ec_base.c \ - erasure-code/isa/isa-l/erasure_code/ec_highlevel_func.c \ - erasure-code/isa/isa-l/erasure_code/ec_multibinary.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_2vect_dot_prod_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_2vect_dot_prod_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_2vect_dot_prod_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_3vect_dot_prod_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_3vect_dot_prod_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_3vect_dot_prod_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_4vect_dot_prod_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_4vect_dot_prod_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_4vect_dot_prod_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_5vect_dot_prod_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_5vect_dot_prod_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_5vect_dot_prod_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_6vect_dot_prod_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_6vect_dot_prod_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_6vect_dot_prod_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_2vect_mad_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_2vect_mad_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_2vect_mad_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_3vect_mad_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_3vect_mad_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_3vect_mad_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_4vect_mad_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_4vect_mad_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_4vect_mad_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_5vect_mad_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_5vect_mad_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_5vect_mad_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_6vect_mad_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_6vect_mad_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_6vect_mad_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_mad_avx2.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_mad_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_mad_sse.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_mul_avx.asm.s \ - erasure-code/isa/isa-l/erasure_code/gf_vect_mul_sse.asm.s \ - erasure-code/isa/ErasureCodeIsa.cc \ - erasure-code/isa/ErasureCodeIsaTableCache.cc \ - erasure-code/isa/ErasureCodePluginIsa.cc \ - erasure-code/isa/xor_op.cc - -erasure-code/isa/ErasureCodePluginIsa.cc: ./ceph_ver.h - -noinst_LTLIBRARIES += libisa.la -libisa_la_SOURCES = ${isa_sources} -libisa_la_CFLAGS = ${AM_CFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/include/ -libisa_la_CXXFLAGS = ${AM_CXXFLAGS} -libisa_la_CCASFLAGS = ${AM_CCASFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/include/ -libisa_la_LIBTOOLFLAGS = --tag=CC - -libec_isa_la_SOURCES = -libec_isa_la_LIBADD = libisa.la $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -erasure_codelib_LTLIBRARIES += libec_isa.la diff --git a/src/erasure-code/lrc/Makefile.am b/src/erasure-code/lrc/Makefile.am deleted file mode 100644 index 44c47d558315a..0000000000000 --- a/src/erasure-code/lrc/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# lrc plugin -noinst_HEADERS += \ - erasure-code/lrc/ErasureCodeLrc.h - -lrc_sources = \ - erasure-code/ErasureCode.cc \ - erasure-code/lrc/ErasureCodePluginLrc.cc \ - erasure-code/lrc/ErasureCodeLrc.cc - -erasure-code/lrc/ErasureCodePluginLrc.cc: ./ceph_ver.h - -libec_lrc_la_SOURCES = ${lrc_sources} common/str_map.cc -libec_lrc_la_CFLAGS = ${AM_CFLAGS} -libec_lrc_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_lrc_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(LIBJSON_SPIRIT) -libec_lrc_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_lrc_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -erasure_codelib_LTLIBRARIES += libec_lrc.la diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am deleted file mode 100644 index 6b658d5a575dc..0000000000000 --- a/src/erasure-code/shec/Makefile.am +++ /dev/null @@ -1,162 +0,0 @@ -# SHEC plugin -shec_sources = \ - erasure-code/ErasureCode.cc \ - erasure-code/shec/ErasureCodePluginShec.cc \ - erasure-code/shec/ErasureCodeShec.cc \ - erasure-code/shec/ErasureCodeShecTableCache.cc \ - erasure-code/shec/determinant.c \ - erasure-code/jerasure/jerasure/src/cauchy.c \ - erasure-code/jerasure/jerasure/src/galois.c \ - erasure-code/jerasure/jerasure/src/jerasure.c \ - erasure-code/jerasure/jerasure/src/liberation.c \ - erasure-code/jerasure/jerasure/src/reed_sol.c \ - erasure-code/jerasure/gf-complete/src/gf_wgen.c \ - erasure-code/jerasure/gf-complete/src/gf_method.c \ - erasure-code/jerasure/gf-complete/src/gf_w16.c \ - erasure-code/jerasure/gf-complete/src/gf.c \ - erasure-code/jerasure/gf-complete/src/gf_w32.c \ - erasure-code/jerasure/gf-complete/src/gf_w64.c \ - erasure-code/jerasure/gf-complete/src/gf_w128.c \ - erasure-code/jerasure/gf-complete/src/gf_general.c \ - erasure-code/jerasure/gf-complete/src/gf_w4.c \ - erasure-code/jerasure/gf-complete/src/gf_rand.c \ - erasure-code/jerasure/gf-complete/src/gf_w8.c - -noinst_HEADERS += \ - erasure-code/shec/ErasureCodeShec.h \ - erasure-code/shec/ErasureCodeShecTableCache.h \ - erasure-code/jerasure/jerasure/include/cauchy.h \ - erasure-code/jerasure/jerasure/include/galois.h \ - erasure-code/jerasure/jerasure/include/jerasure.h \ - erasure-code/jerasure/jerasure/include/liberation.h \ - erasure-code/jerasure/jerasure/include/reed_sol.h \ - erasure-code/jerasure/gf-complete/include/gf_int.h \ - erasure-code/jerasure/gf-complete/include/gf_complete.h \ - erasure-code/jerasure/gf-complete/include/gf_rand.h \ - erasure-code/jerasure/gf-complete/include/gf_method.h \ - erasure-code/jerasure/gf-complete/include/gf_general.h - -erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h - -libec_shec_generic_la_SOURCES = ${shec_sources} -libec_shec_generic_la_CFLAGS = ${AM_CFLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_shec_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -erasure_codelib_LTLIBRARIES += libec_shec_generic.la - -libec_shec_neon_la_SOURCES = ${shec_sources} \ - erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ - erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ - erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ - erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ - erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c -libec_shec_neon_la_CFLAGS = ${AM_CFLAGS} \ - ${ARM_NEON_FLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${ARM_NEON_FLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -if HAVE_NEON -erasure_codelib_LTLIBRARIES += libec_shec_neon.la -endif - -libec_shec_sse3_la_SOURCES = ${shec_sources} -libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_shec_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -if HAVE_SSSE3 -erasure_codelib_LTLIBRARIES += libec_shec_sse3.la -endif - -libec_shec_sse4_la_SOURCES = ${shec_sources} -libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - ${INTEL_SSE4_1_FLAGS} \ - ${INTEL_SSE4_2_FLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} \ - ${INTEL_SSE3_FLAGS} \ - ${INTEL_SSSE3_FLAGS} \ - ${INTEL_SSE4_1_FLAGS} \ - ${INTEL_SSE4_2_FLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_shec_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -if HAVE_SSE4_PCLMUL -erasure_codelib_LTLIBRARIES += libec_shec_sse4.la -endif - -libec_shec_la_SOURCES = \ - erasure-code/shec/ErasureCodePluginSelectShec.cc -libec_shec_la_CFLAGS = ${AM_CFLAGS} -libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_shec_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -if LINUX -libec_shec_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif - -erasure-code/shec/ErasureCodePluginSelectShec.cc: ./ceph_ver.h - -erasure_codelib_LTLIBRARIES += libec_shec.la diff --git a/src/global/Makefile.am b/src/global/Makefile.am deleted file mode 100644 index 243a7fa223b92..0000000000000 --- a/src/global/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -libglobal_la_SOURCES = \ - global/global_context.cc \ - global/global_init.cc \ - global/pidfile.cc \ - global/signal_handler.cc \ - common/TrackedOp.cc - -libglobal_la_LIBADD = $(LIBCOMMON) - -noinst_LTLIBRARIES += libglobal.la - -noinst_HEADERS += \ - global/pidfile.h \ - global/global_init.h \ - global/global_context.h \ - global/signal_handler.h - diff --git a/src/java/Makefile.am b/src/java/Makefile.am deleted file mode 100644 index 5481e64bd4f99..0000000000000 --- a/src/java/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -# automake technique adapted from OpenMPI Java - -JAVA_SRC = \ - java/com/ceph/fs/CephMount.java \ - java/com/ceph/fs/CephStat.java \ - java/com/ceph/fs/CephStatVFS.java \ - java/com/ceph/fs/CephNativeLoader.java \ - java/com/ceph/fs/CephNotMountedException.java \ - java/com/ceph/fs/CephFileAlreadyExistsException.java \ - java/com/ceph/fs/CephAlreadyMountedException.java \ - java/com/ceph/fs/CephNotDirectoryException.java \ - java/com/ceph/fs/CephPoolException.java \ - java/com/ceph/fs/CephFileExtent.java \ - java/com/ceph/crush/Bucket.java - -JAVA_TEST_SRC = \ - test/com/ceph/fs/CephDoubleMountTest.java \ - test/com/ceph/fs/CephMountCreateTest.java \ - test/com/ceph/fs/CephMountTest.java \ - test/com/ceph/fs/CephUnmountedTest.java \ - test/com/ceph/fs/CephAllTests.java - -EXTRA_DIST = $(JAVA_SRC) $(JAVA_TEST_SRC) - -if ENABLE_CLIENT -if WITH_RADOS -if WITH_CEPHFS -if ENABLE_CEPHFS_JAVA - -JAVA_CLASSES = $(JAVA_SRC:java/%.java=%.class) -# This is dumb -- It might be better to split some work -# between Make and Ant or Maven -#ESCAPED_JAVA_CLASSES = \ -# com/ceph/fs/CephMount\$$State.class - -JAVA_H = native/com_ceph_fs_CephMount.h - -# target to make automake happy -CEPH_PROXY=java/com/ceph/fs/CephMount.class - -# note: for the -source 1.5 builds, we add -# -Xlint:-options -# to get rid of the warning -# warning: [options] bootstrap class path not set in conjunction with -source 1.5 -# as per -# https://blogs.oracle.com/darcy/entry/bootclasspath_older_source - -$(CEPH_PROXY): $(JAVA_SRC) - export CLASSPATH=java/ ; \ - $(JAVAC) -classpath java -source 1.5 -target 1.5 -Xlint:-options java/com/ceph/fs/*.java - -$(JAVA_H): $(CEPH_PROXY) - export CLASSPATH=java/ ; \ - $(JAVAH) -classpath java -jni -o $@ com.ceph.fs.CephMount - -libcephfs.jar: $(CEPH_PROXY) - $(JAR) cf $@ $(JAVA_CLASSES:%=-C java %) - -javadir = $(datadir)/java -java_DATA = libcephfs.jar - -CLEANFILES = -rf java/com/ceph/fs/*.class $(JAVA_H) libcephfs.jar - -BUILT_SOURCES = $(JAVA_H) - -# build the tests if *both* --enable-cephfs-java and --with-debug were specifed -if HAVE_JUNIT4 - -JAVA_TEST_CLASSES = $(JAVA_TEST_SRC:test/%.java=%.class) - -CEPH_TEST_PROXY=test/com/ceph/fs/CephMountTest.class - -$(CEPH_TEST_PROXY): $(JAVA_TEST_SRC) $(CEPH_PROXY) - export CLASSPATH=$(CLASSPATH):$(EXTRA_CLASSPATH_JAR):java/:test/ ; \ - $(JAVAC) -source 1.5 -target 1.5 -Xlint:-options test/com/ceph/fs/*.java - -libcephfs-test.jar: $(CEPH_TEST_PROXY) - $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) - -java_DATA += libcephfs-test.jar - -CLEANFILES += test/com/ceph/fs/*.class libcephfs-test.jar -endif # HAVE_JUNIT4 (includes WITH_DEBUG) -endif # ENABLE_CEPHFS_JAVA -endif # WITH_CEPHFS -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/journal/Makefile.am b/src/journal/Makefile.am deleted file mode 100644 index ad4d54dc48850..0000000000000 --- a/src/journal/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -if ENABLE_CLIENT -if WITH_RADOS - -libjournal_la_SOURCES = \ - journal/AsyncOpTracker.cc \ - journal/Entry.cc \ - journal/Future.cc \ - journal/FutureImpl.cc \ - journal/Journaler.cc \ - journal/JournalMetadata.cc \ - journal/JournalPlayer.cc \ - journal/JournalRecorder.cc \ - journal/JournalTrimmer.cc \ - journal/ObjectPlayer.cc \ - journal/ObjectRecorder.cc \ - journal/Utils.cc - -noinst_LTLIBRARIES += libjournal.la -noinst_HEADERS += \ - journal/AsyncOpTracker.h \ - journal/Entry.h \ - journal/Future.h \ - journal/FutureImpl.h \ - journal/Journaler.h \ - journal/JournalMetadata.h \ - journal/JournalMetadataListener.h \ - journal/JournalPlayer.h \ - journal/JournalRecorder.h \ - journal/JournalTrimmer.h \ - journal/ObjectPlayer.h \ - journal/ObjectRecorder.h \ - journal/ReplayEntry.h \ - journal/ReplayHandler.h \ - journal/Settings.h \ - journal/Utils.h -DENCODER_DEPS += libjournal.la - -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/json_spirit/Makefile.am b/src/json_spirit/Makefile.am deleted file mode 100644 index f14228cb0627e..0000000000000 --- a/src/json_spirit/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -libjson_spirit_la_SOURCES = \ - json_spirit/json_spirit_reader.cpp \ - json_spirit/json_spirit_writer.cpp -libjson_spirit_la_LIBADD = $(BOOST_THREAD_LIBS) -noinst_LTLIBRARIES += libjson_spirit.la - -noinst_HEADERS += \ - json_spirit/json_spirit.h \ - json_spirit/json_spirit_error_position.h \ - json_spirit/json_spirit_reader.h \ - json_spirit/json_spirit_reader_template.h \ - json_spirit/json_spirit_stream_reader.h \ - json_spirit/json_spirit_utils.h \ - json_spirit/json_spirit_value.h \ - json_spirit/json_spirit_writer.h \ - json_spirit/json_spirit_writer_options.h \ - json_spirit/json_spirit_writer_template.h - diff --git a/src/key_value_store/Makefile.am b/src/key_value_store/Makefile.am deleted file mode 100644 index 1ccf50ef70129..0000000000000 --- a/src/key_value_store/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -if ENABLE_SERVER -if WITH_OSD - -if LINUX -libcls_kvs_la_SOURCES = key_value_store/cls_kvs.cc -libcls_kvs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_kvs_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' -radoslib_LTLIBRARIES += libcls_kvs.la -endif - -noinst_HEADERS += \ - key_value_store/key_value_structure.h \ - key_value_store/kv_flat_btree_async.h \ - key_value_store/kvs_arg_types.h - -endif # WITH_OSD -endif # ENABLE_SERVER diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am deleted file mode 100644 index 463b98b255b84..0000000000000 --- a/src/kv/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -if ENABLE_SERVER - -libkv_a_SOURCES = \ - kv/KeyValueDB.cc \ - kv/LevelDBStore.cc -libkv_a_CXXFLAGS = ${AM_CXXFLAGS} -libkv_a_LIBADD = - -noinst_LIBRARIES += libkv.a - -noinst_HEADERS += \ - kv/KeyValueDB.h \ - kv/LevelDBStore.h - -if WITH_SLIBROCKSDB -# build rocksdb with its own makefile -# for some stupid reason this needs -fPIC... -# PORTABLE=1 fixes the aarch64 build (-march=native doesn't work there) - -ROCKSDBCXX_FLAGS = "-fPIC" -if FREEBSD -NPROC = sysctl -n hw.ncpu -ROCKSDBCXX_FLAGS += "-Wmismatched-tags" -else -NPROC = nproc -endif - -# explicitly disable jemalloc unless we are using it. -if !WITH_JEMALLOC -export DISABLE_JEMALLOC=1 -endif - -rocksdb/librocksdb.a: - cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 ${MAKE} -j$(shell ${NPROC}) static_lib -libkv_a_CXXFLAGS += -I rocksdb/include -fPIC -libkv_a_SOURCES += kv/RocksDBStore.cc -libkv_a_LIBADD += rocksdb/librocksdb.a -noinst_HEADERS += kv/RocksDBStore.h -endif - -if WITH_DLIBROCKSDB -libkv_a_SOURCES += kv/RocksDBStore.cc -libkv_a_LIBADD += -lrocksdb -noinst_HEADERS += kv/RocksDBStore.h -endif - -if WITH_KINETIC -libkv_a_SOURCES += kv/KineticStore.cc -libkv_a_CXXFLAGS += -std=gnu++11 -libkv_a_LIBADD += -lkinetic_client -lprotobuf -lglog -lgflags libcrypto.a -noinst_HEADERS += kv/KineticStore.h -endif - -libkv_a_SOURCES += kv/MemDB.cc -noinst_HEADERS += kv/MemDB.h - - -endif # ENABLE_SERVER diff --git a/src/librados/Makefile.am b/src/librados/Makefile.am deleted file mode 100644 index bf2c6da6906af..0000000000000 --- a/src/librados/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -if ENABLE_CLIENT -if WITH_RADOS - -librados_internal_la_SOURCES = \ - librados/RadosClient.cc \ - librados/IoCtxImpl.cc \ - librados/RadosXattrIter.cc \ - librados/snap_set_diff.cc -noinst_LTLIBRARIES += librados_internal.la - -librados_api_la_SOURCES = \ - common/buffer.cc \ - librados/librados.cc -noinst_LTLIBRARIES += librados_api.la - -librados_la_SOURCES = \ - common/buffer.cc \ - librados/librados.cc - -# We need this to avoid basename conflicts with the librados build tests in test/Makefile.am -librados_la_CXXFLAGS = ${AM_CXXFLAGS} - -LIBRADOS_DEPS += \ - librados_internal.la libcls_lock_client.la \ - $(LIBOSDC) $(LIBCOMMON_DEPS) - -librados_la_LIBADD = $(LIBRADOS_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -if LINUX -librados_la_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -librados_la_LDFLAGS += -Xcompiler -Xlinker -Xcompiler '--exclude-libs=ALL' -endif -lib_LTLIBRARIES += librados.la - -noinst_HEADERS += \ - librados/snap_set_diff.h \ - librados/AioCompletionImpl.h \ - librados/IoCtxImpl.h \ - librados/PoolAsyncCompletionImpl.h \ - librados/RadosClient.h \ - librados/RadosXattrIter.h \ - librados/ListObjectImpl.h - -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/libradosstriper/Makefile.am b/src/libradosstriper/Makefile.am deleted file mode 100644 index 13b8b28c49358..0000000000000 --- a/src/libradosstriper/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -if ENABLE_CLIENT -if WITH_RADOS -if WITH_RADOSSTRIPER - -libradosstriper_la_SOURCES = \ - libradosstriper/libradosstriper.cc \ - libradosstriper/RadosStriperImpl.cc \ - libradosstriper/MultiAioCompletionImpl.cc - -# We need this to avoid basename conflicts with the libradosstriper build tests in test/Makefile.am -libradosstriper_la_CXXFLAGS = ${AM_CXXFLAGS} - -LIBRADOSSTRIPER_DEPS = librados_internal.la libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON_DEPS) -libradosstriper_la_LIBADD = $(LIBRADOSSTRIPER_DEPS) $(LIBRADOS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -libradosstriper_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -if LINUX -libradosstriper_la_LDFLAGS += -export-symbols-regex '^radosstriper_.*' -endif -lib_LTLIBRARIES += libradosstriper.la - -noinst_HEADERS += \ - libradosstriper/RadosStriperImpl.h \ - libradosstriper/MultiAioCompletionImpl.h - -endif # WITH_RADOSSTRIPER -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/librbd/Makefile.am b/src/librbd/Makefile.am deleted file mode 100644 index 8d864d4370e1e..0000000000000 --- a/src/librbd/Makefile.am +++ /dev/null @@ -1,183 +0,0 @@ -librbd_types_la_SOURCES = \ - librbd/journal/Types.cc \ - librbd/mirroring_watcher/Types.cc \ - librbd/WatchNotifyTypes.cc -noinst_LTLIBRARIES += librbd_types.la - -if ENABLE_CLIENT -if WITH_RADOS -if WITH_RBD - -librbd_internal_la_SOURCES = \ - librbd/AioCompletion.cc \ - librbd/AioImageRequest.cc \ - librbd/AioImageRequestWQ.cc \ - librbd/AioObjectRequest.cc \ - librbd/AsyncObjectThrottle.cc \ - librbd/AsyncOperation.cc \ - librbd/AsyncRequest.cc \ - librbd/CopyupRequest.cc \ - librbd/DiffIterate.cc \ - librbd/ExclusiveLock.cc \ - librbd/ImageCtx.cc \ - librbd/ImageState.cc \ - librbd/ImageWatcher.cc \ - librbd/internal.cc \ - librbd/Journal.cc \ - librbd/LibrbdAdminSocketHook.cc \ - librbd/LibrbdWriteback.cc \ - librbd/MirroringWatcher.cc \ - librbd/ObjectMap.cc \ - librbd/ObjectWatcher.cc \ - librbd/Operations.cc \ - librbd/Utils.cc \ - librbd/cache/ImageWriteback.cc \ - librbd/cache/PassthroughImageCache.cc \ - librbd/exclusive_lock/AcquireRequest.cc \ - librbd/exclusive_lock/AutomaticPolicy.cc \ - librbd/exclusive_lock/ReacquireRequest.cc \ - librbd/exclusive_lock/ReleaseRequest.cc \ - librbd/exclusive_lock/StandardPolicy.cc \ - librbd/image/CloseRequest.cc \ - librbd/image/CreateRequest.cc \ - librbd/image/OpenRequest.cc \ - librbd/image/RefreshParentRequest.cc \ - librbd/image/RefreshRequest.cc \ - librbd/image/SetSnapRequest.cc \ - librbd/image_watcher/Notifier.cc \ - librbd/image_watcher/NotifyLockOwner.cc \ - librbd/image_watcher/RewatchRequest.cc \ - librbd/journal/RemoveRequest.cc \ - librbd/journal/CreateRequest.cc \ - librbd/journal/Replay.cc \ - librbd/journal/StandardPolicy.cc \ - librbd/object_map/InvalidateRequest.cc \ - librbd/object_map/LockRequest.cc \ - librbd/object_map/Request.cc \ - librbd/object_map/RefreshRequest.cc \ - librbd/object_map/ResizeRequest.cc \ - librbd/object_map/SnapshotCreateRequest.cc \ - librbd/object_map/SnapshotRemoveRequest.cc \ - librbd/object_map/SnapshotRollbackRequest.cc \ - librbd/object_map/UnlockRequest.cc \ - librbd/object_map/UpdateRequest.cc \ - librbd/operation/FlattenRequest.cc \ - librbd/operation/RebuildObjectMapRequest.cc \ - librbd/operation/ObjectMapIterate.cc \ - librbd/operation/RenameRequest.cc \ - librbd/operation/Request.cc \ - librbd/operation/ResizeRequest.cc \ - librbd/operation/SnapshotCreateRequest.cc \ - librbd/operation/SnapshotProtectRequest.cc \ - librbd/operation/SnapshotRemoveRequest.cc \ - librbd/operation/SnapshotRenameRequest.cc \ - librbd/operation/SnapshotRollbackRequest.cc \ - librbd/operation/SnapshotUnprotectRequest.cc \ - librbd/operation/SnapshotLimitRequest.cc \ - librbd/operation/TrimRequest.cc -noinst_LTLIBRARIES += librbd_internal.la - -librbd_api_la_SOURCES = \ - librbd/librbd.cc -noinst_LTLIBRARIES += librbd_api.la - -librbd_la_SOURCES = \ - librbd/librbd.cc -librbd_la_LIBADD = \ - librbd_internal.la $(LIBRBD_TYPES) libjournal.la \ - $(LIBRADOS) $(LIBCOMMON) $(LIBOSDC) \ - librados_internal.la \ - libcls_rbd_client.la \ - libcls_lock_client.la \ - libcls_journal_client.la \ - $(PTHREAD_LIBS) $(EXTRALIBS) - -librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -if LINUX -librbd_la_CXXFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden -librbd_la_LDFLAGS += -Xcompiler -Xlinker -Xcompiler '--exclude-libs=ALL' -endif -lib_LTLIBRARIES += librbd.la - -noinst_HEADERS += \ - librbd/AioCompletion.h \ - librbd/AioImageRequest.h \ - librbd/AioImageRequestWQ.h \ - librbd/AioObjectRequest.h \ - librbd/AsyncObjectThrottle.h \ - librbd/AsyncOperation.h \ - librbd/AsyncRequest.h \ - librbd/CopyupRequest.h \ - librbd/DiffIterate.h \ - librbd/ExclusiveLock.h \ - librbd/ImageCtx.h \ - librbd/ImageState.h \ - librbd/ImageWatcher.h \ - librbd/internal.h \ - librbd/Journal.h \ - librbd/LibrbdAdminSocketHook.h \ - librbd/LibrbdWriteback.h \ - librbd/MirroringWatcher.h \ - librbd/ObjectMap.h \ - librbd/ObjectWatcher.h \ - librbd/Operations.h \ - librbd/parent_types.h \ - librbd/SnapInfo.h \ - librbd/TaskFinisher.h \ - librbd/Utils.h \ - librbd/WatchNotifyTypes.h \ - librbd/cache/ImageCache.h \ - librbd/cache/ImageWriteback.h \ - librbd/cache/PassthroughImageCache.h \ - librbd/exclusive_lock/AcquireRequest.h \ - librbd/exclusive_lock/AutomaticPolicy.h \ - librbd/exclusive_lock/Policy.h \ - librbd/exclusive_lock/ReacquireRequest.h \ - librbd/exclusive_lock/ReleaseRequest.h \ - librbd/exclusive_lock/StandardPolicy.h \ - librbd/image/CloseRequest.h \ - librbd/image/CreateRequest.h \ - librbd/image/OpenRequest.h \ - librbd/image/RefreshParentRequest.h \ - librbd/image/RefreshRequest.h \ - librbd/image/SetSnapRequest.h \ - librbd/image_watcher/Notifier.h \ - librbd/image_watcher/NotifyLockOwner.h \ - librbd/image_watcher/RewatchRequest.h \ - librbd/journal/CreateRequest.h \ - librbd/journal/DisabledPolicy.h \ - librbd/journal/Policy.h \ - librbd/journal/RemoveRequest.h \ - librbd/journal/Replay.h \ - librbd/journal/StandardPolicy.h \ - librbd/journal/Types.h \ - librbd/journal/TypeTraits.h \ - librbd/mirroring_watcher/Types.h \ - librbd/object_map/InvalidateRequest.h \ - librbd/object_map/LockRequest.h \ - librbd/object_map/Request.h \ - librbd/object_map/RefreshRequest.h \ - librbd/object_map/ResizeRequest.h \ - librbd/object_map/SnapshotCreateRequest.h \ - librbd/object_map/SnapshotRemoveRequest.h \ - librbd/object_map/SnapshotRollbackRequest.h \ - librbd/object_map/UnlockRequest.h \ - librbd/object_map/UpdateRequest.h \ - librbd/operation/FlattenRequest.h \ - librbd/operation/RebuildObjectMapRequest.h \ - librbd/operation/ObjectMapIterate.h \ - librbd/operation/RenameRequest.h \ - librbd/operation/Request.h \ - librbd/operation/ResizeRequest.h \ - librbd/operation/SnapshotCreateRequest.h \ - librbd/operation/SnapshotProtectRequest.h \ - librbd/operation/SnapshotRemoveRequest.h \ - librbd/operation/SnapshotRenameRequest.h \ - librbd/operation/SnapshotRollbackRequest.h \ - librbd/operation/SnapshotUnprotectRequest.h \ - librbd/operation/SnapshotLimitRequest.h \ - librbd/operation/TrimRequest.h - -endif # WITH_RBD -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/log/Makefile.am b/src/log/Makefile.am deleted file mode 100644 index 8dcaac0eb36f8..0000000000000 --- a/src/log/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -liblog_la_SOURCES = \ - log/Log.cc \ - log/SubsystemMap.cc - -noinst_LTLIBRARIES += liblog.la - -noinst_HEADERS += \ - log/Entry.h \ - log/EntryQueue.h \ - log/Log.h \ - log/SubsystemMap.h diff --git a/src/mds/Makefile-client.am b/src/mds/Makefile-client.am deleted file mode 100644 index 0cfd8bf443ea4..0000000000000 --- a/src/mds/Makefile-client.am +++ /dev/null @@ -1,4 +0,0 @@ -# There are no libmds_types so use the full mds library for dencoder for now -DENCODER_SOURCES += $(LIBMDS_SOURCES) - -DENCODER_DEPS += $(LIBMDS_DEPS) diff --git a/src/mds/Makefile-server.am b/src/mds/Makefile-server.am deleted file mode 100644 index 36031eb60f128..0000000000000 --- a/src/mds/Makefile-server.am +++ /dev/null @@ -1,74 +0,0 @@ -if WITH_MDS - -libmds_la_SOURCES = $(LIBMDS_SOURCES) -libmds_la_LIBADD = $(LIBMDS_DEPS) -noinst_LTLIBRARIES += libmds.la - -noinst_HEADERS += \ - mds/inode_backtrace.h \ - mds/flock.h \ - mds/locks.c \ - mds/locks.h \ - mds/CDentry.h \ - mds/CDir.h \ - mds/CInode.h \ - mds/DamageTable.h \ - mds/Capability.h \ - mds/InoTable.h \ - mds/JournalPointer.h \ - mds/LocalLock.h \ - mds/Locker.h \ - mds/LogEvent.h \ - mds/LogSegment.h \ - mds/MDBalancer.h \ - mds/MDCache.h \ - mds/RecoveryQueue.h \ - mds/StrayManager.h \ - mds/MDLog.h \ - mds/MDSRank.h \ - mds/MDSDaemon.h \ - mds/Beacon.h \ - mds/MDSContext.h \ - mds/MDSAuthCaps.h \ - mds/MDSMap.h \ - mds/FSMap.h \ - mds/FSMapUser.h \ - mds/MDSTable.h \ - mds/MDSTableServer.h \ - mds/MDSTableClient.h \ - mds/Mutation.h \ - mds/Migrator.h \ - mds/ScatterLock.h \ - mds/ScrubStack.h \ - mds/ScrubHeader.h \ - mds/Server.h \ - mds/SessionMap.h \ - mds/SimpleLock.h \ - mds/SnapClient.h \ - mds/SnapRealm.h \ - mds/SnapServer.h \ - mds/inode_backtrace.h \ - mds/mds_table_types.h \ - mds/mdstypes.h \ - mds/snap.h \ - mds/MDSContinuation.h - -noinst_HEADERS += \ - mds/events/ECommitted.h \ - mds/events/EExport.h \ - mds/events/EFragment.h \ - mds/events/EImportFinish.h \ - mds/events/EImportStart.h \ - mds/events/EMetaBlob.h \ - mds/events/ENoOp.h \ - mds/events/EOpen.h \ - mds/events/EResetJournal.h \ - mds/events/ESession.h \ - mds/events/ESessions.h \ - mds/events/ESlaveUpdate.h \ - mds/events/ESubtreeMap.h \ - mds/events/ETableClient.h \ - mds/events/ETableServer.h \ - mds/events/EUpdate.h - -endif # WITH_MDS diff --git a/src/mds/Makefile.am b/src/mds/Makefile.am deleted file mode 100644 index b7f7e793215de..0000000000000 --- a/src/mds/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -LIBMDS_SOURCES = \ - mds/Capability.cc \ - mds/MDSDaemon.cc \ - mds/MDSRank.cc \ - mds/Beacon.cc \ - mds/locks.c \ - mds/journal.cc \ - mds/Server.cc \ - mds/Mutation.cc \ - mds/MDCache.cc \ - mds/RecoveryQueue.cc \ - mds/StrayManager.cc \ - mds/Locker.cc \ - mds/Migrator.cc \ - mds/MDBalancer.cc \ - mds/CDentry.cc \ - mds/CDir.cc \ - mds/CInode.cc \ - mds/DamageTable.cc \ - mds/LogEvent.cc \ - mds/MDSTable.cc \ - mds/InoTable.cc \ - mds/JournalPointer.cc \ - mds/MDSTableClient.cc \ - mds/MDSTableServer.cc \ - mds/SimpleLock.cc \ - mds/ScrubStack.cc \ - mds/SnapRealm.cc \ - mds/SnapServer.cc \ - mds/snap.cc \ - mds/SessionMap.cc \ - mds/MDSContext.cc \ - mds/MDSAuthCaps.cc \ - mds/MDLog.cc -LIBMDS_DEPS = $(LIBOSDC) - -if ENABLE_CLIENT -include mds/Makefile-client.am -endif - -if ENABLE_SERVER -include mds/Makefile-server.am -endif diff --git a/src/messages/Makefile.am b/src/messages/Makefile.am deleted file mode 100644 index 0f74e15f1fec7..0000000000000 --- a/src/messages/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ - -noinst_HEADERS += \ - messages/MAuth.h \ - messages/MAuthReply.h \ - messages/MCacheExpire.h \ - messages/MClientCaps.h \ - messages/MClientCapRelease.h \ - messages/MClientLease.h \ - messages/MClientReconnect.h \ - messages/MClientReply.h \ - messages/MClientRequest.h \ - messages/MClientRequestForward.h \ - messages/MClientSession.h \ - messages/MClientSnap.h \ - messages/MClientQuota.h \ - messages/MCommand.h \ - messages/MCommandReply.h \ - messages/MDentryLink.h \ - messages/MDentryUnlink.h \ - messages/MDirUpdate.h \ - messages/MDiscover.h \ - messages/MDiscoverReply.h \ - messages/MExportCaps.h \ - messages/MExportCapsAck.h \ - messages/MGatherCaps.h \ - messages/MExportDir.h \ - messages/MExportDirAck.h \ - messages/MExportDirCancel.h \ - messages/MExportDirDiscover.h \ - messages/MExportDirDiscoverAck.h \ - messages/MExportDirFinish.h \ - messages/MExportDirNotify.h \ - messages/MExportDirNotifyAck.h \ - messages/MExportDirPrep.h \ - messages/MExportDirPrepAck.h \ - messages/MGenericMessage.h \ - messages/MGetPoolStats.h \ - messages/MGetPoolStatsReply.h \ - messages/MHeartbeat.h \ - messages/MInodeFileCaps.h \ - messages/MLock.h \ - messages/MLog.h \ - messages/MLogAck.h \ - messages/MMDSBeacon.h \ - messages/MMDSCacheRejoin.h \ - messages/MMDSLoadTargets.h \ - messages/MMDSFindIno.h \ - messages/MMDSFindInoReply.h \ - messages/MMDSFragmentNotify.h \ - messages/MMDSMap.h \ - messages/MFSMap.h \ - messages/MFSMapUser.h \ - messages/MMDSOpenIno.h \ - messages/MMDSOpenInoReply.h \ - messages/MMDSResolve.h \ - messages/MMDSResolveAck.h \ - messages/MMDSSlaveRequest.h \ - messages/MMDSTableRequest.h \ - messages/MMonCommand.h \ - messages/MMonCommandAck.h \ - messages/MMonElection.h \ - messages/MMonGetMap.h \ - messages/MMonGetOSDMap.h \ - messages/MMonGetVersion.h \ - messages/MMonGetVersionReply.h \ - messages/MMonGlobalID.h \ - messages/MMonHealth.h \ - messages/MMonJoin.h \ - messages/MMonMap.h \ - messages/MMonMetadata.h \ - messages/MMonPaxos.h \ - messages/MMonProbe.h \ - messages/MMonScrub.h \ - messages/MMonSubscribe.h \ - messages/MMonSubscribeAck.h \ - messages/MMonSync.h \ - messages/MOSDAlive.h \ - messages/MOSDBoot.h \ - messages/MOSDFailure.h \ - messages/MOSDMarkMeDown.h \ - messages/MOSDMap.h \ - messages/MOSDOp.h \ - messages/MOSDOpReply.h \ - messages/MOSDPGBackfill.h \ - messages/MOSDPGCreate.h \ - messages/MOSDPGPush.h \ - messages/MOSDPGPull.h \ - messages/MOSDPGPushReply.h \ - messages/MOSDPGInfo.h \ - messages/MOSDPGLog.h \ - messages/MOSDPGMissing.h \ - messages/MOSDPGNotify.h \ - messages/MOSDPGQuery.h \ - messages/MOSDPGRemove.h \ - messages/MOSDPGScan.h \ - messages/MOSDPGUpdateLogMissing.h \ - messages/MOSDPGUpdateLogMissingReply.h \ - messages/MOSDECSubOpWrite.h \ - messages/MOSDECSubOpWriteReply.h \ - messages/MOSDECSubOpRead.h \ - messages/MOSDECSubOpReadReply.h \ - messages/MBackfillReserve.h \ - messages/MRecoveryReserve.h \ - messages/MMonQuorumService.h \ - messages/MOSDPGTemp.h \ - messages/MOSDPGTrim.h \ - messages/MOSDPing.h \ - messages/MOSDRepScrub.h \ - messages/MOSDScrub.h \ - messages/MOSDSubOp.h \ - messages/MOSDSubOpReply.h \ - messages/MOSDRepOp.h \ - messages/MOSDRepOpReply.h \ - messages/MPGStats.h \ - messages/MPGStatsAck.h \ - messages/MPing.h \ - messages/MDataPing.h \ - messages/MPoolOp.h \ - messages/MPoolOpReply.h \ - messages/MRemoveSnaps.h \ - messages/MRoute.h \ - messages/MForward.h \ - messages/MStatfs.h \ - messages/MStatfsReply.h \ - messages/MTimeCheck.h \ - messages/MWatchNotify.h \ - messages/PaxosServiceMessage.h \ - messages/MNop.h - diff --git a/src/mon/Makefile.am b/src/mon/Makefile.am deleted file mode 100644 index 0835e6ce62953..0000000000000 --- a/src/mon/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -libmon_types_la_SOURCES = \ - mon/PGMap.cc -noinst_LTLIBRARIES += libmon_types.la - -if ENABLE_SERVER -if WITH_MON - -libmon_a_SOURCES = \ - mon/Monitor.cc \ - mon/Paxos.cc \ - mon/PaxosService.cc \ - mon/OSDMonitor.cc \ - mon/MDSMonitor.cc \ - mon/MonmapMonitor.cc \ - mon/PGMonitor.cc \ - mon/LogMonitor.cc \ - mon/AuthMonitor.cc \ - mon/Elector.cc \ - mon/HealthMonitor.cc \ - mon/DataHealthService.cc \ - mon/ConfigKeyService.cc -libmon_a_LIBADD = -noinst_LIBRARIES += libmon.a - -noinst_HEADERS += \ - mon/AuthMonitor.h \ - mon/DataHealthService.h \ - mon/Elector.h \ - mon/LogMonitor.h \ - mon/ConfigKeyService.h \ - mon/HealthMonitor.h \ - mon/HealthService.h \ - mon/MDSMonitor.h \ - mon/MonmapMonitor.h \ - mon/MonCap.h \ - mon/MonClient.h \ - mon/MonCommands.h \ - mon/DumplingMonCommands.h \ - mon/MonMap.h \ - mon/Monitor.h \ - mon/MonitorDBStore.h \ - mon/MonOpRequest.h \ - mon/OSDMonitor.h \ - mon/PGMap.h \ - mon/PGMonitor.h \ - mon/Paxos.h \ - mon/PaxosService.h \ - mon/QuorumService.h \ - mon/Session.h \ - mon/mon_types.h - -endif # WITH_MON -endif # ENABLE_SERVER diff --git a/src/msg/Makefile.am b/src/msg/Makefile.am deleted file mode 100644 index f05788d69677d..0000000000000 --- a/src/msg/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -libmsg_la_SOURCES = \ - msg/Message.cc \ - msg/Messenger.cc \ - msg/DispatchQueue.cc \ - msg/msg_types.cc - -noinst_HEADERS += \ - msg/Connection.h \ - msg/Dispatcher.h \ - msg/DispatchQueue.h \ - msg/Message.h \ - msg/Messenger.h \ - msg/SimplePolicyMessenger.h \ - msg/msg_types.h - -libmsg_la_SOURCES += \ - msg/simple/Accepter.cc \ - msg/simple/Pipe.cc \ - msg/simple/PipeConnection.cc \ - msg/simple/SimpleMessenger.cc \ - msg/async/AsyncConnection.cc \ - msg/async/AsyncMessenger.cc \ - msg/async/Event.cc \ - msg/async/net_handler.cc \ - msg/async/Stack.cc \ - msg/async/PosixStack.cc \ - msg/async/EventSelect.cc - -if LINUX -libmsg_la_SOURCES += msg/async/EventEpoll.cc -endif - -if DARWIN -libmsg_la_SOURCES += msg/async/EventKqueue.cc -endif - -if FREEBSD -libmsg_la_SOURCES += msg/async/EventKqueue.cc -endif - - -noinst_HEADERS += \ - msg/simple/Accepter.h \ - msg/simple/Pipe.h \ - msg/simple/PipeConnection.h \ - msg/simple/SimpleMessenger.h \ - msg/async/AsyncConnection.h \ - msg/async/AsyncMessenger.h \ - msg/async/Event.h \ - msg/async/EventEpoll.h \ - msg/async/EventSelect.h \ - msg/async/Stack.h \ - msg/async/PosixStack.h \ - msg/async/net_handler.h - -if LINUX -libmsg_la_SOURCES += msg/async/EventEpoll.h -endif - -if DARWIN -libmsg_la_SOURCES += msg/async/EventKqueue.h -endif - -if FREEBSD -libmsg_la_SOURCES += msg/async/EventKqueue.h -endif - -if ENABLE_XIO -libmsg_la_SOURCES += \ - msg/xio/QueueStrategy.cc \ - msg/xio/XioConnection.cc \ - msg/xio/XioMessenger.cc \ - msg/xio/XioMsg.cc \ - msg/xio/XioPortal.cc \ - msg/xio/XioPool.cc - -noinst_HEADERS += \ - msg/xio/DispatchStrategy.h \ - msg/xio/FastStrategy.h \ - msg/xio/QueueStrategy.h \ - msg/xio/XioConnection.h \ - msg/xio/XioInSeq.h \ - msg/xio/XioMessenger.h \ - msg/xio/XioMsg.h \ - msg/xio/XioPool.h \ - msg/xio/XioPortal.h \ - msg/xio/XioSubmit.h -endif - -noinst_LTLIBRARIES += libmsg.la diff --git a/src/ocf/Makefile.am b/src/ocf/Makefile.am deleted file mode 100644 index 5ab8c2a5fb8dd..0000000000000 --- a/src/ocf/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = Makefile.in - -if WITH_OCF -# The root of the OCF resource agent hierarchy -# Per the OCF standard, it's always "lib", -# not "lib64" (even on 64-bit platforms). -ocfdir = $(prefix)/lib/ocf - -# The ceph provider directory -radir = $(ocfdir)/resource.d/$(PACKAGE_NAME) - -ra_SCRIPTS = rbd -endif diff --git a/src/os/Makefile.am b/src/os/Makefile.am deleted file mode 100644 index 4ec29c53b531d..0000000000000 --- a/src/os/Makefile.am +++ /dev/null @@ -1,166 +0,0 @@ -libos_types_a_SOURCES = \ - os/kstore/kstore_types.cc \ - os/Transaction.cc -libos_types_a_CXXFLAGS = ${AM_CXXFLAGS} -noinst_LIBRARIES += libos_types.a - -if WITH_LIBAIO -libos_types_a_SOURCES += \ - os/bluestore/bluestore_types.cc \ - os/bluestore/bluefs_types.cc -endif - -if ENABLE_SERVER - -libos_a_SOURCES = \ - os/filestore/chain_xattr.cc \ - os/filestore/DBObjectMap.cc \ - os/filestore/FileJournal.cc \ - os/filestore/FileStore.cc \ - os/filestore/JournalThrottle.cc \ - os/filestore/GenericFileStoreBackend.cc \ - os/filestore/HashIndex.cc \ - os/filestore/IndexManager.cc \ - os/filestore/JournalingObjectStore.cc \ - os/filestore/LFNIndex.cc \ - os/filestore/WBThrottle.cc \ - os/fs/FS.cc \ - os/kstore/kv.cc \ - os/kstore/KStore.cc \ - os/memstore/MemStore.cc \ - os/ObjectStore.cc - -libos_a_CXXFLAGS = ${AM_CXXFLAGS} -I rocksdb/include -fPIC -libos_a_LIBADD = libos_types.a libkv.a -noinst_LIBRARIES += libos.a - -if WITH_FUSE -libos_a_SOURCES += os/FuseStore.cc -libos_a_CXXFLAGS += $(LIBFUSE_CFLAGS) -endif - -if WITH_LIBAIO -libos_a_SOURCES += \ - os/bluestore/kv.cc \ - os/bluestore/Allocator.cc \ - os/bluestore/BitmapFreelistManager.cc \ - os/bluestore/BlockDevice.cc \ - os/bluestore/BlueFS.cc \ - os/bluestore/BlueRocksEnv.cc \ - os/bluestore/BlueStore.cc \ - os/bluestore/ExtentFreelistManager.cc \ - os/bluestore/FreelistManager.cc \ - os/bluestore/KernelDevice.cc \ - os/bluestore/BitMapAllocator.cc \ - os/bluestore/BitAllocator.cc \ - os/bluestore/StupidAllocator.cc -endif - -if LINUX -libos_a_SOURCES += os/filestore/BtrfsFileStoreBackend.cc -endif - -if WITH_LIBXFS -libos_a_SOURCES += \ - os/filestore/XfsFileStoreBackend.cc \ - os/fs/XFS.cc -endif - -if WITH_LIBZFS -libos_a_SOURCES += os/filestore/ZFSFileStoreBackend.cc -endif - -if WITH_LTTNG -libos_a_LIBADD += $(LIBOS_TP) -endif - -noinst_HEADERS += \ - os/filestore/chain_xattr.h \ - os/filestore/BtrfsFileStoreBackend.h \ - os/filestore/CollectionIndex.h \ - os/filestore/DBObjectMap.h \ - os/filestore/FileJournal.h \ - os/filestore/FileStore.h \ - os/filestore/JournalThrottle.h \ - os/filestore/FDCache.h \ - os/filestore/GenericFileStoreBackend.h \ - os/filestore/HashIndex.h \ - os/filestore/IndexManager.h \ - os/filestore/Journal.h \ - os/filestore/JournalingObjectStore.h \ - os/filestore/LFNIndex.h \ - os/filestore/SequencerPosition.h \ - os/filestore/WBThrottle.h \ - os/filestore/XfsFileStoreBackend.h \ - os/filestore/ZFSFileStoreBackend.h \ - os/fs/btrfs_ioctl.h \ - os/fs/FS.h \ - os/fs/XFS.h \ - os/kstore/kstore_types.h \ - os/kstore/KStore.h \ - os/kstore/kv.h \ - os/memstore/MemStore.h \ - os/memstore/PageSet.h \ - os/FuseStore.h \ - os/ObjectMap.h \ - os/ObjectStore.h - -if WITH_LIBAIO -noinst_HEADERS += \ - os/bluestore/bluefs_types.h \ - os/bluestore/bluestore_types.h \ - os/bluestore/kv.h \ - os/bluestore/Allocator.h \ - os/bluestore/BitmapFreelistManager.h \ - os/bluestore/BlockDevice.h \ - os/bluestore/BlueFS.h \ - os/bluestore/BlueRocksEnv.h \ - os/bluestore/BlueStore.h \ - os/bluestore/KernelDevice.h \ - os/bluestore/ExtentFreelistManager.h \ - os/bluestore/FreelistManager.h \ - os/bluestore/BitMapAllocator.h \ - os/bluestore/BitAllocator.h \ - os/bluestore/StupidAllocator.h -endif - -if WITH_LIBZFS -libos_zfs_a_SOURCES = os/fs/ZFS.cc -libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS} -noinst_LIBRARIES += libos_zfs.a -noinst_HEADERS += os/fs/ZFS.h -endif - -if WITH_SPDK - -SPDK_SRCDIR = ${top_srcdir}/src/spdk/lib -${SPDK_SRCDIR}/nvme/libspdk_nvme.a: - $(MAKE) -C ${SPDK_SRCDIR}/nvme DPDK_INC=${LIBDPDK_CFLAGS} -${SPDK_SRCDIR}/memory/libspdk_memory.a: - $(MAKE) -C ${SPDK_SRCDIR}/memory DPDK_INC=${LIBDPDK_CFLAGS} -${SPDK_SRCDIR}/util/libspdk_util.a: - $(MAKE) -C ${SPDK_SRCDIR}/util DPDK_INC=${LIBDPDK_CFLAGS} -${SPDK_SRCDIR}/ioat/libspdk_ioat.a: - $(MAKE) -C ${SPDK_SRCDIR}/ioat DPDK_INC=${LIBDPDK_CFLAGS} -LIBSPDK_CFLAGS = "-I${top_srcdir}/src/spdk/include" -LIBSPDK_LIBS = \ - ${top_srcdir}/src/spdk/lib/nvme/libspdk_nvme.a \ - ${top_srcdir}/src/spdk/lib/memory/libspdk_memory.a \ - ${top_srcdir}/src/spdk/lib/util/libspdk_util.a \ - ${top_srcdir}/src/spdk/lib/ioat/libspdk_ioat.a - -libos_a_CXXFLAGS += \ - ${LIBSPDK_CFLAGS} \ - ${LIBDPDK_CFLAGS} \ - ${LIBPCIACCESS_CFLAGS} -libos_a_SOURCES += os/bluestore/NVMEDevice.cc -noinst_HEADERS += os/bluestore/NVMEDevice.h -endif - -if WITH_LIBAIO -ceph_bluefs_tool_SOURCES = os/bluestore/bluefs_tool.cc -ceph_bluefs_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_PROGRAMS += ceph-bluefs-tool -endif - -endif # ENABLE_SERVER diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am deleted file mode 100644 index 2fba24a41bffa..0000000000000 --- a/src/osd/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -libosd_types_la_SOURCES = \ - osd/PGLog.cc \ - osd/osd_types.cc \ - osd/ECUtil.cc -libosd_types_la_CXXFLAGS = ${AM_CXXFLAGS} -noinst_LTLIBRARIES += libosd_types.la - -if ENABLE_SERVER -if WITH_OSD - -libosd_a_SOURCES = \ - osd/PG.cc \ - osd/ReplicatedPG.cc \ - osd/ReplicatedBackend.cc \ - osd/ECBackend.cc \ - osd/ECMsgTypes.cc \ - osd/ECTransaction.cc \ - osd/PGBackend.cc \ - osd/HitSet.cc \ - osd/OSD.cc \ - osd/OSDCap.cc \ - osd/Watch.cc \ - osd/ClassHandler.cc \ - osd/OpRequest.cc \ - osd/SnapMapper.cc \ - osd/ScrubStore.cc \ - objclass/class_api.cc - -libosd_a_CXXFLAGS = ${AM_CXXFLAGS} -libosd_a_LIBADD = -noinst_LIBRARIES += libosd.a - -noinst_HEADERS += \ - osd/ClassHandler.h \ - osd/HitSet.h \ - osd/OSD.h \ - osd/OSDCap.h \ - osd/OSDMap.h \ - osd/ObjectVersioner.h \ - osd/OpRequest.h \ - osd/SnapMapper.h \ - osd/PG.h \ - osd/PGLog.h \ - osd/ReplicatedPG.h \ - osd/PGBackend.h \ - osd/ReplicatedBackend.h \ - osd/TierAgentState.h \ - osd/ECBackend.h \ - osd/ECUtil.h \ - osd/ECMsgTypes.h \ - osd/ECTransaction.h \ - osd/Watch.h \ - osd/ScrubStore.h \ - osd/osd_types.h - -endif # WITH_OSD -endif # ENABLE_SERVER diff --git a/src/osdc/Makefile.am b/src/osdc/Makefile.am deleted file mode 100644 index 3ba446b0e46cd..0000000000000 --- a/src/osdc/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -libosdc_la_SOURCES = \ - osdc/Objecter.cc \ - osdc/ObjectCacher.cc \ - osdc/Filer.cc \ - osdc/Striper.cc \ - osdc/Journaler.cc -noinst_LTLIBRARIES += libosdc.la - -noinst_HEADERS += \ - osdc/Filer.h \ - osdc/Journaler.h \ - osdc/ObjectCacher.h \ - osdc/Objecter.h \ - osdc/Striper.h \ - osdc/WritebackHandler.h - diff --git a/src/perfglue/Makefile.am b/src/perfglue/Makefile.am deleted file mode 100644 index 77c3085e6d0f1..0000000000000 --- a/src/perfglue/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -libperfglue_la_SOURCES = - -if WITH_TCMALLOC -libperfglue_la_SOURCES += perfglue/heap_profiler.cc -libperfglue_la_LIBADD = -ltcmalloc -AM_CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -AM_CXXFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -else -if WITH_TCMALLOC_MINIMAL -libperfglue_la_SOURCES += perfglue/heap_profiler.cc -libperfglue_la_LIBADD = -ltcmalloc_minimal -AM_CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -AM_CXXFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -else -libperfglue_la_SOURCES += perfglue/disabled_heap_profiler.cc -endif # WITH_TCMALLOC_MINIMAL -endif # WITH_TCMALLOC - -if WITH_PROFILER -libperfglue_la_SOURCES += perfglue/cpu_profiler.cc -else -libperfglue_la_SOURCES += perfglue/disabled_stubs.cc -endif # WITH_PROFILER - -noinst_LTLIBRARIES += libperfglue.la - -# Do not use TCMALLOC with dencoder -DENCODER_SOURCES += \ - perfglue/disabled_heap_profiler.cc \ - perfglue/disabled_stubs.cc - -noinst_HEADERS += \ - perfglue/cpu_profiler.h \ - perfglue/heap_profiler.h - diff --git a/src/pybind/Makefile.am b/src/pybind/Makefile.am deleted file mode 100644 index 0ba8402b96dc5..0000000000000 --- a/src/pybind/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ - -if ENABLE_CLIENT -if WITH_CYTHON - -CYTHON_BUILD_DIR="$(shell readlink -f $(builddir))/build" - -PY_DISTUTILS = \ - mkdir -p $(CYTHON_BUILD_DIR); \ - CC="${CC}" \ - CXX="${CXX}" \ - LDSHARED="${CC} -shared" \ - CPPFLAGS="-iquote \${abs_srcdir}/include ${AM_CPPFLAGS} ${CPPFLAGS}" \ - CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${PYTHON_CFLAGS}" \ - LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${PYTHON_LDFLAGS}" \ - CYTHON_BUILD_DIR=$(CYTHON_BUILD_DIR) \ - CEPH_LIBDIR="$(abs_builddir)/.libs" \ - TMPDIR=${TMPDIR} \ - ${PYTHON} ./setup.py - -if WITH_RADOS -include pybind/rados/Makefile.am -if WITH_RBD -include pybind/rbd/Makefile.am -endif # WITH_RBD -if WITH_CEPHFS -include pybind/cephfs/Makefile.am -endif # WITH_CEPHFS -endif # WITH_RADOS - -endif # WITH_CYTHON -endif # ENABLE_CLIENT diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am deleted file mode 100644 index 386f45c6ffab9..0000000000000 --- a/src/pybind/cephfs/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -EXTRA_DIST += $(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 \ - --build-base $(shell readlink -f $(builddir))/build \ - --verbose - -cephfs-pybind-clean: ${srcdir}/ceph_ver.h - cd $(srcdir)/pybind/cephfs; $(PY_DISTUTILS) clean \ - --build-base $(shell readlink -f $(builddir))/build \ - --verbose - -cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ - fi ; \ - root="--root=$(DESTDIR)" ; \ - else \ - options=--prefix=$(prefix) ; \ - fi ; \ - cd $(srcdir)/pybind/cephfs; $(PY_DISTUTILS) build \ - --build-base $(shell readlink -f $(builddir))/build \ - --build-platlib $(shell readlink -f $(builddir))/build/lib.2 \ - install \ - $$options $$root \ - --single-version-externally-managed \ - --record /dev/null \ - --verbose - -LOCAL_ALL += cephfs-pybind-all -LOCAL_CLEAN += cephfs-pybind-clean -LOCAL_INSTALLEXEC += cephfs-pybind-install-exec diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am deleted file mode 100644 index 57bcc8412ccd4..0000000000000 --- a/src/pybind/rados/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -EXTRA_DIST += $(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 \ - --build-base $(shell readlink -f $(builddir))/build \ - --verbose - -rados-pybind-clean: ${srcdir}/ceph_ver.h - cd $(srcdir)/pybind/rados; $(PY_DISTUTILS) clean \ - --build-base $(shell readlink -f $(builddir))/build \ - --verbose - -rados-pybind-install-exec: ${srcdir}/ceph_ver.h - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ - fi ; \ - root="--root=$(DESTDIR)" ; \ - else \ - options=--prefix=$(prefix) ; \ - fi ; \ - cd $(srcdir)/pybind/rados; $(PY_DISTUTILS) build \ - --build-base $(shell readlink -f $(builddir))/build \ - --build-platlib $(shell readlink -f $(builddir))/build/lib.2 \ - install \ - $$options $$root \ - --single-version-externally-managed \ - --record /dev/null \ - --verbose - -LOCAL_ALL += rados-pybind-all -LOCAL_CLEAN += rados-pybind-clean -LOCAL_INSTALLEXEC += rados-pybind-install-exec - diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am deleted file mode 100644 index 27de18ea4f613..0000000000000 --- a/src/pybind/rbd/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -EXTRA_DIST += $(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 \ - --build-base $(shell readlink -f $(builddir))/build \ - --verbose - -rbd-pybind-clean: ${srcdir}/ceph_ver.h - cd $(srcdir)/pybind/rbd; $(PY_DISTUTILS) clean \ - --build-base $(shell readlink -f $(builddir))/build \ - --verbose - -rbd-pybind-install-exec: ${srcdir}/ceph_ver.h - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ - else \ - options=--prefix=/usr ; \ - fi ; \ - root="--root=$(DESTDIR)" ; \ - else \ - options=--prefix=$(prefix) ; \ - fi ; \ - cd $(srcdir)/pybind/rbd; $(PY_DISTUTILS) build \ - --build-base $(shell readlink -f $(builddir))/build \ - --build-platlib $(shell readlink -f $(builddir))/build/lib.2 \ - install \ - $$options $$root \ - --single-version-externally-managed \ - --record /dev/null \ - --verbose - -LOCAL_ALL += rbd-pybind-all -LOCAL_CLEAN += rbd-pybind-clean -LOCAL_INSTALLEXEC += rbd-pybind-install-exec diff --git a/src/rbd_replay/Makefile.am b/src/rbd_replay/Makefile.am deleted file mode 100644 index 23a8e9152e089..0000000000000 --- a/src/rbd_replay/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -if ENABLE_CLIENT -if WITH_RADOS -if WITH_RBD - -librbd_replay_types_la_SOURCES = \ - rbd_replay/ActionTypes.cc -noinst_HEADERS += \ - rbd_replay/ActionTypes.h -noinst_LTLIBRARIES += librbd_replay_types.la -DENCODER_DEPS += librbd_replay_types.la - -# librbd_replay_la exists only to help with unit tests -librbd_replay_la_SOURCES = \ - rbd_replay/actions.cc \ - rbd_replay/BufferReader.cc \ - rbd_replay/ImageNameMap.cc \ - rbd_replay/PendingIO.cc \ - rbd_replay/rbd_loc.cc \ - rbd_replay/Replayer.cc -librbd_replay_la_LIBADD = \ - $(LIBRBD) \ - $(LIBRADOS) \ - $(CEPH_GLOBAL) -noinst_LTLIBRARIES += librbd_replay.la -noinst_HEADERS += \ - rbd_replay/actions.hpp \ - rbd_replay/BoundedBuffer.hpp \ - rbd_replay/BufferReader.h \ - rbd_replay/ImageNameMap.hpp \ - rbd_replay/ios.hpp \ - rbd_replay/PendingIO.hpp \ - rbd_replay/rbd_loc.hpp \ - rbd_replay/rbd_replay_debug.hpp \ - rbd_replay/Replayer.hpp - -rbd_replay_SOURCES = \ - rbd_replay/rbd-replay.cc -rbd_replay_LDADD = \ - librbd_replay.la \ - librbd_replay_types.la \ - $(LIBRBD) \ - $(LIBRADOS) \ - $(CEPH_GLOBAL) \ - $(LIBCOMMON) - -if LINUX -bin_PROGRAMS += rbd-replay -endif #LINUX - -librbd_replay_ios_la_SOURCES = rbd_replay/ios.cc -librbd_replay_ios_la_LIBADD = $(LIBRBD) \ - $(LIBRADOS) \ - $(CEPH_GLOBAL) \ - librbd_replay.la -noinst_LTLIBRARIES += librbd_replay_ios.la - -rbd_replay_prep_SOURCES = \ - rbd_replay/rbd-replay-prep.cc -rbd_replay_prep_LDADD = \ - librbd_replay.la \ - librbd_replay_ios.la \ - librbd_replay_types.la \ - $(LIBRBD) \ - $(LIBRADOS) \ - $(CEPH_GLOBAL) \ - $(LIBCOMMON) \ - -lbabeltrace \ - -lbabeltrace-ctf \ - -lboost_date_time -if WITH_BABELTRACE -bin_PROGRAMS += rbd-replay-prep -endif - -endif # WITH_RBD -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am deleted file mode 100644 index 22ec417f498d4..0000000000000 --- a/src/rgw/Makefile.am +++ /dev/null @@ -1,285 +0,0 @@ -if ENABLE_CLIENT - -# inject rgw stuff in the decoder testcase -DENCODER_SOURCES += \ - rgw/rgw_dencoder.cc \ - rgw/rgw_acl.cc \ - rgw/rgw_basic_types.cc \ - rgw/rgw_common.cc \ - rgw/rgw_env.cc \ - rgw/rgw_json_enc.cc \ - rgw/rgw_keystone.cc - -DENCODER_DEPS += -lcurl -lexpat \ - libcls_version_client.la \ - libcls_log_client.la \ - libcls_refcount_client.la \ - libcls_user_client.la \ - libcls_timeindex_client.la \ - libcls_statelog_client.la - -if WITH_RADOS -if WITH_RADOSGW - -librgw_la_SOURCES = \ - rgw/rgw_acl.cc \ - rgw/rgw_acl_s3.cc \ - rgw/rgw_acl_swift.cc \ - rgw/rgw_auth.cc \ - rgw/rgw_coroutine.cc \ - rgw/rgw_cr_rados.cc \ - rgw/rgw_lc.cc \ - rgw/rgw_lc_s3.cc \ - rgw/rgw_tools.cc \ - rgw/rgw_basic_types.cc \ - rgw/rgw_bucket.cc \ - rgw/rgw_cache.cc \ - rgw/rgw_client_io.cc \ - rgw/rgw_common.cc \ - rgw/rgw_cors.cc \ - rgw/rgw_cors_s3.cc \ - rgw/rgw_dencoder.cc \ - rgw/rgw_env.cc \ - rgw/rgw_fcgi.cc \ - rgw/rgw_formats.cc \ - rgw/rgw_frontend.cc \ - rgw/rgw_gc.cc \ - rgw/rgw_http_client.cc \ - rgw/rgw_json_enc.cc \ - rgw/rgw_keystone.cc \ - rgw/rgw_loadgen.cc \ - rgw/rgw_log.cc \ - rgw/rgw_metadata.cc \ - rgw/rgw_multi.cc \ - rgw/rgw_multi_del.cc \ - rgw/rgw_auth_s3.cc \ - rgw/rgw_period_history.cc \ - rgw/rgw_period_puller.cc \ - rgw/rgw_period_pusher.cc \ - rgw/rgw_realm_reloader.cc \ - rgw/rgw_realm_watcher.cc \ - rgw/rgw_sync.cc \ - rgw/rgw_data_sync.cc \ - rgw/rgw_object_expirer_core.cc \ - rgw/rgw_op.cc \ - rgw/rgw_os_lib.cc \ - rgw/rgw_policy_s3.cc \ - rgw/rgw_process.cc \ - rgw/rgw_quota.cc \ - rgw/rgw_rados.cc \ - rgw/rgw_replica_log.cc \ - rgw/rgw_request.cc \ - rgw/rgw_resolve.cc \ - rgw/rgw_rest_bucket.cc \ - rgw/rgw_rest.cc \ - rgw/rgw_rest_client.cc \ - rgw/rgw_rest_config.cc \ - rgw/rgw_rest_conn.cc \ - rgw/rgw_rest_log.cc \ - rgw/rgw_rest_metadata.cc \ - rgw/rgw_rest_opstate.cc \ - rgw/rgw_rest_realm.cc \ - rgw/rgw_rest_replica_log.cc \ - rgw/rgw_rest_s3.cc \ - rgw/rgw_rest_swift.cc \ - rgw/rgw_rest_usage.cc \ - rgw/rgw_rest_user.cc \ - rgw/rgw_swift_auth.cc \ - rgw/rgw_usage.cc \ - rgw/rgw_user.cc \ - rgw/rgw_file.cc \ - rgw/librgw.cc \ - rgw/rgw_xml.cc \ - rgw/rgw_xml_enc.cc \ - rgw/rgw_website.cc \ - rgw/rgw_torrent.cc - -if WITH_OPENLDAP -librgw_la_SOURCES += rgw/rgw_ldap.cc - -endif - -librgw_la_CXXFLAGS = -Woverloaded-virtual -fPIC -I$(srcdir)/xxHash \ - ${AM_CXXFLAGS} -# noinst_LTLIBRARIES += librgw.la - -LIBRGW_DEPS += \ - $(LIBRADOS) \ - libcls_rgw_client.la \ - libcls_log_client.la \ - libcls_statelog_client.la \ - libcls_timeindex_client.la \ - libcls_user_client.la \ - libcls_replica_log_client.la \ - libcls_lock_client.la \ - libcls_refcount_client.la \ - libcls_version_client.la \ - -lcurl \ - -lexpat \ - -lm \ - -lfcgi - -if LINUX -LIBRGW_DEPS += \ - -ldl -endif - -if WITH_OPENLDAP -LIBRGW_DEPS += \ - -lldap -endif - -librgw_la_LIBADD = $(LIBRGW_DEPS) \ - $(PTHREAD_LIBS) $(RESOLV_LIBS) libglobal.la \ - $(EXTRALIBS) - -librgw_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 - -lib_LTLIBRARIES += librgw.la - -CIVETWEB_INCLUDE = --include $(srcdir)/civetweb/include/civetweb_conf.h - -libcivetweb_la_SOURCES = \ - rgw/rgw_civetweb.cc \ - rgw/rgw_civetweb_log.cc \ - civetweb/src/civetweb.c - -libcivetweb_la_CXXFLAGS = ${CIVETWEB_INCLUDE} -fPIC -Woverloaded-virtual \ - ${AM_CXXFLAGS} -libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE} ${SSL_INCLUDES} -fPIC -DNO_SSL_DL -LIBCIVETWEB_DEPS += ${SSL_LIBS} - -noinst_LTLIBRARIES += libcivetweb.la - -radosgw_SOURCES = \ - rgw/rgw_fcgi_process.cc \ - rgw/rgw_loadgen_process.cc \ - rgw/rgw_civetweb.cc \ - rgw/rgw_civetweb_frontend.cc \ - rgw/rgw_civetweb_log.cc \ - civetweb/src/civetweb.c \ - rgw/rgw_main.cc - -radosgw_CFLAGS = -I$(srcdir)/civetweb/include -fPIC -I$(srcdir)/xxHash ${CIVETWEB_INCLUDE} -radosgw_CXXFLAGS = ${RGW_CXXFLAGS} ${AM_CXXFLAGS} -radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBCIVETWEB_DEPS) $(LIBRGW_DEPS) $(RESOLV_LIBS) \ - $(CEPH_GLOBAL) -bin_PROGRAMS += radosgw - -radosgw_admin_SOURCES = rgw/rgw_admin.cc rgw/rgw_orphan.cc -radosgw_admin_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) -bin_PROGRAMS += radosgw-admin - -radosgw_token_SOURCES = rgw/rgw_token.cc -radosgw_token_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) -bin_PROGRAMS += radosgw-token - -radosgw_object_expirer_SOURCES = rgw/rgw_object_expirer.cc -radosgw_object_expirer_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) -bin_PROGRAMS += radosgw-object-expirer - -ceph_rgw_multiparser_SOURCES = rgw/rgw_multiparser.cc -ceph_rgw_multiparser_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_rgw_multiparser - -ceph_rgw_jsonparser_SOURCES = \ - rgw/rgw_jsonparser.cc \ - rgw/rgw_common.cc \ - rgw/rgw_env.cc \ - rgw/rgw_json_enc.cc -ceph_rgw_jsonparser_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_rgw_jsonparser - -noinst_HEADERS += \ - rgw/rgw_acl.h \ - rgw/rgw_acl_s3.h \ - rgw/rgw_acl_swift.h \ - rgw/rgw_auth.h \ - rgw/rgw_auth_decoimpl.h \ - rgw/rgw_b64.h \ - rgw/rgw_lc.h \ - rgw/rgw_lc_s3.h \ - rgw/rgw_client_io.h \ - rgw/rgw_coroutine.h \ - rgw/rgw_cr_rados.h \ - rgw/rgw_cr_rest.h \ - rgw/rgw_fcgi.h \ - rgw/rgw_xml.h \ - rgw/rgw_token.h \ - rgw/rgw_basic_types.h \ - rgw/rgw_cache.h \ - rgw/rgw_common.h \ - rgw/rgw_cors.h \ - rgw/rgw_cors_s3.h \ - rgw/rgw_cors_swift.h \ - rgw/rgw_string.h \ - rgw/rgw_file.h \ - rgw/rgw_formats.h \ - rgw/rgw_http_errors.h \ - rgw/rgw_ldap.h \ - rgw/rgw_lib.h \ - rgw/rgw_lib_frontend.h \ - rgw/rgw_log.h \ - rgw/rgw_loadgen.h \ - rgw/rgw_process.h \ - rgw/rgw_request.h \ - rgw/rgw_frontend.h \ - rgw/rgw_multi.h \ - rgw/rgw_policy_s3.h \ - rgw/rgw_gc.h \ - rgw/rgw_metadata.h \ - rgw/rgw_meta_sync_status.h \ - rgw/rgw_multi_del.h \ - rgw/rgw_object_expirer_core.h \ - rgw/rgw_op.h \ - rgw/rgw_os_lib.h \ - rgw/rgw_orphan.h \ - rgw/rgw_http_client.h \ - rgw/rgw_swift_auth.h \ - rgw/rgw_quota.h \ - rgw/rgw_rados.h \ - rgw/rgw_replica_log.h \ - rgw/rgw_resolve.h \ - rgw/rgw_rest.h \ - rgw/rgw_rest_swift.h \ - rgw/rgw_rest_s3.h \ - rgw/rgw_auth_s3.h \ - rgw/rgw_rest_admin.h \ - rgw/rgw_rest_usage.h \ - rgw/rgw_rest_user.h \ - rgw/rgw_rest_bucket.h \ - rgw/rgw_rest_client.h \ - rgw/rgw_rest_conn.h \ - rgw/rgw_tools.h \ - rgw/rgw_rest_metadata.h \ - rgw/rgw_rest_log.h \ - rgw/rgw_rest_opstate.h \ - rgw/rgw_rest_replica_log.h \ - rgw/rgw_rest_config.h \ - rgw/rgw_rest_realm.h \ - rgw/rgw_sync.h \ - rgw/rgw_data_sync.h \ - rgw/rgw_usage.h \ - rgw/rgw_user.h \ - rgw/rgw_bucket.h \ - rgw/rgw_keystone.h \ - rgw/rgw_period_history.h \ - rgw/rgw_period_pusher.h \ - rgw/rgw_period_puller.h \ - rgw/rgw_realm_reloader.h \ - rgw/rgw_realm_watcher.h \ - rgw/rgw_civetweb.h \ - rgw/rgw_boost_asio_coroutine.h \ - rgw/rgw_boost_asio_yield.h \ - rgw/rgw_civetweb_log.h \ - rgw/rgw_website.h \ - rgw/rgw_rest_s3website.h \ - rgw/rgw_torrent.h \ - civetweb/civetweb.h \ - civetweb/include/civetweb.h \ - civetweb/include/civetweb_conf.h \ - civetweb/src/md5.h - -endif # WITH_RADOSGW -endif # WITH_RADOS -endif # ENABLE_CLIENT diff --git a/src/script/make_rocksdb_makefile.sh b/src/script/make_rocksdb_makefile.sh deleted file mode 100755 index 5a0ce50e9cacf..0000000000000 --- a/src/script/make_rocksdb_makefile.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -cd rocksdb -git clean -dffx -cd .. -echo "EXTRA_DIST += \\" > /tmp/$$ -for f in `find rocksdb -type f | grep -v -e /.git$ -e ^rocksdb/tools/rdb | sort`; do - echo " $f \\" >> /tmp/$$ -done -mv /tmp/$$ Makefile-rocksdb.am diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am deleted file mode 100644 index 750037cac8dd0..0000000000000 --- a/src/test/Makefile-client.am +++ /dev/null @@ -1,814 +0,0 @@ -# This should use LIBMDS_TYPES once it exists -ceph_dencoder_SOURCES = \ - test/encoding/ceph_dencoder.cc \ - $(DENCODER_SOURCES) -ceph_dencoder_LDADD = \ - $(LIBRGW) \ - $(LIBRGW_DEPS) \ - $(LIBRADOS) \ - $(LIBRBD_TYPES) \ - $(LIBOSD_TYPES) \ - $(LIBOS_TYPES) \ - $(LIBMON_TYPES) \ - $(DENCODER_DEPS) \ - $(CEPH_GLOBAL) - -# These should always use explicit _CFLAGS/_CXXFLAGS so avoid basename conflicts -ceph_dencoder_CFLAGS = ${AM_CFLAGS} -ceph_dencoder_CXXFLAGS = ${AM_CXXFLAGS} - -if COMPILER_HAS_VTA -ceph_dencoder_CFLAGS += -fno-var-tracking-assignments -ceph_dencoder_CXXFLAGS += -fno-var-tracking-assignments -endif - -if WITH_RBD -ceph_dencoder_CXXFLAGS += -DWITH_RBD -endif -if WITH_RADOSGW -ceph_dencoder_CXXFLAGS += -DWITH_RADOSGW -endif - - -bin_PROGRAMS += ceph-dencoder - -noinst_HEADERS += \ - test/encoding/test_ceph_time.h - -if WITH_RADOS - -libradostest_la_SOURCES = \ - test/librados/test.cc \ - test/librados/TestCase.cc -noinst_LTLIBRARIES += libradostest.la -libradostest_la_CXXFLAGS = $(UNITTEST_CXXFLAGS) -RADOS_TEST_LDADD = libradostest.la $(LIBCOMMON) $(CRYPTO_LIBS) - -ceph_test_rados_SOURCES = \ - test/osd/TestRados.cc \ - test/osd/TestOpStat.cc \ - test/osd/Object.cc \ - test/osd/RadosModel.cc -ceph_test_rados_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_rados - -ceph_test_mutate_SOURCES = test/test_mutate.cc -ceph_test_mutate_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_mutate - -if WITH_BUILD_TESTS -test_build_librados_SOURCES = \ - test/buildtest_skeleton.cc \ - $(librados_la_SOURCES) -test_build_librados_LDADD = \ - $(LIBRADOS_DEPS) \ - $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -test_build_librados_LDFLAGS = -static-libtool-libs -test_build_librados_CFLAGS = $(AM_CFLAGS) -test_build_librados_CXXFLAGS = $(AM_CXXFLAGS) -bin_DEBUGPROGRAMS += test_build_librados -endif # WITH_BUILD_TESTS - -ceph_smalliobench_SOURCES = \ - test/bench/small_io_bench.cc \ - test/bench/rados_backend.cc \ - test/bench/detailed_stat_collector.cc \ - test/bench/bencher.cc -ceph_smalliobench_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_smalliobench - -ceph_omapbench_SOURCES = test/omap_bench.cc -ceph_omapbench_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_omapbench - -ceph_objectstore_bench_SOURCES = test/objectstore_bench.cc -ceph_objectstore_bench_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_objectstore_bench - -if LINUX -ceph_kvstorebench_SOURCES = \ - test/kv_store_bench.cc \ - key_value_store/kv_flat_btree_async.cc -ceph_kvstorebench_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_kvstorebench -endif - -if LINUX -ceph_test_rados_list_parallel_SOURCES = \ - test/system/rados_list_parallel.cc \ - test/system/st_rados_create_pool.cc \ - test/system/st_rados_list_objects.cc -ceph_test_rados_list_parallel_LDADD = $(LIBRADOS) libsystest.la $(PTHREAD_LIBS) -bin_DEBUGPROGRAMS += ceph_test_rados_list_parallel - -ceph_test_rados_open_pools_parallel_SOURCES = \ - test/system/rados_open_pools_parallel.cc \ - test/system/st_rados_create_pool.cc -ceph_test_rados_open_pools_parallel_LDADD = $(LIBRADOS) libsystest.la $(PTHREAD_LIBS) -bin_DEBUGPROGRAMS += ceph_test_rados_open_pools_parallel - -ceph_test_rados_delete_pools_parallel_SOURCES = \ - test/system/rados_delete_pools_parallel.cc \ - test/system/st_rados_create_pool.cc \ - test/system/st_rados_delete_pool.cc \ - test/system/st_rados_list_objects.cc -ceph_test_rados_delete_pools_parallel_LDADD = $(LIBRADOS) libsystest.la $(PTHREAD_LIBS) -bin_DEBUGPROGRAMS += ceph_test_rados_delete_pools_parallel - -ceph_test_rados_watch_notify_SOURCES = \ - test/system/rados_watch_notify.cc \ - test/system/st_rados_create_pool.cc \ - test/system/st_rados_delete_pool.cc \ - test/system/st_rados_delete_objs.cc \ - test/system/st_rados_watch.cc \ - test/system/st_rados_notify.cc -ceph_test_rados_watch_notify_LDADD = $(LIBRADOS) libsystest.la $(PTHREAD_LIBS) -bin_DEBUGPROGRAMS += ceph_test_rados_watch_notify -endif # LINUX - -unittest_intarith_SOURCES = test/test_intarith.cc -unittest_intarith_LDADD = $(UNITTEST_LDADD) -unittest_intarith_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_intarith - -unittest_librados_SOURCES = test/librados/librados.cc -unittest_librados_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) $(UNITTEST_LDADD) -unittest_librados_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_librados - -unittest_librados_config_SOURCES = test/librados/librados_config.cc -unittest_librados_config_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) $(UNITTEST_LDADD) -unittest_librados_config_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_librados_config - -ceph_multi_stress_watch_SOURCES = test/multi_stress_watch.cc -ceph_multi_stress_watch_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -bin_DEBUGPROGRAMS += ceph_multi_stress_watch - - -ceph_test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc -ceph_test_cls_rbd_LDADD = \ - $(LIBRADOS) libcls_rbd_client.la libcls_lock_client.la \ - $(LIBCOMMON) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) $(CRYPTO_LIBS) \ - $(EXTRALIBS) -ceph_test_cls_rbd_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_rbd - -ceph_test_cls_refcount_SOURCES = test/cls_refcount/test_cls_refcount.cc -ceph_test_cls_refcount_LDADD = $(LIBRADOS) libcls_refcount_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_cls_refcount_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_refcount - -ceph_test_cls_version_SOURCES = test/cls_version/test_cls_version.cc -ceph_test_cls_version_LDADD = $(LIBRADOS) libcls_version_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_cls_version_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_version - -ceph_test_cls_log_SOURCES = test/cls_log/test_cls_log.cc -ceph_test_cls_log_LDADD = $(LIBRADOS) libcls_log_client.la $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_cls_log_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_log - -ceph_test_cls_statelog_SOURCES = test/cls_statelog/test_cls_statelog.cc -ceph_test_cls_statelog_LDADD = $(LIBRADOS) libcls_statelog_client.la $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_cls_statelog_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_statelog - -ceph_test_cls_replica_log_SOURCES = test/cls_replica_log/test_cls_replica_log.cc -ceph_test_cls_replica_log_LDADD = \ - $(LIBRADOS) libcls_replica_log_client.la \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_cls_replica_log_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_replica_log - -ceph_test_cls_lock_SOURCES = test/cls_lock/test_cls_lock.cc -ceph_test_cls_lock_LDADD = \ - $(LIBRADOS) libcls_lock_client.la \ - $(LIBCOMMON) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_cls_lock_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_lock - -ceph_test_cls_hello_SOURCES = test/cls_hello/test_cls_hello.cc -ceph_test_cls_hello_LDADD = \ - $(LIBRADOS) $(CRYPTO_LIBS) \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_cls_hello_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_hello - -ceph_test_cls_numops_SOURCES = test/cls_numops/test_cls_numops.cc -ceph_test_cls_numops_LDADD = \ - $(LIBRADOS) libcls_numops_client.la \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_cls_numops_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_numops - -ceph_test_cls_journal_SOURCES = test/cls_journal/test_cls_journal.cc -ceph_test_cls_journal_LDADD = \ - libcls_journal_client.la $(LIBRADOS) \ - $(LIBCOMMON) $(CRYPTO_LIBS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_cls_journal_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_journal - -ceph_test_rados_api_cmd_SOURCES = test/librados/cmd.cc -ceph_test_rados_api_cmd_LDADD = \ - $(LIBCOMMON) $(LIBRADOS) $(CRYPTO_LIBS) \ - $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_cmd_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_cmd - -ceph_test_rados_api_io_SOURCES = test/librados/io.cc -ceph_test_rados_api_io_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_io_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_io - -ceph_test_rados_api_c_write_operations_SOURCES = \ - test/librados/c_write_operations.cc -ceph_test_rados_api_c_write_operations_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_c_write_operations_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_c_write_operations - -ceph_test_rados_api_c_read_operations_SOURCES = \ - test/librados/c_read_operations.cc -ceph_test_rados_api_c_read_operations_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_c_read_operations_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_c_read_operations - -ceph_test_rados_api_aio_SOURCES = test/librados/aio.cc -ceph_test_rados_api_aio_LDADD = \ - $(LIBRADOS) $(LIBCOMMON) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_aio_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_aio - -ceph_test_rados_api_list_SOURCES = test/librados/list.cc -ceph_test_rados_api_list_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) $(CEPH_GLOBAL) -ceph_test_rados_api_list_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_list - -ceph_test_rados_api_nlist_SOURCES = test/librados/nlist.cc -ceph_test_rados_api_nlist_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_nlist_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_nlist - -ceph_test_rados_api_pool_SOURCES = test/librados/pool.cc -ceph_test_rados_api_pool_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_pool_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_pool - -ceph_test_rados_api_stat_SOURCES = test/librados/stat.cc -ceph_test_rados_api_stat_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_stat_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_stat - -ceph_test_rados_api_watch_notify_SOURCES = test/librados/watch_notify.cc -ceph_test_rados_api_watch_notify_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_watch_notify_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_watch_notify - -ceph_test_rados_api_snapshots_SOURCES = test/librados/snapshots.cc -ceph_test_rados_api_snapshots_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_snapshots_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_snapshots - -ceph_test_rados_api_cls_SOURCES = test/librados/cls.cc -ceph_test_rados_api_cls_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_cls_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_cls - -ceph_test_rados_api_misc_SOURCES = test/librados/misc.cc -ceph_test_rados_api_misc_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_rados_api_misc_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_misc - -ceph_test_rados_api_tier_SOURCES = \ - test/librados/tier.cc \ - osd/HitSet.cc -ceph_test_rados_api_tier_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_rados_api_tier_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_tier - -ceph_test_rados_api_lock_SOURCES = test/librados/lock.cc -ceph_test_rados_api_lock_LDADD = $(LIBRADOS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_rados_api_lock_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_api_lock - -ceph_test_stress_watch_SOURCES = test/test_stress_watch.cc -ceph_test_stress_watch_LDADD = \ - $(LIBRADOS) $(LIBCOMMON) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -ceph_test_stress_watch_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_stress_watch - -librados_test_stub_la_SOURCES = \ - test/librados_test_stub/LibradosTestStub.cc \ - test/librados_test_stub/TestClassHandler.cc \ - test/librados_test_stub/TestIoCtxImpl.cc \ - test/librados_test_stub/TestMemIoCtxImpl.cc \ - test/librados_test_stub/TestMemRadosClient.cc \ - test/librados_test_stub/TestRadosClient.cc \ - test/librados_test_stub/TestWatchNotify.cc -noinst_HEADERS += \ - test/librados_test_stub/LibradosTestStub.h \ - test/librados_test_stub/MockTestMemIoCtxImpl.h \ - test/librados_test_stub/MockTestMemRadosClient.h \ - test/librados_test_stub/TestClassHandler.h \ - test/librados_test_stub/TestRadosClient.h \ - test/librados_test_stub/TestMemRadosClient.h \ - test/librados_test_stub/TestWatchNotify.h \ - test/librados_test_stub/TestMemIoCtxImpl.h \ - test/librados_test_stub/TestIoCtxImpl.h -noinst_LTLIBRARIES += librados_test_stub.la - -libjournal_test_mock_la_SOURCES = \ - test/journal/mock/MockJournaler.cc -noinst_HEADERS += \ - test/journal/mock/MockJournaler.h -libjournal_test_mock_la_CXXFLAGS = $(UNITTEST_CXXFLAGS) -noinst_LTLIBRARIES += libjournal_test_mock.la - -unittest_journal_SOURCES = \ - test/journal/test_main.cc \ - test/journal/test_Entry.cc \ - test/journal/test_FutureImpl.cc \ - test/journal/test_Journaler.cc \ - test/journal/test_JournalMetadata.cc \ - test/journal/test_JournalPlayer.cc \ - test/journal/test_JournalRecorder.cc \ - test/journal/test_JournalTrimmer.cc \ - test/journal/test_ObjectPlayer.cc \ - test/journal/test_ObjectRecorder.cc \ - test/journal/RadosTestFixture.cc -unittest_journal_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_journal_LDADD = \ - libjournal.la libcls_journal_client.la \ - librados_test_stub.la librados_internal.la \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) $(LIBRADOS) -check_TESTPROGRAMS += unittest_journal - -if WITH_RBD -ceph_smalliobenchrbd_SOURCES = \ - test/bench/small_io_bench_rbd.cc \ - test/bench/rbd_backend.cc \ - test/bench/detailed_stat_collector.cc \ - test/bench/bencher.cc -ceph_smalliobenchrbd_LDADD = $(LIBRBD) $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_smalliobenchrbd - -unittest_rbd_replay_SOURCES = test/test_rbd_replay.cc -unittest_rbd_replay_LDADD = $(LIBRBD) \ - $(LIBRADOS) \ - $(CEPH_GLOBAL) \ - librbd_replay.la \ - librbd_replay_ios.la \ - $(UNITTEST_LDADD) -unittest_rbd_replay_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_rbd_replay - -librbd_test_la_SOURCES = \ - test/librbd/test_fixture.cc \ - test/librbd/test_support.cc \ - test/librbd/test_librbd.cc \ - test/librbd/test_ImageWatcher.cc \ - test/librbd/test_internal.cc \ - test/librbd/test_mirroring.cc \ - test/librbd/test_MirroringWatcher.cc \ - test/librbd/test_ObjectMap.cc \ - test/librbd/test_ConsistencyGroups.cc \ - test/librbd/journal/test_Entries.cc \ - test/librbd/journal/test_Replay.cc -librbd_test_la_CXXFLAGS = $(UNITTEST_CXXFLAGS) -noinst_LTLIBRARIES += librbd_test.la - -librbd_test_mock_la_SOURCES = \ - test/librbd/mock/MockImageCtx.cc \ - test/librbd/mock/MockJournal.cc -librbd_test_mock_la_CXXFLAGS = $(UNITTEST_CXXFLAGS) -noinst_LTLIBRARIES += librbd_test_mock.la - -unittest_librbd_SOURCES = \ - test/librbd/test_main.cc \ - test/librbd/test_mock_fixture.cc \ - test/librbd/test_mock_ExclusiveLock.cc \ - test/librbd/test_mock_Journal.cc \ - test/librbd/test_mock_ObjectWatcher.cc \ - test/librbd/exclusive_lock/test_mock_AcquireRequest.cc \ - test/librbd/exclusive_lock/test_mock_ReacquireRequest.cc \ - test/librbd/exclusive_lock/test_mock_ReleaseRequest.cc \ - test/librbd/image/test_mock_RefreshRequest.cc \ - test/librbd/image_watcher/test_mock_RewatchRequest.cc \ - test/librbd/journal/test_mock_Replay.cc \ - test/librbd/object_map/test_mock_InvalidateRequest.cc \ - test/librbd/object_map/test_mock_LockRequest.cc \ - test/librbd/object_map/test_mock_RefreshRequest.cc \ - test/librbd/object_map/test_mock_ResizeRequest.cc \ - test/librbd/object_map/test_mock_SnapshotCreateRequest.cc \ - test/librbd/object_map/test_mock_SnapshotRemoveRequest.cc \ - test/librbd/object_map/test_mock_SnapshotRollbackRequest.cc \ - test/librbd/object_map/test_mock_UnlockRequest.cc \ - test/librbd/object_map/test_mock_UpdateRequest.cc \ - test/librbd/operation/test_mock_ResizeRequest.cc \ - test/librbd/operation/test_mock_SnapshotCreateRequest.cc \ - test/librbd/operation/test_mock_SnapshotProtectRequest.cc \ - test/librbd/operation/test_mock_SnapshotRemoveRequest.cc \ - test/librbd/operation/test_mock_SnapshotRollbackRequest.cc \ - test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc -unittest_librbd_CXXFLAGS = $(UNITTEST_CXXFLAGS) -DTEST_LIBRBD_INTERNALS -unittest_librbd_LDADD = \ - librbd_test.la libjournal_test_mock.la librbd_test_mock.la \ - librbd_api.la librbd_internal.la $(LIBRBD_TYPES) \ - libcls_rbd_client.la libcls_lock_client.la \ - libjournal.la libcls_journal_client.la \ - librados_test_stub.la librados_internal.la \ - $(LIBRADOS) $(LIBOSDC) $(UNITTEST_LDADD) \ - $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -check_PROGRAMS += unittest_librbd -check_SCRIPTS += test/run-rbd-unit-tests.sh - -ceph_test_librbd_SOURCES = \ - test/librbd/test_main.cc -ceph_test_librbd_CXXFLAGS = $(UNITTEST_CXXFLAGS) -DTEST_LIBRBD_INTERNALS -ceph_test_librbd_LDADD = \ - librbd_test.la librbd_api.la librbd_internal.la $(LIBRBD_TYPES) \ - libcls_rbd_client.la libcls_lock_client.la \ - libjournal.la libcls_journal_client.la \ - librados_api.la $(LIBRADOS_DEPS) $(UNITTEST_LDADD) \ - $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -bin_DEBUGPROGRAMS += ceph_test_librbd - -ceph_test_librbd_api_SOURCES = \ - test/librbd/test_support.cc \ - test/librbd/test_librbd.cc \ - test/librbd/test_main.cc -ceph_test_librbd_api_CXXFLAGS = $(UNITTEST_CXXFLAGS) -ceph_test_librbd_api_LDADD = \ - $(LIBRBD) $(LIBRADOS) $(LIBCOMMON) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -bin_DEBUGPROGRAMS += ceph_test_librbd_api - -noinst_HEADERS += \ - test/librbd/test_fixture.h \ - test/librbd/test_mock_fixture.h \ - test/librbd/test_support.h \ - test/librbd/mock/MockAioImageRequestWQ.h \ - test/librbd/mock/MockContextWQ.h \ - test/librbd/mock/MockExclusiveLock.h \ - test/librbd/mock/MockImageCtx.h \ - test/librbd/mock/MockImageState.h \ - test/librbd/mock/MockImageWatcher.h \ - test/librbd/mock/MockJournal.h \ - test/librbd/mock/MockJournalPolicy.h \ - test/librbd/mock/MockObjectMap.h \ - test/librbd/mock/MockOperations.h \ - test/librbd/mock/MockReadahead.h \ - test/librbd/object_map/mock/MockInvalidateRequest.h - -librbd_mirror_test_la_SOURCES = \ - test/rbd_mirror/test_ClusterWatcher.cc \ - test/rbd_mirror/test_PoolWatcher.cc \ - test/rbd_mirror/test_ImageReplayer.cc \ - test/rbd_mirror/test_ImageDeleter.cc \ - test/rbd_mirror/test_ImageSync.cc \ - test/rbd_mirror/test_fixture.cc - -noinst_HEADERS += \ - test/rbd_mirror/test_fixture.h \ - test/rbd_mirror/test_mock_fixture.h - -librbd_mirror_test_la_CXXFLAGS = $(UNITTEST_CXXFLAGS) -noinst_LTLIBRARIES += librbd_mirror_test.la - -unittest_rbd_mirror_SOURCES = \ - test/rbd_mirror/test_main.cc \ - test/rbd_mirror/test_mock_fixture.cc \ - test/rbd_mirror/test_mock_ImageReplayer.cc \ - test/rbd_mirror/test_mock_ImageSync.cc \ - test/rbd_mirror/test_mock_ImageSyncThrottler.cc \ - test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc \ - test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc \ - test/rbd_mirror/image_replayer/test_mock_EventPreprocessor.cc \ - test/rbd_mirror/image_sync/test_mock_ImageCopyRequest.cc \ - test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc \ - test/rbd_mirror/image_sync/test_mock_SnapshotCopyRequest.cc \ - test/rbd_mirror/image_sync/test_mock_SnapshotCreateRequest.cc \ - test/rbd_mirror/image_sync/test_mock_SyncPointCreateRequest.cc \ - test/rbd_mirror/image_sync/test_mock_SyncPointPruneRequest.cc -unittest_rbd_mirror_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_rbd_mirror_LDADD = \ - librbd_mirror_test.la \ - libjournal_test_mock.la \ - librbd_test_mock.la \ - librados_test_stub.la \ - librbd_mirror_internal.la \ - librbd_internal.la \ - librbd_api.la \ - libjournal.la \ - librados_internal.la \ - libcls_rbd_client.la \ - libcls_lock_client.la \ - libcls_journal_client.la \ - $(LIBRBD_TYPES) \ - $(LIBRADOS) $(LIBOSDC) $(UNITTEST_LDADD) \ - $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -check_PROGRAMS += unittest_rbd_mirror - -ceph_test_rbd_mirror_SOURCES = \ - test/rbd_mirror/test_main.cc -ceph_test_rbd_mirror_CXXFLAGS = $(UNITTEST_CXXFLAGS) -ceph_test_rbd_mirror_LDADD = \ - librbd_mirror_test.la \ - librbd_mirror_internal.la \ - librbd_internal.la \ - librbd_api.la \ - libjournal.la \ - librados_internal.la \ - libcls_rbd_client.la \ - libcls_lock_client.la \ - libcls_journal_client.la \ - $(LIBRBD_TYPES) \ - librados_api.la $(LIBRADOS_DEPS) \ - $(LIBOSDC) $(UNITTEST_LDADD) \ - $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -bin_DEBUGPROGRAMS += ceph_test_rbd_mirror - -ceph_test_rbd_mirror_random_write_SOURCES = \ - test/rbd_mirror/random_write.cc -ceph_test_rbd_mirror_random_write_CXXFLAGS = $(UNITTEST_CXXFLAGS) -ceph_test_rbd_mirror_random_write_LDADD = \ - $(LIBRBD) $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_rbd_mirror_random_write - -if LINUX -ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.cc -ceph_test_librbd_fsx_LDADD = \ - libjournal.la libcls_journal_client.la \ - $(LIBKRBD) $(LIBRBD) $(LIBRADOS) \ - $(CRYPTO_LIBS) $(PTHREAD_LIBS) -ceph_test_librbd_fsx_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_librbd_fsx -endif -endif # WITH_RBD - - -if WITH_RADOSSTRIPER -libradosstripertest_la_SOURCES = test/libradosstriper/TestCase.cc -noinst_LTLIBRARIES += libradosstripertest.la -libradosstripertest_la_LIBADD = $(RADOS_TEST_LDADD) -libradosstripertest_la_CXXFLAGS = $(UNITTEST_CXXFLAGS) -RADOS_STRIPER_TEST_LDADD = libradosstripertest.la - -ceph_test_rados_striper_api_io_SOURCES = test/libradosstriper/io.cc -ceph_test_rados_striper_api_io_LDADD = \ - $(LIBRADOS) $(LIBRADOSSTRIPER) $(LIBCOMMON) \ - $(UNITTEST_LDADD) $(RADOS_STRIPER_TEST_LDADD) -ceph_test_rados_striper_api_io_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_striper_api_io - -ceph_test_rados_striper_api_aio_SOURCES = test/libradosstriper/aio.cc -ceph_test_rados_striper_api_aio_LDADD = $(LIBRADOS) $(LIBRADOSSTRIPER) $(UNITTEST_LDADD) $(RADOS_STRIPER_TEST_LDADD) -ceph_test_rados_striper_api_aio_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_striper_api_aio - -ceph_test_rados_striper_api_striping_SOURCES = test/libradosstriper/striping.cc -ceph_test_rados_striper_api_striping_LDADD = $(LIBRADOS) $(LIBRADOSSTRIPER) $(UNITTEST_LDADD) $(RADOS_STRIPER_TEST_LDADD) -ceph_test_rados_striper_api_striping_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rados_striper_api_striping - -endif # WITH_RADOSSTRIPER - - -if WITH_CEPHFS - -if WITH_BUILD_TESTS -# I dont get this one... testing the osdc build but link in libcephfs? -test_build_libcephfs_SOURCES = \ - test/buildtest_skeleton.cc \ - $(libosdc_la_SOURCES) -test_build_libcephfs_LDADD = \ - $(LIBCEPHFS) -lexpat \ - $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -test_build_libcephfs_LDFLAGS = -static-libtool-libs -test_build_libcephfs_CFLAGS = $(AM_CFLAGS) -test_build_libcephfs_CXXFLAGS = $(AM_CXXFLAGS) -bin_DEBUGPROGRAMS += test_build_libcephfs -endif # WITH_BUILD_TESTS - -unittest_encoding_LDADD = $(LIBCEPHFS) $(LIBRADOS) $(CEPH_GLOBAL) -lm $(UNITTEST_LDADD) -unittest_encoding_CXXFLAGS = $(UNITTEST_CXXFLAGS) -fno-strict-aliasing -check_TESTPROGRAMS += unittest_encoding - -unittest_base64_SOURCES = test/base64.cc -unittest_base64_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) -lm $(UNITTEST_LDADD) -unittest_base64_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_base64 - -unittest_run_cmd_SOURCES = test/run_cmd.cc -unittest_run_cmd_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) $(UNITTEST_LDADD) -unittest_run_cmd_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_run_cmd - -unittest_simple_spin_SOURCES = test/simple_spin.cc -unittest_simple_spin_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) $(UNITTEST_LDADD) -unittest_simple_spin_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_simple_spin - -unittest_libcephfs_config_SOURCES = test/libcephfs_config.cc -unittest_libcephfs_config_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) $(UNITTEST_LDADD) -unittest_libcephfs_config_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_libcephfs_config - -ceph_test_libcephfs_SOURCES = \ - test/libcephfs/test.cc \ - test/libcephfs/readdir_r_cb.cc \ - test/libcephfs/caps.cc \ - test/libcephfs/multiclient.cc \ - test/libcephfs/access.cc \ - test/libcephfs/acl.cc - -if LINUX -ceph_test_libcephfs_SOURCES += test/libcephfs/flock.cc -endif # LINUX - -ceph_test_libcephfs_LDADD = $(LIBRADOS) $(LIBCEPHFS) $(LIBCOMMON) $(UNITTEST_LDADD) -ceph_test_libcephfs_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_libcephfs - -unittest_encoding_SOURCES = test/encoding.cc - -ceph_test_c_headers_SOURCES = test/test_c_headers.c -ceph_test_c_headers_LDADD = $(LIBRADOS) $(LIBCEPHFS) -ceph_test_c_headers_CFLAGS = $(AM_CFLAGS) \ - -Wstrict-prototypes \ - -Wredundant-decls \ - -Wall \ - -Wundef \ - -Wwrite-strings \ - -Wmissing-prototypes \ - -Wendif-labels \ - -Wmissing-include-dirs \ - -Wempty-body \ - -Wnested-externs \ - -Wformat-security \ - -Wformat-y2k \ - -Winit-self \ - -Wignored-qualifiers \ - -Wold-style-definition \ - -Wtype-limits -if !CLANG -ceph_test_c_headers_CFLAGS += -Werror -Wold-style-declaration -endif # !CLANG -bin_DEBUGPROGRAMS += ceph_test_c_headers - -endif # WITH_CEPHFS - - -if WITH_RADOSGW - -if WITH_BUILD_TESTS -test_build_librgw_SOURCES = \ - test/buildtest_skeleton.cc \ - $(librgw_la_SOURCES) -test_build_librgw_LDADD = \ - $(LIBRGW_DEPS) \ - $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) \ - $(CEPH_GLOBAL) -test_build_librgw_LDFLAGS = -static-libtool-libs -test_build_librgw_CFLAGS = $(AM_CFLAGS) -test_build_librgw_CXXFLAGS = $(AM_CXXFLAGS) -bin_DEBUGPROGRAMS += test_build_librgw -endif # WITH_BUILD_TESTS - -ceph_test_cors_SOURCES = test/test_cors.cc -ceph_test_cors_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) \ - -lcurl -lexpat -ceph_test_cors_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cors - -unittest_rgw_bencode_SOURCES = test/rgw/test_rgw_bencode.cc -unittest_rgw_bencode_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) -lcurl -lexpat -unittest_rgw_bencode_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_rgw_bencode - -ceph_test_rgw_manifest_SOURCES = test/rgw/test_rgw_manifest.cc -ceph_test_rgw_manifest_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) \ - -lcurl -lexpat - -ceph_test_rgw_manifest_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rgw_manifest - -ceph_test_rgw_period_history_SOURCES = test/rgw/test_rgw_period_history.cc -ceph_test_rgw_period_history_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) -lcurl -lexpat -ceph_test_rgw_period_history_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rgw_period_history - -ceph_test_http_manager_SOURCES = test/rgw/test_http_manager.cc -ceph_test_http_manager_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) -lcurl -lexpat -ceph_test_http_manager_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_http_manager - -ceph_test_rgw_obj_SOURCES = test/rgw/test_rgw_obj.cc -ceph_test_rgw_obj_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) \ - -lcurl -lexpat - -ceph_test_rgw_obj_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_rgw_obj - -ceph_test_cls_rgw_meta_SOURCES = test/test_rgw_admin_meta.cc -ceph_test_cls_rgw_meta_LDADD = \ - $(LIBRGW) $(LIBRGW_DEPS) $(LIBRADOS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) \ - -lcurl -lexpat \ - libcls_timeindex_client.la \ - libcls_version_client.la libcls_log_client.la \ - libcls_statelog_client.la libcls_refcount_client.la \ - libcls_rgw_client.la libcls_user_client.la libcls_lock_client.la -ceph_test_cls_rgw_meta_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_rgw_meta - -ceph_test_cls_rgw_log_SOURCES = test/test_rgw_admin_log.cc -ceph_test_cls_rgw_log_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) \ - -lcurl -lexpat \ - libcls_version_client.la libcls_log_client.la \ - libcls_statelog_client.la libcls_refcount_client.la \ - libcls_rgw_client.la libcls_user_client.la libcls_lock_client.la -ceph_test_cls_rgw_log_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_rgw_log - -ceph_test_cls_rgw_opstate_SOURCES = test/test_rgw_admin_opstate.cc -ceph_test_cls_rgw_opstate_LDADD = \ - $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \ - $(UNITTEST_LDADD) $(CRYPTO_LIBS) \ - -lcurl -lexpat \ - libcls_version_client.la libcls_log_client.la \ - libcls_timeindex_client.la \ - libcls_statelog_client.la libcls_refcount_client.la \ - libcls_rgw_client.la libcls_user_client.la libcls_lock_client.la \ - $(LIBRADOS) -ceph_test_cls_rgw_opstate_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_rgw_opstate - -ceph_test_cls_rgw_SOURCES = test/cls_rgw/test_cls_rgw.cc -ceph_test_cls_rgw_LDADD = \ - $(LIBRADOS) $(CRYPTO_LIBS) libcls_rgw_client.la \ - $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RADOS_TEST_LDADD) -ceph_test_cls_rgw_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_cls_rgw - -# librgw/RGW-NFS -librgw_file_SOURCES = test/librgw_file.cc -librgw_file_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS) -librgw_file_LDADD = $(UNITTEST_LDADD) \ - $(LIBRGW) $(LIBRGW_DEPS) librados.la $(PTHREAD_LIBS) $(CEPH_GLOBAL) $(EXTRALIBS) - -librgw_file_cd_SOURCES = test/librgw_file_cd.cc -librgw_file_cd_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS) -librgw_file_cd_LDADD = $(UNITTEST_LDADD) \ - $(LIBRGW) $(LIBRGW_DEPS) librados.la $(PTHREAD_LIBS) $(CEPH_GLOBAL) $(EXTRALIBS) -check_PROGRAMS += librgw_file_cd - -librgw_file_gp_SOURCES = test/librgw_file_gp.cc -librgw_file_gp_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS) -librgw_file_gp_LDADD = $(UNITTEST_LDADD) \ - $(LIBRGW) $(LIBRGW_DEPS) librados.la $(PTHREAD_LIBS) $(CEPH_GLOBAL) $(EXTRALIBS) -check_PROGRAMS += librgw_file_gp - -librgw_file_aw_SOURCES = test/librgw_file_aw.cc -librgw_file_aw_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS) -librgw_file_aw_LDADD = $(UNITTEST_LDADD) \ - $(LIBRGW) $(LIBRGW_DEPS) librados.la $(PTHREAD_LIBS) $(CEPH_GLOBAL) $(EXTRALIBS) -check_PROGRAMS += librgw_file_aw - -librgw_file_nfsns_SOURCES = test/librgw_file_nfsns.cc -librgw_file_nfsns_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS) ${RGW_CXXFLAGS} -librgw_file_nfsns_LDADD = $(UNITTEST_LDADD) \ - $(LIBRGW) $(LIBRGW_DEPS) librados.la $(PTHREAD_LIBS) $(CEPH_GLOBAL) $(EXTRALIBS) -check_PROGRAMS += librgw_file_nfsns - -# -# test_rgw_token_SOURCES = test/test_rgw_token.cc -# test_rgw_token_CXXFLAGS = $(UNITTEST_CXXFLAGS) -# test_rgw_token_LDADD = $(UNITTEST_LDADD) \ -# librgw.la $(PTHREAD_LIBS) $(LIBOS) $(CEPH_GLOBAL) $(EXTRALIBS) -# bin_DEBUGPROGRAMS += test_rgw_token - -# test_rgw_ldap_SOURCES = rgw/rgw_ldap.cc test/test_rgw_ldap.cc -# test_rgw_ldap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -# test_rgw_ldap_LDADD = $(UNITTEST_LDADD) \ -# librados.la $(PTHREAD_LIBS) $(LIBOS) $(CEPH_GLOBAL) ${OPENLDAP_LIBS} -# $(EXTRALIBS) -# bin_DEBUGPROGRAMS += test_rgw_ldap - -endif # WITH_RADOSGW - - -endif # WITH_RADOS diff --git a/src/test/Makefile-server.am b/src/test/Makefile-server.am deleted file mode 100644 index 85117028d7c40..0000000000000 --- a/src/test/Makefile-server.am +++ /dev/null @@ -1,274 +0,0 @@ -ceph_test_async_driver_SOURCES = test/msgr/test_async_driver.cc -ceph_test_async_driver_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_async_driver_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_async_driver - -ceph_test_msgr_SOURCES = test/msgr/test_msgr.cc -ceph_test_msgr_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_msgr_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_msgr - -ceph_test_async_networkstack_SOURCES = test/msgr/test_async_networkstack.cc -ceph_test_async_networkstack_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_async_networkstack_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_async_networkstack - -ceph_test_trans_SOURCES = test/test_trans.cc -ceph_test_trans_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_trans - -ceph_test_mon_workloadgen_SOURCES = test/mon/test_mon_workloadgen.cc -ceph_test_mon_workloadgen_LDADD = $(LIBOS) $(LIBOSDC) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_mon_workloadgen - -ceph_test_mon_msg_SOURCES = test/mon/test-mon-msg.cc -ceph_test_mon_msg_LDADD = $(LIBOS) $(LIBOSDC) $(CEPH_GLOBAL) $(UNITTEST_LDADD) -ceph_test_mon_msg_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_mon_msg - -ceph_perf_objectstore_SOURCES = test/objectstore/ObjectStoreTransactionBenchmark.cc -ceph_perf_objectstore_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_perf_objectstore_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_perf_objectstore - -ceph_perf_local_SOURCES = test/perf_local.cc test/perf_helper.cc -ceph_perf_local_LDADD = $(LIBOS) $(CEPH_GLOBAL) -ceph_perf_local_CXXFLAGS = ${AM_CXXFLAGS} \ - ${INTEL_SSE_FLAGS} \ - ${INTEL_SSE2_FLAGS} - -noinst_HEADERS += test/perf_helper.h -bin_DEBUGPROGRAMS += ceph_perf_local - -ceph_perf_msgr_server_SOURCES = test/msgr/perf_msgr_server.cc -ceph_perf_msgr_server_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_perf_msgr_server_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_perf_msgr_server - -ceph_perf_msgr_client_SOURCES = test/msgr/perf_msgr_client.cc -ceph_perf_msgr_client_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_perf_msgr_client_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_perf_msgr_client - -if LINUX -ceph_test_objectstore_SOURCES = test/objectstore/store_test.cc -ceph_test_objectstore_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_objectstore_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_objectstore - -ceph_test_keyvaluedb_SOURCES = test/objectstore/test_kv.cc -ceph_test_keyvaluedb_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_keyvaluedb_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_keyvaluedb - -ceph_test_filestore_SOURCES = test/filestore/TestFileStore.cc -ceph_test_filestore_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_filestore_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_filestore - -unittest_bluefs_SOURCES = test/objectstore/test_bluefs.cc -unittest_bluefs_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_bluefs_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_bluefs - -unittest_bit_alloc_SOURCES = test/objectstore/BitAllocator_test.cc -unittest_bit_alloc_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_bit_alloc_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_bit_alloc - -unittest_alloc_SOURCES = test/objectstore/Allocator_test.cc -unittest_alloc_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_alloc_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_alloc - -unittest_bluestore_types_SOURCES = test/objectstore/test_bluestore_types.cc -unittest_bluestore_types_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_bluestore_types_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_bluestore_types - -endif - -ceph_test_objectstore_workloadgen_SOURCES = \ - test/objectstore/workload_generator.cc \ - test/objectstore/TestObjectStoreState.cc -ceph_test_objectstore_workloadgen_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_objectstore_workloadgen - -ceph_test_filestore_idempotent_SOURCES = \ - test/objectstore/test_idempotent.cc \ - test/objectstore/FileStoreTracker.cc \ - test/common/ObjectContents.cc -ceph_test_filestore_idempotent_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_filestore_idempotent - -ceph_test_filestore_idempotent_sequence_SOURCES = \ - test/objectstore/test_idempotent_sequence.cc \ - test/objectstore/DeterministicOpSequence.cc \ - test/objectstore/TestObjectStoreState.cc \ - test/objectstore/FileStoreDiff.cc -ceph_test_filestore_idempotent_sequence_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_filestore_idempotent_sequence - -unittest_transaction_SOURCES = test/objectstore/test_transaction.cc -unittest_transaction_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_transaction_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_transaction - -ceph_xattr_bench_SOURCES = test/xattr_bench.cc -ceph_xattr_bench_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_xattr_bench_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_xattr_bench - -ceph_test_filejournal_SOURCES = test/test_filejournal.cc -ceph_test_filejournal_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_filejournal_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_filejournal - -ceph_test_object_map_SOURCES = \ - test/ObjectMap/test_object_map.cc \ - test/ObjectMap/KeyValueDBMemory.cc -ceph_test_object_map_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_object_map_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_object_map - -ceph_test_keyvaluedb_atomicity_SOURCES = test/ObjectMap/test_keyvaluedb_atomicity.cc -ceph_test_keyvaluedb_atomicity_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_keyvaluedb_atomicity_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_keyvaluedb_atomicity - -ceph_test_keyvaluedb_iterators_SOURCES = \ - test/ObjectMap/test_keyvaluedb_iterators.cc \ - test/ObjectMap/KeyValueDBMemory.cc -ceph_test_keyvaluedb_iterators_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_keyvaluedb_iterators_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_keyvaluedb_iterators - - -if ENABLE_CLIENT # These need both server and client -if WITH_RADOS - -ceph_smalliobenchfs_SOURCES = \ - test/bench/small_io_bench_fs.cc \ - test/bench/testfilestore_backend.cc \ - test/bench/detailed_stat_collector.cc \ - test/bench/bencher.cc -ceph_smalliobenchfs_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_smalliobenchfs - -ceph_smalliobenchdumb_SOURCES = \ - test/bench/small_io_bench_dumb.cc \ - test/bench/dumb_backend.cc \ - test/bench/detailed_stat_collector.cc \ - test/bench/bencher.cc -ceph_smalliobenchdumb_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_smalliobenchdumb - -ceph_tpbench_SOURCES = \ - test/bench/tp_bench.cc \ - test/bench/detailed_stat_collector.cc -ceph_tpbench_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_tpbench - -endif # WITH_RADOS -endif # ENABLE_CLIENT - - -if WITH_MON -ceph_test_keys_SOURCES = test/testkeys.cc -ceph_test_keys_LDADD = $(LIBMON) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_keys - -get_command_descriptions_SOURCES = test/common/get_command_descriptions.cc -get_command_descriptions_LDADD = $(LIBMON) $(LIBMON_TYPES) $(LIBOS) $(LIBCOMMON) $(CEPH_GLOBAL) -noinst_PROGRAMS += get_command_descriptions - -unittest_mon_moncap_SOURCES = test/mon/moncap.cc -unittest_mon_moncap_LDADD = $(LIBMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_mon_moncap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_mon_moncap - -unittest_mon_pgmap_SOURCES = test/mon/PGMap.cc -unittest_mon_pgmap_LDADD = $(LIBMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_mon_pgmap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_mon_pgmap - -endif # WITH_MON - - -if WITH_OSD -unittest_ecbackend_SOURCES = test/osd/TestECBackend.cc -unittest_ecbackend_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_ecbackend_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_ecbackend - -unittest_osdscrub_SOURCES = test/osd/TestOSDScrub.cc -unittest_osdscrub_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_osdscrub_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_osdscrub -if LINUX -unittest_osdscrub_LDADD += -ldl -endif # LINUX - -unittest_pglog_SOURCES = test/osd/TestPGLog.cc -unittest_pglog_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_pglog_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_pglog -if LINUX -unittest_pglog_LDADD += -ldl -endif # LINUX - -unittest_hitset_SOURCES = test/osd/hitset.cc -unittest_hitset_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_hitset_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_hitset - -unittest_osd_osdcap_SOURCES = test/osd/osdcap.cc -unittest_osd_osdcap_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_osd_osdcap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_osd_osdcap - -ceph_test_snap_mapper_SOURCES = test/test_snap_mapper.cc -ceph_test_snap_mapper_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_snap_mapper_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_snap_mapper - -unittest_pageset_SOURCES = test/test_pageset.cc -unittest_pageset_LDADD = $(UNITTEST_LDADD) -unittest_pageset_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_pageset - -endif # WITH_OSD - -if WITH_SLIBROCKSDB -unittest_rocksdb_option_static_SOURCES = test/objectstore/TestRocksdbOptionParse.cc -unittest_rocksdb_option_static_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_rocksdb_option_static_CXXFLAGS = $(UNITTEST_CXXFLAGS) ${AM_CXXFLAGS} ${LIBROCKSDB_CFLAGS} -I rocksdb/include -check_TESTPROGRAMS += unittest_rocksdb_option_static -endif - -if WITH_DLIBROCKSDB -unittest_rocksdb_option_SOURCES = test/objectstore/TestRocksdbOptionParse.cc -unittest_rocksdb_option_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -lrocksdb -unittest_rocksdb_option_CXXFLAGS = $(UNITTEST_CXXFLAGS) ${AM_CXXFLAGS} ${LIBROCKSDB_CFLAGS} -std=gnu++11 -check_TESTPROGRAMS += unittest_rocksdb_option -endif - -unittest_chain_xattr_SOURCES = test/objectstore/chain_xattr.cc -unittest_chain_xattr_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_chain_xattr_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_chain_xattr - -unittest_lfnindex_SOURCES = test/os/TestLFNIndex.cc -unittest_lfnindex_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_lfnindex_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_lfnindex - - -if WITH_MDS - -unittest_mds_authcap_SOURCES = test/mds/TestMDSAuthCaps.cc -unittest_mds_authcap_LDADD = $(LIBMDS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_mds_authcap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_mds_authcap - -endif # WITH_MDS diff --git a/src/test/Makefile.am b/src/test/Makefile.am deleted file mode 100644 index 43f375b46efeb..0000000000000 --- a/src/test/Makefile.am +++ /dev/null @@ -1,529 +0,0 @@ -include test/erasure-code/Makefile.am -include test/messenger/Makefile.am -include test/compressor/Makefile.am - -if ENABLE_CLIENT -include test/Makefile-client.am -endif - -if ENABLE_SERVER -include test/Makefile-server.am -endif - -## Unknown/other tests - -ceph_test_timers_SOURCES = test/TestTimers.cc -ceph_test_timers_LDADD = $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_timers - -ceph_test_signal_handlers_SOURCES = test/TestSignalHandlers.cc -ceph_test_signal_handlers_LDADD = $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_signal_handlers - -ceph_test_rewrite_latency_SOURCES = test/test_rewrite_latency.cc -ceph_test_rewrite_latency_LDADD = $(LIBCOMMON) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -bin_DEBUGPROGRAMS += ceph_test_rewrite_latency - -ceph_test_crypto_SOURCES = test/testcrypto.cc -ceph_test_crypto_LDADD = $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_crypto - - -## Build tests -# These should all use explicit _CXXFLAGS so avoid basename conflicts -if WITH_BUILD_TESTS -test_build_libcommon_SOURCES = \ - test/buildtest_skeleton.cc \ - $(libcommon_la_SOURCES) -test_build_libcommon_LDADD = \ - $(LIBCOMMON_DEPS) \ - $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -test_build_libcommon_LDFLAGS = -static-libtool-libs -test_build_libcommon_CFLAGS = $(AM_CFLAGS) -test_build_libcommon_CXXFLAGS = $(AM_CXXFLAGS) -bin_DEBUGPROGRAMS += test_build_libcommon -endif # WITH_BUILD_TESTS - - -if LINUX -libsystest_la_SOURCES = \ - test/system/cross_process_sem.cc \ - test/system/systest_runnable.cc \ - test/system/systest_settings.cc -libsystest_la_LIBADD = $(CEPH_GLOBAL) -noinst_LTLIBRARIES += libsystest.la -endif # LINUX - - -ceph_bench_log_SOURCES = test/bench_log.cc -ceph_bench_log_LDADD = $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_bench_log - - - -## Unit tests - -check_SCRIPTS += \ - test/ceph_objectstore_tool.py \ - test/test-ceph-helpers.sh \ - test/cephtool-test-osd.sh \ - test/cephtool-test-mon.sh \ - test/cephtool-test-mds.sh \ - test/cephtool-test-rados.sh \ - test/test_pool_create.sh \ - test/test_crush_bucket.sh \ - unittest_bufferlist.sh \ - test/encoding/check-generated.sh \ - test/mon/osd-pool-create.sh \ - test/mon/misc.sh \ - test/mon/osd-crush.sh \ - test/mon/mon-ping.sh \ - test/mon/mon-created-time.sh \ - test/mon/osd-erasure-code-profile.sh \ - test/mon/mkfs.sh \ - test/mon/mon-scrub.sh \ - test/mon/test_pool_quota.sh \ - test/osd/osd-scrub-snaps.sh \ - test/osd/osd-config.sh \ - test/osd/osd-reuse-id.sh \ - test/osd/osd-bench.sh \ - test/osd/osd-reactivate.sh \ - test/osd/osd-copy-from.sh \ - test/osd/osd-markdown.sh \ - test/mon/mon-handle-forward.sh \ - test/libradosstriper/rados-striper.sh \ - test/test_objectstore_memstore.sh \ - test/test_pidfile.sh \ - test/test_subman.sh - -EXTRA_DIST += \ - $(srcdir)/test/python/brag-client/setup.py \ - $(srcdir)/test/python/brag-client/tox.ini \ - $(srcdir)/test/python/brag-client/tests/test_ceph_brag.py \ - $(srcdir)/test/debian-jessie/Dockerfile.in \ - $(srcdir)/test/debian-jessie/install-deps.sh \ - $(srcdir)/test/debian-jessie/debian \ - $(srcdir)/test/ubuntu-12.04/Dockerfile.in \ - $(srcdir)/test/ubuntu-12.04/install-deps.sh \ - $(srcdir)/test/ubuntu-12.04/debian \ - $(srcdir)/test/ubuntu-14.04/Dockerfile.in \ - $(srcdir)/test/ubuntu-14.04/install-deps.sh \ - $(srcdir)/test/ubuntu-14.04/debian \ - $(srcdir)/test/fedora-21/Dockerfile.in \ - $(srcdir)/test/fedora-21/install-deps.sh \ - $(srcdir)/test/fedora-21/ceph.spec.in \ - $(srcdir)/test/centos-6/Dockerfile.in \ - $(srcdir)/test/centos-6/install-deps.sh \ - $(srcdir)/test/centos-6/ceph.spec.in \ - $(srcdir)/test/centos-7/Dockerfile.in \ - $(srcdir)/test/centos-7/install-deps.sh \ - $(srcdir)/test/centos-7/ceph.spec.in \ - $(srcdir)/test/opensuse-13.2/Dockerfile.in \ - $(srcdir)/test/opensuse-13.2/install-deps.sh \ - $(srcdir)/test/opensuse-13.2/ceph.spec.in \ - $(srcdir)/test/coverage.sh \ - $(patsubst %,$(srcdir)/%,$(check_SCRIPTS)) - -# target to build but not run the unit tests -unittests:: $(check_PROGRAMS) - -UNITTEST_CXXFLAGS = \ - $(AM_CXXFLAGS) \ - -I$(top_srcdir)/src/googletest/googlemock/include \ - -I$(top_builddir)/src/googletest/googlemock/include \ - -I$(top_srcdir)/src/googletest/googletest/include \ - -I$(top_builddir)/src/googletest/googletest/include -UNITTEST_LDADD = \ - $(top_builddir)/src/googletest/googlemock/lib/libgmock_main.la \ - $(top_builddir)/src/googletest/googlemock/lib/libgmock.la \ - $(top_builddir)/src/googletest/googletest/lib/libgtest.la \ - $(PTHREAD_LIBS) - -if SOLARIS -UNITTEST_LDADD += \ - -lsocket -lnsl -endif - -if FREEBSD -UNITTEST_LDADD += \ - -lexecinfo -endif - -unittest_addrs_SOURCES = test/test_addrs.cc -unittest_addrs_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_addrs_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_addrs - -unittest_blkdev_SOURCES = test/common/test_blkdev.cc -unittest_blkdev_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_blkdev_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -check_TESTPROGRAMS += unittest_blkdev -endif - -unittest_bloom_filter_SOURCES = test/common/test_bloom_filter.cc -unittest_bloom_filter_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_bloom_filter_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_bloom_filter - -unittest_histogram_SOURCES = test/common/histogram.cc -unittest_histogram_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_histogram_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_histogram - -unittest_prioritized_queue_SOURCES = test/common/test_prioritized_queue.cc -unittest_prioritized_queue_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_prioritized_queue_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_prioritized_queue - -unittest_weighted_priority_queue_SOURCES = test/common/test_weighted_priority_queue.cc -unittest_weighted_priority_queue_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_weighted_priority_queue_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_weighted_priority_queue - -unittest_str_map_SOURCES = test/common/test_str_map.cc -unittest_str_map_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_str_map_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_str_map - -unittest_mutex_debug_SOURCES = test/common/test_mutex_debug.cc -unittest_mutex_debug_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_mutex_debug_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) ${EXTRALIBS} -check_TESTPROGRAMS += unittest_mutex_debug - -unittest_shunique_lock_SOURCES = test/common/test_shunique_lock.cc -unittest_shunique_lock_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_shunique_lock_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) ${EXTRALIBS} -check_TESTPROGRAMS += unittest_shunique_lock - -unittest_sharedptr_registry_SOURCES = test/common/test_sharedptr_registry.cc -unittest_sharedptr_registry_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_sharedptr_registry_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_sharedptr_registry - -unittest_shared_cache_SOURCES = test/common/test_shared_cache.cc -unittest_shared_cache_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_shared_cache_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_shared_cache - -unittest_sloppy_crc_map_SOURCES = test/common/test_sloppy_crc_map.cc -unittest_sloppy_crc_map_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_sloppy_crc_map_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_sloppy_crc_map - -unittest_time_SOURCES = test/common/test_time.cc -unittest_time_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_time_LDADD = $(LIBCOMMON) -lm $(UNITTEST_LDADD) $(CRYPTO_LIBS) $(EXTRALIBS) -check_TESTPROGRAMS += unittest_time - -unittest_util_SOURCES = test/common/test_util.cc -unittest_util_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_util_LDADD = $(LIBCOMMON) -lm $(UNITTEST_LDADD) $(CRYPTO_LIBS) $(EXTRALIBS) -check_TESTPROGRAMS += unittest_util - -unittest_crush_wrapper_SOURCES = test/crush/CrushWrapper.cc -unittest_crush_wrapper_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBCRUSH) -unittest_crush_wrapper_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2 -check_TESTPROGRAMS += unittest_crush_wrapper - -unittest_crush_SOURCES = test/crush/crush.cc -unittest_crush_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_crush_LDADD = $(LIBCOMMON) -lm $(UNITTEST_LDADD) $(CEPH_CRUSH) $(EXTRALIBS) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_crush - -unittest_osdmap_SOURCES = test/osd/TestOSDMap.cc -unittest_osdmap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_osdmap_LDADD = $(UNITTEST_LDADD) $(LIBCOMMON) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_osdmap - -unittest_workqueue_SOURCES = test/test_workqueue.cc -unittest_workqueue_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_workqueue_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_workqueue - -unittest_striper_SOURCES = test/test_striper.cc -unittest_striper_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_striper_LDADD = $(LIBOSDC) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_striper - -unittest_prebufferedstreambuf_SOURCES = test/test_prebufferedstreambuf.cc -unittest_prebufferedstreambuf_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_prebufferedstreambuf_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) $(EXTRALIBS) -check_TESTPROGRAMS += unittest_prebufferedstreambuf - -unittest_str_list_SOURCES = test/test_str_list.cc -unittest_str_list_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_str_list_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_str_list - -unittest_log_SOURCES = log/test.cc -unittest_log_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) -unittest_log_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2 -check_TESTPROGRAMS += unittest_log - -unittest_throttle_SOURCES = test/common/Throttle.cc -unittest_throttle_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_throttle_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2 -check_TESTPROGRAMS += unittest_throttle - -unittest_ceph_argparse_SOURCES = test/ceph_argparse.cc -unittest_ceph_argparse_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_ceph_argparse_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_ceph_argparse - -unittest_ceph_compatset_SOURCES = test/ceph_compatset.cc -unittest_ceph_compatset_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_ceph_compatset_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_ceph_compatset - -unittest_mds_types_SOURCES = test/fs/mds_types.cc -unittest_mds_types_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_mds_types_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_mds_types - -unittest_osd_types_SOURCES = test/osd/types.cc -unittest_osd_types_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_osd_types_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_osd_types - -unittest_lru_SOURCES = test/common/test_lru.cc -unittest_lru_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_lru_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_lru - -unittest_io_priority_SOURCES = test/common/test_io_priority.cc -unittest_io_priority_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_io_priority_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_io_priority - -unittest_gather_SOURCES = test/gather.cc -unittest_gather_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_gather_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_gather - -unittest_signals_SOURCES = test/signals.cc -unittest_signals_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_signals_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_signals - -unittest_bufferlist_SOURCES = test/bufferlist.cc -unittest_bufferlist_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_bufferlist_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_bufferlist - -unittest_xlist_SOURCES = test/test_xlist.cc -unittest_xlist_LDADD = $(UNITTEST_LDADD) $(LIBCOMMON) -unittest_xlist_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_xlist - -unittest_crc32c_SOURCES = test/common/test_crc32c.cc -unittest_crc32c_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_crc32c_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_crc32c - -unittest_arch_SOURCES = test/test_arch.cc -unittest_arch_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_arch_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_arch - -unittest_crypto_SOURCES = test/crypto.cc -unittest_crypto_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_crypto_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_crypto - -unittest_crypto_init_SOURCES = test/crypto_init.cc -unittest_crypto_init_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_crypto_init_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_crypto_init - -unittest_perf_counters_SOURCES = test/perf_counters.cc -unittest_perf_counters_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_perf_counters_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_perf_counters - -unittest_admin_socket_SOURCES = test/admin_socket.cc -unittest_admin_socket_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_admin_socket_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_admin_socket - -unittest_ceph_crypto_SOURCES = test/ceph_crypto.cc -unittest_ceph_crypto_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_ceph_crypto_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_ceph_crypto - -unittest_utf8_SOURCES = test/utf8.cc -unittest_utf8_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_utf8_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_utf8 - -unittest_mime_SOURCES = test/mime.cc -unittest_mime_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_mime_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_mime - -unittest_escape_SOURCES = test/escape.cc -unittest_escape_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_escape_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_escape - -unittest_strtol_SOURCES = test/strtol.cc -unittest_strtol_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_strtol_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_strtol - -unittest_confutils_SOURCES = test/confutils.cc -unittest_confutils_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_confutils_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_confutils - -unittest_config_SOURCES = test/common/test_config.cc -unittest_config_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_config_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_config - -unittest_context_SOURCES = test/common/test_context.cc -unittest_context_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_context_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_context - -unittest_safe_io_SOURCES = test/common/test_safe_io.cc -unittest_safe_io_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_safe_io_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_safe_io - -unittest_heartbeatmap_SOURCES = test/heartbeat_map.cc -unittest_heartbeatmap_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_heartbeatmap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_heartbeatmap - -# why does this include rgw/rgw_formats.cc...? -unittest_formatter_SOURCES = \ - test/formatter.cc \ - rgw/rgw_formats.cc -unittest_formatter_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_formatter_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_formatter - -unittest_daemon_config_SOURCES = test/daemon_config.cc -unittest_daemon_config_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_daemon_config_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_daemon_config - -unittest_ipaddr_SOURCES = test/test_ipaddr.cc -unittest_ipaddr_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_ipaddr_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_ipaddr - -unittest_texttable_SOURCES = test/test_texttable.cc -unittest_texttable_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) -unittest_texttable_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_texttable - -unittest_on_exit_SOURCES = test/on_exit.cc -unittest_on_exit_LDADD = $(PTHREAD_LIBS) -check_TESTPROGRAMS += unittest_on_exit - -unittest_readahead_SOURCES = test/common/Readahead.cc -unittest_readahead_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_readahead_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2 -check_TESTPROGRAMS += unittest_readahead - -unittest_tableformatter_SOURCES = test/common/test_tableformatter.cc -unittest_tableformatter_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_tableformatter_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_tableformatter - -unittest_bit_vector_SOURCES = test/common/test_bit_vector.cc -unittest_bit_vector_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_bit_vector_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_bit_vector - -unittest_interval_set_SOURCES = test/common/test_interval_set.cc -unittest_interval_set_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_interval_set_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_interval_set - -unittest_subprocess_SOURCES = test/test_subprocess.cc -unittest_subprocess_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) -unittest_subprocess_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_PROGRAMS += unittest_subprocess - -unittest_async_compressor_SOURCES = test/common/test_async_compressor.cc -unittest_async_compressor_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_async_compressor_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBCOMPRESSOR) $(LIBCOMMON) -check_PROGRAMS += unittest_async_compressor - -unittest_dns_resolve_SOURCES = test/common/dns_resolve.cc -unittest_dns_resolve_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RESOLV_LIBS) -unittest_dns_resolve_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_dns_resolve - -unittest_monmap_SOURCES = test/mon/MonMap.cc -unittest_monmap_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(RESOLV_LIBS) -unittest_monmap_CXXFLAGS = $(UNITTEST_CXXFLAGS) -check_TESTPROGRAMS += unittest_monmap - -if LINUX -# -# XXX FREEBSD -# These tests use nosetests and getting that to work thusfar has not worked -# -check_SCRIPTS += test/pybind/test_ceph_argparse.py -check_SCRIPTS += test/pybind/test_ceph_daemon.py -endif - -ceph_test_objectcacher_stress_SOURCES = \ - test/osdc/object_cacher_stress.cc \ - test/osdc/FakeWriteback.cc \ - test/osdc/MemWriteback.cc -ceph_test_objectcacher_stress_LDADD = $(LIBOSDC) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_objectcacher_stress - -ceph_test_cfuse_cache_invalidate_SOURCES = test/test_cfuse_cache_invalidate.cc -bin_DEBUGPROGRAMS += ceph_test_cfuse_cache_invalidate - -if LINUX -ceph_test_get_blkdev_size_SOURCES = test/test_get_blkdev_size.cc -ceph_test_get_blkdev_size_LDADD = $(LIBCOMMON) -bin_DEBUGPROGRAMS += ceph_test_get_blkdev_size -endif - -noinst_HEADERS += \ - test/bench/backend.h \ - test/bench/bencher.h \ - test/bench/detailed_stat_collector.h \ - test/bench/distribution.h \ - test/bench/dumb_backend.h \ - test/bench/rados_backend.h \ - test/bench/rbd_backend.h \ - test/bench/stat_collector.h \ - test/bench/testfilestore_backend.h \ - test/common/ObjectContents.h \ - test/encoding/types.h \ - test/objectstore/DeterministicOpSequence.h \ - test/objectstore/FileStoreDiff.h \ - test/objectstore/FileStoreTracker.h \ - test/objectstore/TestObjectStoreState.h \ - test/objectstore/workload_generator.h \ - test/kv_store_bench.h \ - test/librados/test.h \ - test/librados/TestCase.h \ - test/libradosstriper/TestCase.h \ - test/ObjectMap/KeyValueDBMemory.h \ - test/omap_bench.h \ - test/osdc/FakeWriteback.h \ - test/osdc/MemWriteback.h \ - test/osd/Object.h \ - test/osd/RadosModel.h \ - test/osd/TestOpStat.h \ - test/system/cross_process_sem.h \ - test/system/st_rados_create_pool.h \ - test/system/st_rados_delete_objs.h \ - test/system/st_rados_delete_pool.h \ - test/system/st_rados_list_objects.h \ - test/system/st_rados_notify.h \ - test/system/st_rados_watch.h \ - test/system/systest_runnable.h \ - test/system/systest_settings.h \ - test/unit.h \ - test/journal/RadosTestFixture.h diff --git a/src/test/compressor/Makefile.am b/src/test/compressor/Makefile.am deleted file mode 100644 index e08ecd3444866..0000000000000 --- a/src/test/compressor/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -if ENABLE_SERVER -if WITH_OSD - - -libceph_example_la_SOURCES = \ - common/buffer.cc \ - compressor/Compressor.cc \ - test/compressor/compressor_plugin_example.cc -noinst_HEADERS += test/compressor/compressor_example.h -test/compressor/compressor_plugin_example.cc: ./ceph_ver.h -libceph_example_la_CFLAGS = ${AM_CFLAGS} -libceph_example_la_CXXFLAGS= ${AM_CXXFLAGS} -libceph_example_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libceph_example_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__compression_.*' -compressorlib_LTLIBRARIES += libceph_example.la - -unittest_compression_plugin_SOURCES = \ - compressor/Compressor.cc \ - test/compressor/test_compression_plugin.cc -unittest_compression_plugin_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_compression_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_compression_plugin_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_compression_plugin - -unittest_compression_snappy_SOURCES = \ - test/compressor/test_compression_snappy.cc \ - ${snappy_sources} -unittest_compression_snappy_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_compression_snappy_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_compression_snappy_LDFLAGS = -lsnappy -if LINUX -unittest_compression_snappy_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_compression_snappy - -unittest_compression_plugin_snappy_SOURCES = \ - test/compressor/test_compression_plugin_snappy.cc \ - ${snappy_sources} -unittest_compression_plugin_snappy_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_compression_plugin_snappy_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBCOMPRESSOR) -unittest_compression_plugin_snappy_LDFLAGS = -lsnappy -if LINUX -unittest_compression_plugin_snappy_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_compression_plugin_snappy - -unittest_compression_zlib_SOURCES = \ - test/compressor/test_compression_zlib.cc \ - ${zlib_sources} -unittest_compression_zlib_CFLAGS = ${AM_CFLAGS} \ - -I$(srcdir)/isa-l/include/ -unittest_compression_zlib_CXXFLAGS = $(UNITTEST_CXXFLAGS) \ - -I$(srcdir)/isa-l/include/ -unittest_compression_zlib_CCASFLAGS = ${AM_CCASFLAGS} \ - -I$(srcdir)/isa-l/include/ -unittest_compression_zlib_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_compression_zlib_LDFLAGS = -lz -if LINUX -unittest_compression_zlib_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_compression_zlib - -unittest_compression_plugin_zlib_SOURCES = \ - test/compressor/test_compression_plugin_zlib.cc -unittest_compression_plugin_zlib_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_compression_plugin_zlib_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBCOMPRESSOR) -unittest_compression_plugin_zlib_LDFLAGS = -lz -if LINUX -unittest_compression_plugin_zlib_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_compression_plugin_zlib - -endif # WITH_OSD -endif # ENABLE_SERVER diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am deleted file mode 100644 index 72ce1ba5cee74..0000000000000 --- a/src/test/erasure-code/Makefile.am +++ /dev/null @@ -1,367 +0,0 @@ -if ENABLE_SERVER -if WITH_OSD - -check_SCRIPTS = - -noinst_HEADERS += \ - test/erasure-code/ceph_erasure_code_benchmark.h -ceph_erasure_code_benchmark_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/ceph_erasure_code_benchmark.cc -ceph_erasure_code_benchmark_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) -if LINUX -ceph_erasure_code_benchmark_LDADD += -ldl -endif -bin_DEBUGPROGRAMS += ceph_erasure_code_benchmark - -noinst_HEADERS += \ - test/erasure-code/ceph_erasure_code_benchmark.h - -ceph_erasure_code_non_regression_SOURCES = \ - test/erasure-code/ceph_erasure_code_non_regression.cc -ceph_erasure_code_non_regression_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) -if LINUX -ceph_erasure_code_non_regression_LDADD += -ldl -endif -noinst_PROGRAMS += ceph_erasure_code_non_regression - -ceph_erasure_code_SOURCES = \ - test/erasure-code/ceph_erasure_code.cc -ceph_erasure_code_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) -if LINUX -ceph_erasure_code_LDADD += -ldl -endif -bin_DEBUGPROGRAMS += ceph_erasure_code - -libec_example_la_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/ErasureCodePluginExample.cc -test/erasure-code/ErasureCodePluginExample.cc: ./ceph_ver.h -libec_example_la_CFLAGS = ${AM_CFLAGS} -libec_example_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_example_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_example_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_example_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_example.la - -libec_missing_entry_point_la_SOURCES = test/erasure-code/ErasureCodePluginMissingEntryPoint.cc -test/erasure-code/ErasureCodePluginMissingEntryPoint.cc: ./ceph_ver.h -libec_missing_entry_point_la_CFLAGS = ${AM_CFLAGS} -libec_missing_entry_point_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_missing_entry_point_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_missing_entry_point_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_missing_entry_point_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_missing_entry_point.la - -libec_missing_version_la_SOURCES = test/erasure-code/ErasureCodePluginMissingVersion.cc -libec_missing_version_la_CFLAGS = ${AM_CFLAGS} -libec_missing_version_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_missing_version_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_missing_version_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_missing_version_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_missing_version.la - -libec_hangs_la_SOURCES = test/erasure-code/ErasureCodePluginHangs.cc -test/erasure-code/ErasureCodePluginHangs.cc: ./ceph_ver.h -libec_hangs_la_CFLAGS = ${AM_CFLAGS} -libec_hangs_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_hangs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_hangs_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_hangs_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_hangs.la - -libec_fail_to_initialize_la_SOURCES = test/erasure-code/ErasureCodePluginFailToInitialize.cc -test/erasure-code/ErasureCodePluginFailToInitialize.cc: ./ceph_ver.h -libec_fail_to_initialize_la_CFLAGS = ${AM_CFLAGS} -libec_fail_to_initialize_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_fail_to_initialize_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_fail_to_initialize_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_fail_to_initialize_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_fail_to_initialize.la - -libec_fail_to_register_la_SOURCES = test/erasure-code/ErasureCodePluginFailToRegister.cc -test/erasure-code/ErasureCodePluginFailToRegister.cc: ./ceph_ver.h -libec_fail_to_register_la_CFLAGS = ${AM_CFLAGS} -libec_fail_to_register_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_fail_to_register_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_fail_to_register_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_fail_to_register_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_fail_to_register.la - -libec_test_jerasure_neon_la_SOURCES = test/erasure-code/TestJerasurePluginNEON.cc -test/erasure-code/TestJerasurePluginNEON.cc: ./ceph_ver.h -libec_test_jerasure_neon_la_CFLAGS = ${AM_CFLAGS} -libec_test_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_jerasure_neon_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_jerasure_neon.la - -libec_test_jerasure_sse4_la_SOURCES = test/erasure-code/TestJerasurePluginSSE4.cc -test/erasure-code/TestJerasurePluginSSE4.cc: ./ceph_ver.h -libec_test_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS} -libec_test_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_jerasure_sse4_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_jerasure_sse4.la - -libec_test_jerasure_sse3_la_SOURCES = test/erasure-code/TestJerasurePluginSSE3.cc -test/erasure-code/TestJerasurePluginSSE3.cc: ./ceph_ver.h -libec_test_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} -libec_test_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_jerasure_sse3_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_jerasure_sse3.la - -libec_test_jerasure_generic_la_SOURCES = test/erasure-code/TestJerasurePluginGeneric.cc -test/erasure-code/TestJerasurePluginGeneric.cc: ./ceph_ver.h -libec_test_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} -libec_test_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_jerasure_generic_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_jerasure_generic.la - -unittest_erasure_code_plugin_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/TestErasureCodePlugin.cc -unittest_erasure_code_plugin_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_plugin_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_plugin - -unittest_erasure_code_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/TestErasureCode.cc -unittest_erasure_code_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_erasure_code - -unittest_erasure_code_jerasure_SOURCES = \ - test/erasure-code/TestErasureCodeJerasure.cc \ - ${jerasure_sources} -unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include -unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include -unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_jerasure_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_jerasure - -unittest_erasure_code_plugin_jerasure_SOURCES = \ - test/erasure-code/TestErasureCodePluginJerasure.cc -unittest_erasure_code_plugin_jerasure_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_plugin_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_plugin_jerasure_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_plugin_jerasure - -if WITH_BETTER_YASM_ELF64 -unittest_erasure_code_isa_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/TestErasureCodeIsa.cc -unittest_erasure_code_isa_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_isa_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) libisa.la $(LIBERASURE_CODE) -if LINUX -unittest_erasure_code_isa_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_isa - -unittest_erasure_code_plugin_isa_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/TestErasureCodePluginIsa.cc -unittest_erasure_code_plugin_isa_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_plugin_isa_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBERASURE_CODE) -if LINUX -unittest_erasure_code_plugin_isa_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_plugin_isa -endif - -unittest_erasure_code_lrc_SOURCES = \ - test/erasure-code/TestErasureCodeLrc.cc \ - ${lrc_sources} -unittest_erasure_code_lrc_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_lrc_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_lrc_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_lrc - -unittest_erasure_code_plugin_lrc_SOURCES = \ - test/erasure-code/TestErasureCodePluginLrc.cc -unittest_erasure_code_plugin_lrc_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_plugin_lrc_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_plugin_lrc_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_plugin_lrc - -unittest_erasure_code_shec_SOURCES = \ - test/erasure-code/TestErasureCodeShec.cc \ - ${shec_sources} -unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_shec_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_shec - -unittest_erasure_code_shec_all_SOURCES = \ - test/erasure-code/TestErasureCodeShec_all.cc \ - ${shec_sources} -unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_shec_all_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_shec_all - -unittest_erasure_code_shec_thread_SOURCES = \ - test/erasure-code/TestErasureCodeShec_thread.cc \ - ${shec_sources} -unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_shec_thread_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_shec_thread - -unittest_erasure_code_shec_arguments_SOURCES = \ - test/erasure-code/TestErasureCodeShec_arguments.cc \ - ${shec_sources} -unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ - -I$(srcdir)/erasure-code/jerasure/jerasure/include \ - -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ - -I$(srcdir)/erasure-code/jerasure \ - -I$(srcdir)/erasure-code/shec -unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_shec_arguments_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_shec_arguments - -unittest_erasure_code_plugin_shec_SOURCES = \ - test/erasure-code/TestErasureCodePluginShec.cc -unittest_erasure_code_plugin_shec_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_plugin_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_plugin_shec_LDADD += -ldl -endif -check_TESTPROGRAMS += unittest_erasure_code_plugin_shec - -libec_test_shec_neon_la_SOURCES = test/erasure-code/TestShecPluginNEON.cc -test/erasure-code/TestShecPluginNEON.cc: ./ceph_ver.h -libec_test_shec_neon_la_CFLAGS = ${AM_CFLAGS} -libec_test_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_shec_neon_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_shec_neon.la - -libec_test_shec_sse4_la_SOURCES = test/erasure-code/TestShecPluginSSE4.cc -test/erasure-code/TestShecPluginSSE4.cc: ./ceph_ver.h -libec_test_shec_sse4_la_CFLAGS = ${AM_CFLAGS} -libec_test_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_shec_sse4_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_shec_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_shec_sse4.la - -libec_test_shec_sse3_la_SOURCES = test/erasure-code/TestShecPluginSSE3.cc -test/erasure-code/TestShecPluginSSE3.cc: ./ceph_ver.h -libec_test_shec_sse3_la_CFLAGS = ${AM_CFLAGS} -libec_test_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_shec_sse3_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_shec_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_shec_sse3.la - -libec_test_shec_generic_la_SOURCES = test/erasure-code/TestShecPluginGeneric.cc -test/erasure-code/TestShecPluginGeneric.cc: ./ceph_ver.h -libec_test_shec_generic_la_CFLAGS = ${AM_CFLAGS} -libec_test_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_test_shec_generic_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_test_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -rpath /nowhere -if LINUX -libec_test_shec_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' -endif -check_LTLIBRARIES += libec_test_shec_generic.la - -unittest_erasure_code_example_SOURCES = \ - erasure-code/ErasureCode.cc \ - test/erasure-code/TestErasureCodeExample.cc -noinst_HEADERS += test/erasure-code/ErasureCodeExample.h -unittest_erasure_code_example_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_TESTPROGRAMS += unittest_erasure_code_example - -endif # WITH_OSD -endif # ENABLE_SERVER diff --git a/src/test/messenger/Makefile.am b/src/test/messenger/Makefile.am deleted file mode 100644 index 9fe2416614ab2..0000000000000 --- a/src/test/messenger/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -if ENABLE_SERVER -if ENABLE_XIO - -noinst_HEADERS += \ - test/messenger/message_helper.h \ - test/messenger/simple_dispatcher.h - -simple_server_SOURCES = \ - test/messenger/simple_server.cc \ - test/messenger/simple_dispatcher.cc - -simple_server_CFLAGS = $(AM_CFLAGS) -simple_server_CXXFLAGS = $(AM_CXXFLAGS) - -simple_server_LDADD = \ - $(LIBOS) $(LIBCOMMON) $(CEPH_GLOBAL) $(PTHREAD_LIBS) $(EXTRALIBS) - -if LINUX -simple_server_LDADD += -ldl -endif - -simple_client_SOURCES = \ - test/messenger/simple_client.cc \ - test/messenger/simple_dispatcher.cc - -simple_client_CFLAGS = $(AM_CFLAGS) -simple_client_CXXFLAGS = $(AM_CXXFLAGS) - -simple_client_LDADD = \ - $(LIBOS) $(LIBCOMMON) $(CEPH_GLOBAL) $(PTHREAD_LIBS) $(EXTRALIBS) - -if LINUX -simple_client_LDADD += -ldl -endif - -noinst_PROGRAMS += \ - simple_server \ - simple_client - -noinst_HEADERS += \ - test/messenger/xio_dispatcher.h - -xio_server_SOURCES = \ - test/messenger/xio_server.cc \ - test/messenger/xio_dispatcher.cc - -xio_server_CFLAGS = $(AM_CFLAGS) -xio_server_CXXFLAGS = $(AM_CXXFLAGS) - -xio_server_LDADD = \ - $(LIBOS) $(CEPH_GLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) $(EXTRALIBS) - -if LINUX -xio_server_LDADD += -ldl -endif - -xio_client_SOURCES = \ - test/messenger/xio_client.cc \ - test/messenger/xio_dispatcher.cc - -xio_client_CFLAGS = $(AM_CFLAGS) -xio_client_CXXFLAGS = $(AM_CXXFLAGS) - -xio_client_LDADD = \ - $(LIBOS) $(CEPH_GLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) $(EXTRALIBS) - -if LINUX -xio_client_LDADD += -ldl -endif - -noinst_PROGRAMS += \ - xio_server \ - xio_client - -endif # ENABLE_XIO -endif # ENABLE_SERVER diff --git a/src/tools/Makefile-client.am b/src/tools/Makefile-client.am deleted file mode 100644 index 8db6498bc62c5..0000000000000 --- a/src/tools/Makefile-client.am +++ /dev/null @@ -1,172 +0,0 @@ -if WITH_RADOS - -ceph_scratchtool_SOURCES = tools/scratchtool.c -ceph_scratchtool_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_scratchtool - -ceph_scratchtoolpp_SOURCES = tools/scratchtoolpp.cc -ceph_scratchtoolpp_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_scratchtoolpp - -ceph_radosacl_SOURCES = tools/radosacl.cc -ceph_radosacl_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_radosacl - -rados_SOURCES = \ - tools/rados/rados.cc \ - tools/RadosDump.cc \ - tools/rados/RadosImport.cc \ - tools/rados/PoolDump.cc -rados_SOURCES += common/obj_bencher.cc # needs cleanup so it can go in libcommon.la -rados_LDADD = libcls_lock_client.la $(LIBRADOS) $(LIBRADOSSTRIPER) $(CEPH_GLOBAL) -bin_PROGRAMS += rados - -if WITH_RBD - -rbd_SOURCES = \ - tools/rbd/rbd.cc \ - tools/rbd/ArgumentTypes.cc \ - tools/rbd/IndentStream.cc \ - tools/rbd/OptionPrinter.cc \ - tools/rbd/Shell.cc \ - tools/rbd/Utils.cc \ - tools/rbd/action/Bench.cc \ - tools/rbd/action/Children.cc \ - tools/rbd/action/Clone.cc \ - tools/rbd/action/Group.cc \ - tools/rbd/action/Copy.cc \ - tools/rbd/action/Create.cc \ - tools/rbd/action/Diff.cc \ - tools/rbd/action/DiskUsage.cc \ - tools/rbd/action/Export.cc \ - tools/rbd/action/ExportDiff.cc \ - tools/rbd/action/Feature.cc \ - tools/rbd/action/Flatten.cc \ - tools/rbd/action/ImageMeta.cc \ - tools/rbd/action/Import.cc \ - tools/rbd/action/ImportDiff.cc \ - tools/rbd/action/Info.cc \ - tools/rbd/action/Journal.cc \ - tools/rbd/action/List.cc \ - tools/rbd/action/Lock.cc \ - tools/rbd/action/MergeDiff.cc \ - tools/rbd/action/MirrorPool.cc \ - tools/rbd/action/MirrorImage.cc \ - tools/rbd/action/ObjectMap.cc \ - tools/rbd/action/Remove.cc \ - tools/rbd/action/Rename.cc \ - tools/rbd/action/Resize.cc \ - tools/rbd/action/Snap.cc \ - tools/rbd/action/Status.cc \ - tools/rbd/action/Watch.cc -if LINUX -rbd_SOURCES += \ - tools/rbd/action/Kernel.cc \ - tools/rbd/action/Nbd.cc -endif # LINUX -noinst_HEADERS += \ - tools/rbd/ArgumentTypes.h \ - tools/rbd/IndentStream.h \ - tools/rbd/OptionPrinter.h \ - tools/rbd/Shell.h \ - tools/rbd/Utils.h -rbd_LDADD = \ - libjournal.la libcls_journal_client.la \ - libcls_rbd_client.la libcls_lock_client.la \ - $(LIBRBD) $(LIBRBD_TYPES) $(LIBRADOS) $(CEPH_GLOBAL) \ - $(BOOST_REGEX_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) -if LINUX -rbd_LDADD += $(LIBKRBD) -endif # LINUX -bin_PROGRAMS += rbd - -if LINUX -rbd_nbd_SOURCES = tools/rbd_nbd/rbd-nbd.cc -rbd_nbd_CXXFLAGS = $(AM_CXXFLAGS) -rbd_nbd_LDADD = $(LIBRBD) $(LIBRADOS) $(CEPH_GLOBAL) $(BOOST_REGEX_LIBS) -bin_PROGRAMS += rbd-nbd - -endif # LINUX - -# library for unit tests -librbd_mirror_internal_la_SOURCES = \ - tools/rbd_mirror/ClusterWatcher.cc \ - tools/rbd_mirror/ImageReplayer.cc \ - tools/rbd_mirror/ImageSync.cc \ - tools/rbd_mirror/ImageSyncThrottler.cc \ - tools/rbd_mirror/Mirror.cc \ - tools/rbd_mirror/PoolWatcher.cc \ - tools/rbd_mirror/Replayer.cc \ - tools/rbd_mirror/ImageDeleter.cc \ - tools/rbd_mirror/Threads.cc \ - tools/rbd_mirror/types.cc \ - tools/rbd_mirror/image_replayer/BootstrapRequest.cc \ - tools/rbd_mirror/image_replayer/CloseImageRequest.cc \ - tools/rbd_mirror/image_replayer/CreateImageRequest.cc \ - tools/rbd_mirror/image_replayer/EventPreprocessor.cc \ - tools/rbd_mirror/image_replayer/OpenImageRequest.cc \ - tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc \ - tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc \ - tools/rbd_mirror/image_sync/ImageCopyRequest.cc \ - tools/rbd_mirror/image_sync/ObjectCopyRequest.cc \ - tools/rbd_mirror/image_sync/SnapshotCopyRequest.cc \ - tools/rbd_mirror/image_sync/SnapshotCreateRequest.cc \ - tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc \ - tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc -noinst_LTLIBRARIES += librbd_mirror_internal.la -noinst_HEADERS += \ - tools/rbd_mirror/BaseRequest.h \ - tools/rbd_mirror/ClusterWatcher.h \ - tools/rbd_mirror/ImageReplayer.h \ - tools/rbd_mirror/ImageSync.h \ - tools/rbd_mirror/ImageSyncThrottler.h \ - tools/rbd_mirror/Mirror.h \ - tools/rbd_mirror/PoolWatcher.h \ - tools/rbd_mirror/ProgressContext.h \ - tools/rbd_mirror/Replayer.h \ - tools/rbd_mirror/ImageDeleter.h \ - tools/rbd_mirror/Threads.h \ - tools/rbd_mirror/types.h \ - tools/rbd_mirror/image_replayer/BootstrapRequest.h \ - tools/rbd_mirror/image_replayer/CloseImageRequest.h \ - tools/rbd_mirror/image_replayer/CreateImageRequest.h \ - tools/rbd_mirror/image_replayer/EventPreprocessor.h \ - tools/rbd_mirror/image_replayer/OpenImageRequest.h \ - tools/rbd_mirror/image_replayer/OpenLocalImageRequest.h \ - tools/rbd_mirror/image_replayer/ReplayStatusFormatter.h \ - tools/rbd_mirror/image_replayer/Utils.h \ - tools/rbd_mirror/image_sync/ImageCopyRequest.h \ - tools/rbd_mirror/image_sync/ObjectCopyRequest.h \ - tools/rbd_mirror/image_sync/SnapshotCopyRequest.h \ - tools/rbd_mirror/image_sync/SnapshotCreateRequest.h \ - tools/rbd_mirror/image_sync/SyncPointCreateRequest.h \ - tools/rbd_mirror/image_sync/SyncPointPruneRequest.h - -rbd_mirror_SOURCES = \ - tools/rbd_mirror/main.cc -rbd_mirror_LDADD = \ - librbd_mirror_internal.la \ - librbd_internal.la \ - librbd_api.la \ - $(LIBRBD_TYPES) \ - libjournal.la \ - $(LIBRADOS) $(LIBOSDC) \ - librados_internal.la \ - libcls_rbd_client.la \ - libcls_lock_client.la \ - libcls_journal_client.la \ - $(CEPH_GLOBAL) -bin_PROGRAMS += rbd-mirror - -endif # WITH_RBD - -if WITH_CEPHFS - -ceph_client_debug_SOURCES = tools/ceph-client-debug.cc -ceph_client_debug_LDADD = $(LIBCEPHFS) $(LIBCLIENT) $(CEPH_GLOBAL) $(LIBCOMMON) -bin_DEBUGPROGRAMS += ceph-client-debug - -endif # WITH_CEPHFS - - -endif # WITH_RADOS diff --git a/src/tools/Makefile-server.am b/src/tools/Makefile-server.am deleted file mode 100644 index cbdb7150d815e..0000000000000 --- a/src/tools/Makefile-server.am +++ /dev/null @@ -1,66 +0,0 @@ -ceph_osdomap_tool_SOURCES = tools/ceph_osdomap_tool.cc -ceph_osdomap_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) -bin_DEBUGPROGRAMS += ceph-osdomap-tool - -ceph_monstore_tool_SOURCES = tools/ceph_monstore_tool.cc -ceph_monstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) -bin_DEBUGPROGRAMS += ceph-monstore-tool - -ceph_kvstore_tool_SOURCES = tools/ceph_kvstore_tool.cc -ceph_kvstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) -ceph_kvstore_tool_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph-kvstore-tool - -if WITH_MON -ceph_monstore_update_crushdir = $(libdir)/ceph -ceph_monstore_update_crush_SCRIPTS = tools/ceph-monstore-update-crush.sh -endif - -if WITH_OSD - -ceph_objectstore_tool_SOURCES = tools/ceph_objectstore_tool.cc tools/RadosDump.cc -ceph_objectstore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) -if LINUX -ceph_objectstore_tool_LDADD += -ldl -endif # LINUX -bin_PROGRAMS += ceph-objectstore-tool - -endif # WITH_OSD - - -if WITH_MDS -if ENABLE_CLIENT -if WITH_RADOS - -cephfs_journal_tool_SOURCES = \ - tools/cephfs/cephfs-journal-tool.cc \ - tools/cephfs/JournalTool.cc \ - tools/cephfs/RoleSelector.cc \ - tools/cephfs/JournalFilter.cc \ - tools/cephfs/JournalScanner.cc \ - tools/cephfs/EventOutput.cc \ - tools/cephfs/Dumper.cc \ - tools/cephfs/Resetter.cc \ - tools/cephfs/MDSUtility.cc -cephfs_journal_tool_LDADD = $(LIBMDS) $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += cephfs-journal-tool - -cephfs_table_tool_SOURCES = \ - tools/cephfs/cephfs-table-tool.cc \ - tools/cephfs/TableTool.cc \ - tools/cephfs/RoleSelector.cc \ - tools/cephfs/MDSUtility.cc -cephfs_table_tool_LDADD = $(LIBMDS) $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += cephfs-table-tool - -cephfs_data_scan_SOURCES = \ - tools/cephfs/cephfs-data-scan.cc \ - tools/cephfs/DataScan.cc \ - tools/cephfs/RoleSelector.cc \ - tools/cephfs/MDSUtility.cc -cephfs_data_scan_LDADD = $(LIBMDS) libcls_cephfs_client.la $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += cephfs-data-scan - -endif # WITH_RADOS -endif # ENABLE_CLIENT -endif # WITH_MDS diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am deleted file mode 100644 index e730850f78429..0000000000000 --- a/src/tools/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -if ENABLE_CLIENT -include tools/Makefile-client.am -endif - -if ENABLE_SERVER -include tools/Makefile-server.am -endif - -monmaptool_SOURCES = tools/monmaptool.cc -monmaptool_LDADD = $(CEPH_GLOBAL) -bin_PROGRAMS += monmaptool - -crushtool_SOURCES = tools/crushtool.cc -crushtool_LDADD = $(CEPH_GLOBAL) -bin_PROGRAMS += crushtool - -osdmaptool_SOURCES = tools/osdmaptool.cc -osdmaptool_LDADD = $(CEPH_GLOBAL) -bin_PROGRAMS += osdmaptool - -ceph_psim_SOURCES = tools/psim.cc -ceph_psim_LDADD = $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_psim - -ceph_conf_SOURCES = tools/ceph_conf.cc -ceph_conf_LDADD = $(CEPH_GLOBAL) -bin_PROGRAMS += ceph-conf - -ceph_authtool_SOURCES = tools/ceph_authtool.cc -ceph_authtool_LDADD = $(CEPH_GLOBAL) -bin_PROGRAMS += ceph-authtool - -noinst_HEADERS += \ - tools/cephfs/JournalTool.h \ - tools/cephfs/JournalScanner.h \ - tools/cephfs/JournalFilter.h \ - tools/cephfs/EventOutput.h \ - tools/cephfs/Resetter.h \ - tools/cephfs/Dumper.h \ - tools/cephfs/TableTool.h \ - tools/cephfs/MDSUtility.h \ - tools/RadosDump.h \ - tools/rados/RadosImport.h \ - tools/ceph_objectstore_tool.h \ - tools/rados/PoolDump.h \ - tools/cephfs/DataScan.h \ - tools/cephfs/RoleSelector.h - -EXTRA_DIST += \ - tools/setup-virtualenv.sh diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am deleted file mode 100644 index 1c2349e5d2b6f..0000000000000 --- a/src/tracing/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -EXTRA_DIST += \ - tracing/tracing-common.h - -if WITH_LTTNG -tracing/%.h: tracing/%.tp - $(LTTNG_GEN_TP_PROG) $< -o tracing/$*.h -endif - -dist_noinst_DATA += \ - tracing/librados.tp \ - tracing/librbd.tp \ - tracing/oprequest.tp \ - tracing/osd.tp \ - tracing/pg.tp \ - tracing/objectstore.tp - -if WITH_LTTNG -libosd_tp_la_SOURCES = \ - tracing/oprequest.c \ - tracing/osd.c \ - tracing/pg.c -nodist_libosd_tp_la_SOURCES = \ - tracing/oprequest.h \ - tracing/osd.h \ - tracing/pg.h -endif -libosd_tp_la_LIBADD = -ldl -llttng-ust -libosd_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic -libosd_tp_la_LDFLAGS = -version-info 1:0:0 - -if WITH_LTTNG -librados_tp_la_SOURCES = \ - tracing/librados.c -nodist_librados_tp_la_SOURCES = \ - tracing/librados.h -endif -librados_tp_la_LIBADD = -ldl -llttng-ust -librados_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic -librados_tp_la_LDFLAGS = -version-info 2:0:0 - -if WITH_LTTNG -librbd_tp_la_SOURCES = \ - tracing/librbd.c -nodist_librbd_tp_la_SOURCES = \ - tracing/librbd.h -endif -librbd_tp_la_LIBADD = -ldl -llttng-ust -librbd_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic -librbd_tp_la_LDFLAGS = -version-info 1:0:0 - -if WITH_LTTNG -libos_tp_la_SOURCES = \ - tracing/objectstore.c -nodist_libos_tp_la_SOURCES = \ - tracing/objectstore.h -endif -libos_tp_la_LIBADD = -ldl -llttng-ust -libos_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic -libos_tp_la_LDFLAGS = -version-info 1:0:0 - -if WITH_LTTNG -lib_LTLIBRARIES += \ - libosd_tp.la \ - libos_tp.la \ - librados_tp.la \ - librbd_tp.la - -BUILT_SOURCES += \ - tracing/librados.h \ - tracing/librbd.h \ - tracing/objectstore.h \ - tracing/oprequest.h \ - tracing/osd.h \ - tracing/pg.h -endif - -CLEANFILES += \ - $(BUILT_SOURCES) diff --git a/src/tracing/README.md b/src/tracing/README.md index a72f33e9e09df..15f1ac60a4dc0 100644 --- a/src/tracing/README.md +++ b/src/tracing/README.md @@ -21,4 +21,4 @@ Add tracepoint definitions for the provider into a `.tp` file. Documentation on defining a tracepoint can be found in `man lttng-ust`. By convention files are named according to the logical sub-system they correspond to (e.g. `mutex.tp`, `pg.tp`). Place the `.tp` file into the `src/tracing` directory -and modify the automake file `src/tracing/Makefile.am` accordingly. +and modify the CMake file `src/tracing/CMakeLists.txt` accordingly. diff --git a/systemd/Makefile.am b/systemd/Makefile.am deleted file mode 100644 index 9483fe226e05b..0000000000000 --- a/systemd/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -unitfiles = \ - ceph.target \ - ceph-osd.target \ - ceph-mon.target \ - ceph-mds.target \ - ceph-radosgw.target \ - ceph-rbd-mirror.target \ - ceph-mds@.service \ - ceph-mon@.service \ - ceph-create-keys@.service \ - ceph-osd@.service \ - ceph-radosgw@.service \ - ceph-rbd-mirror@.service \ - ceph-disk@.service \ - rbdmap.service - -unitdir = $(systemd_unit_dir) - -unit_DATA = $(unitfiles) - -EXTRA_DIST = \ - $(unitfiles) \ - ceph \ - ceph.tmpfiles.d \ - 50-ceph.preset