From c27b27f1771bd7a9a28a6a7476b32321ebeea1b6 Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Tue, 11 Sep 2018 14:51:20 +0200 Subject: [PATCH] libbareos: moved sources back into core/src/lib --- core/src/lib/CMakeLists.txt | 58 +++++++++++++- core/src/lib/{bareos => }/address_conf.cc | 0 core/src/lib/{bareos => }/alist.cc | 0 core/src/lib/{bareos => }/attr.cc | 0 core/src/lib/{bareos => }/attribs.cc | 0 core/src/lib/bareos/CMakeLists.txt | 79 ------------------- core/src/lib/{bareos => }/base64.cc | 0 core/src/lib/{bareos => }/berrno.cc | 0 core/src/lib/{bareos => }/bget_msg.cc | 0 core/src/lib/{bareos => }/binflate.cc | 0 core/src/lib/{bareos => }/bnet.cc | 0 core/src/lib/{bareos => }/bnet_server_tcp.cc | 0 core/src/lib/{bareos => }/bpipe.cc | 0 core/src/lib/{bareos => }/bpoll.cc | 0 core/src/lib/{bareos => }/breg.cc | 0 core/src/lib/{bareos => }/bregex.cc | 0 core/src/lib/{bareos => }/bsnprintf.cc | 0 core/src/lib/{bareos => }/bsock.cc | 0 core/src/lib/{bareos => }/bsock_tcp.cc | 0 core/src/lib/{bareos => }/bsys.cc | 0 core/src/lib/{bareos => }/btime.cc | 0 core/src/lib/{bareos => }/btimers.cc | 0 core/src/lib/{bareos => }/cbuf.cc | 0 core/src/lib/{bareos => }/compression.cc | 0 core/src/lib/{bareos => }/connection_pool.cc | 0 core/src/lib/{bareos => }/cram-md5.cc | 0 core/src/lib/{bareos => }/crypto.cc | 0 core/src/lib/{bareos => }/crypto_cache.cc | 0 core/src/lib/{bareos => }/crypto_gnutls.cc | 0 core/src/lib/{bareos => }/crypto_none.cc | 0 core/src/lib/{bareos => }/crypto_nss.cc | 0 core/src/lib/{bareos => }/crypto_openssl.cc | 0 core/src/lib/{bareos => }/crypto_wrap.cc | 0 core/src/lib/{bareos => }/daemon.cc | 0 core/src/lib/{bareos => }/devlock.cc | 0 core/src/lib/{bareos => }/dlist.cc | 0 core/src/lib/{bareos => }/edit.cc | 0 core/src/lib/{bareos => }/fnmatch.cc | 0 core/src/lib/{bareos => }/guid_to_name.cc | 0 core/src/lib/{bareos => }/hmac.cc | 0 core/src/lib/{bareos => }/htable.cc | 0 core/src/lib/{bareos => }/ini.cc | 0 core/src/lib/{bareos => }/jcr.cc | 0 core/src/lib/{bareos => }/json.cc | 0 core/src/lib/{bareos => }/lex.cc | 0 core/src/lib/{bareos => }/lockmgr.cc | 0 core/src/lib/{bareos => }/md5.cc | 0 core/src/lib/{bareos => }/mem_pool.cc | 0 core/src/lib/{bareos => }/message.cc | 0 core/src/lib/{bareos => }/mntent_cache.cc | 0 core/src/lib/{bareos => }/ordered_cbuf.cc | 0 core/src/lib/{bareos => }/output_formatter.cc | 0 core/src/lib/{bareos => }/parse_bsr.cc | 0 core/src/lib/{bareos => }/parse_conf.cc | 0 core/src/lib/{bareos => }/passphrase.cc | 0 core/src/lib/{bareos => }/path_list.cc | 0 core/src/lib/{bareos => }/plugins.cc | 0 core/src/lib/{bareos => }/priv.cc | 0 .../qualified_resource_name_type_converter.cc | 0 core/src/lib/{bareos => }/queue.cc | 0 core/src/lib/{bareos => }/rblist.cc | 0 core/src/lib/{bareos => }/res.cc | 0 core/src/lib/{bareos => }/runscript.cc | 0 core/src/lib/{bareos => }/rwlock.cc | 0 core/src/lib/{bareos => }/scan.cc | 0 core/src/lib/{bareos => }/scsi_crypto.cc | 0 core/src/lib/{bareos => }/scsi_lli.cc | 0 core/src/lib/{bareos => }/scsi_tapealert.cc | 0 core/src/lib/{bareos => }/sellist.cc | 0 core/src/lib/{bareos => }/serial.cc | 0 core/src/lib/{bareos => }/sha1.cc | 0 core/src/lib/{bareos => }/signal.cc | 0 core/src/lib/{bareos => }/smartall.cc | 0 core/src/lib/{bareos => }/tls.cc | 0 core/src/lib/{bareos => }/tls_conf_base.cc | 0 core/src/lib/{bareos => }/tls_conf_cert.cc | 0 core/src/lib/{bareos => }/tls_conf_psk.cc | 0 core/src/lib/{bareos => }/tls_gnutls.cc | 0 core/src/lib/{bareos => }/tls_openssl.cc | 0 core/src/lib/{bareos => }/tls_openssl_crl.cc | 0 .../lib/{bareos => }/tls_openssl_private.cc | 0 core/src/lib/{bareos => }/tree.cc | 0 core/src/lib/{bareos => }/util.cc | 0 core/src/lib/{bareos => }/var.cc | 0 core/src/lib/{bareos => }/watchdog.cc | 0 core/src/lib/{bareos => }/workq.cc | 0 86 files changed, 57 insertions(+), 80 deletions(-) rename core/src/lib/{bareos => }/address_conf.cc (100%) rename core/src/lib/{bareos => }/alist.cc (100%) rename core/src/lib/{bareos => }/attr.cc (100%) rename core/src/lib/{bareos => }/attribs.cc (100%) delete mode 100644 core/src/lib/bareos/CMakeLists.txt rename core/src/lib/{bareos => }/base64.cc (100%) rename core/src/lib/{bareos => }/berrno.cc (100%) rename core/src/lib/{bareos => }/bget_msg.cc (100%) rename core/src/lib/{bareos => }/binflate.cc (100%) rename core/src/lib/{bareos => }/bnet.cc (100%) rename core/src/lib/{bareos => }/bnet_server_tcp.cc (100%) rename core/src/lib/{bareos => }/bpipe.cc (100%) rename core/src/lib/{bareos => }/bpoll.cc (100%) rename core/src/lib/{bareos => }/breg.cc (100%) rename core/src/lib/{bareos => }/bregex.cc (100%) rename core/src/lib/{bareos => }/bsnprintf.cc (100%) rename core/src/lib/{bareos => }/bsock.cc (100%) rename core/src/lib/{bareos => }/bsock_tcp.cc (100%) rename core/src/lib/{bareos => }/bsys.cc (100%) rename core/src/lib/{bareos => }/btime.cc (100%) rename core/src/lib/{bareos => }/btimers.cc (100%) rename core/src/lib/{bareos => }/cbuf.cc (100%) rename core/src/lib/{bareos => }/compression.cc (100%) rename core/src/lib/{bareos => }/connection_pool.cc (100%) rename core/src/lib/{bareos => }/cram-md5.cc (100%) rename core/src/lib/{bareos => }/crypto.cc (100%) rename core/src/lib/{bareos => }/crypto_cache.cc (100%) rename core/src/lib/{bareos => }/crypto_gnutls.cc (100%) rename core/src/lib/{bareos => }/crypto_none.cc (100%) rename core/src/lib/{bareos => }/crypto_nss.cc (100%) rename core/src/lib/{bareos => }/crypto_openssl.cc (100%) rename core/src/lib/{bareos => }/crypto_wrap.cc (100%) rename core/src/lib/{bareos => }/daemon.cc (100%) rename core/src/lib/{bareos => }/devlock.cc (100%) rename core/src/lib/{bareos => }/dlist.cc (100%) rename core/src/lib/{bareos => }/edit.cc (100%) rename core/src/lib/{bareos => }/fnmatch.cc (100%) rename core/src/lib/{bareos => }/guid_to_name.cc (100%) rename core/src/lib/{bareos => }/hmac.cc (100%) rename core/src/lib/{bareos => }/htable.cc (100%) rename core/src/lib/{bareos => }/ini.cc (100%) rename core/src/lib/{bareos => }/jcr.cc (100%) rename core/src/lib/{bareos => }/json.cc (100%) rename core/src/lib/{bareos => }/lex.cc (100%) rename core/src/lib/{bareos => }/lockmgr.cc (100%) rename core/src/lib/{bareos => }/md5.cc (100%) rename core/src/lib/{bareos => }/mem_pool.cc (100%) rename core/src/lib/{bareos => }/message.cc (100%) rename core/src/lib/{bareos => }/mntent_cache.cc (100%) rename core/src/lib/{bareos => }/ordered_cbuf.cc (100%) rename core/src/lib/{bareos => }/output_formatter.cc (100%) rename core/src/lib/{bareos => }/parse_bsr.cc (100%) rename core/src/lib/{bareos => }/parse_conf.cc (100%) rename core/src/lib/{bareos => }/passphrase.cc (100%) rename core/src/lib/{bareos => }/path_list.cc (100%) rename core/src/lib/{bareos => }/plugins.cc (100%) rename core/src/lib/{bareos => }/priv.cc (100%) rename core/src/lib/{bareos => }/qualified_resource_name_type_converter.cc (100%) rename core/src/lib/{bareos => }/queue.cc (100%) rename core/src/lib/{bareos => }/rblist.cc (100%) rename core/src/lib/{bareos => }/res.cc (100%) rename core/src/lib/{bareos => }/runscript.cc (100%) rename core/src/lib/{bareos => }/rwlock.cc (100%) rename core/src/lib/{bareos => }/scan.cc (100%) rename core/src/lib/{bareos => }/scsi_crypto.cc (100%) rename core/src/lib/{bareos => }/scsi_lli.cc (100%) rename core/src/lib/{bareos => }/scsi_tapealert.cc (100%) rename core/src/lib/{bareos => }/sellist.cc (100%) rename core/src/lib/{bareos => }/serial.cc (100%) rename core/src/lib/{bareos => }/sha1.cc (100%) rename core/src/lib/{bareos => }/signal.cc (100%) rename core/src/lib/{bareos => }/smartall.cc (100%) rename core/src/lib/{bareos => }/tls.cc (100%) rename core/src/lib/{bareos => }/tls_conf_base.cc (100%) rename core/src/lib/{bareos => }/tls_conf_cert.cc (100%) rename core/src/lib/{bareos => }/tls_conf_psk.cc (100%) rename core/src/lib/{bareos => }/tls_gnutls.cc (100%) rename core/src/lib/{bareos => }/tls_openssl.cc (100%) rename core/src/lib/{bareos => }/tls_openssl_crl.cc (100%) rename core/src/lib/{bareos => }/tls_openssl_private.cc (100%) rename core/src/lib/{bareos => }/tree.cc (100%) rename core/src/lib/{bareos => }/util.cc (100%) rename core/src/lib/{bareos => }/var.cc (100%) rename core/src/lib/{bareos => }/watchdog.cc (100%) rename core/src/lib/{bareos => }/workq.cc (100%) diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt index 94c70982050..44fb2d0c7a0 100644 --- a/core/src/lib/CMakeLists.txt +++ b/core/src/lib/CMakeLists.txt @@ -33,8 +33,64 @@ set(INCLUDE_FILES ../include/baconfig.h ../include/bareos.h INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir}) -add_subdirectory(bareos) +include_directories( + ${OPENSSL_INCLUDE_DIRS} + ${PTHREAD_INCLUDE_DIRS} + ${FASTLZ_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} + ${ACL_INCLUDE_DIRS} + ${LZO2_INCLUDE_DIRS} + ${CAP_INCLUDE_DIRS} + ${WRAP_INCLUDE_DIRS}) + +set (BAREOS_SRCS address_conf.cc alist.cc attr.cc attribs.cc base64.cc + berrno.cc bget_msg.cc binflate.cc bnet_server_tcp.cc bnet.cc bpipe.cc + breg.cc bregex.cc bsnprintf.cc bsock.cc bsock_tcp.cc + bsys.cc btime.cc btimers.cc cbuf.cc compression.cc + connection_pool.cc cram-md5.cc crypto.cc crypto_cache.cc crypto_gnutls.cc + crypto_none.cc crypto_nss.cc crypto_openssl.cc crypto_wrap.cc daemon.cc + devlock.cc dlist.cc edit.cc fnmatch.cc guid_to_name.cc hmac.cc htable.cc + jcr.cc json.cc lockmgr.cc md5.cc mem_pool.cc message.cc mntent_cache.cc + output_formatter.cc ordered_cbuf.cc passphrase.cc path_list.cc plugins.cc + bpoll.cc priv.cc + queue.cc rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc scsi_lli.cc + sellist.cc serial.cc sha1.cc signal.cc smartall.cc tls.cc + tls_gnutls.cc tls_conf_base.cc tls_conf_psk.cc tls_conf_cert.cc tls_openssl.cc + tls_openssl_crl.cc tls_openssl_private.cc tree.cc util.cc var.cc watchdog.cc + workq.cc) + +IF(HAVE_WIN32) + LIST(APPEND BAREOS_SRCS + ../win32/compat/compat.cc + ../win32/compat/glob.cc + ../win32/compat/print.cc + ../win32/compat/winapi.cc) +ELSE() + LIST(APPEND BAREOS_SRCS + scsi_tapealert.cc) +ENDIF() + +set (BAREOSCFG_SRCS ini.cc lex.cc parse_bsr.cc res.cc parse_conf.cc + res.cc qualified_resource_name_type_converter.cc) +LIST(APPEND BAREOS_SRCS ${BAREOSCFG_SRCS}) + +add_library(bareos SHARED ${BAREOS_SRCS}) + +target_link_libraries(bareos + ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${FASTLZ_LIBRARIES} ${ZLIB_LIBRARIES} + ${ACL_LIBRARIES} ${LZO2_LIBRARIES} ${CAP_LIBRARIES} ${WRAP_LIBRARIES} + ${CAM_LIBRARIES} ${WINDOWS_LIBRARIES} ${JANSSON_LIBRARIES}) + +INSTALL(TARGETS bareos DESTINATION ${libdir}) + +set_target_properties(bareos PROPERTIES VERSION "${VERSION}" + SOVERSION "${SOVERSION}") + +IF(HAVE_WIN32) + set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") +ENDIF() IF(NOT HAVE_WIN32 AND GTEST_FOUND) add_subdirectory(unittests) ENDIF() + diff --git a/core/src/lib/bareos/address_conf.cc b/core/src/lib/address_conf.cc similarity index 100% rename from core/src/lib/bareos/address_conf.cc rename to core/src/lib/address_conf.cc diff --git a/core/src/lib/bareos/alist.cc b/core/src/lib/alist.cc similarity index 100% rename from core/src/lib/bareos/alist.cc rename to core/src/lib/alist.cc diff --git a/core/src/lib/bareos/attr.cc b/core/src/lib/attr.cc similarity index 100% rename from core/src/lib/bareos/attr.cc rename to core/src/lib/attr.cc diff --git a/core/src/lib/bareos/attribs.cc b/core/src/lib/attribs.cc similarity index 100% rename from core/src/lib/bareos/attribs.cc rename to core/src/lib/attribs.cc diff --git a/core/src/lib/bareos/CMakeLists.txt b/core/src/lib/bareos/CMakeLists.txt deleted file mode 100644 index ca590e4c221..00000000000 --- a/core/src/lib/bareos/CMakeLists.txt +++ /dev/null @@ -1,79 +0,0 @@ -# BAREOS�� - Backup Archiving REcovery Open Sourced -# -# Copyright (C) 2017-2017 Bareos GmbH & Co. KG -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of version three of the GNU Affero General Public -# License as published by the Free Software Foundation and included -# in the file LICENSE. -# -# 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -include_directories( - ${OPENSSL_INCLUDE_DIRS} - ${PTHREAD_INCLUDE_DIRS} - ${FASTLZ_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} - ${ACL_INCLUDE_DIRS} - ${LZO2_INCLUDE_DIRS} - ${CAP_INCLUDE_DIRS} - ${WRAP_INCLUDE_DIRS} - .. - ) - -set (BAREOS_SRCS address_conf.cc alist.cc attr.cc attribs.cc base64.cc - berrno.cc bget_msg.cc binflate.cc bnet_server_tcp.cc bnet.cc bpipe.cc - breg.cc bregex.cc bsnprintf.cc bsock.cc bsock_tcp.cc - bsys.cc btime.cc btimers.cc cbuf.cc compression.cc - connection_pool.cc cram-md5.cc crypto.cc crypto_cache.cc crypto_gnutls.cc - crypto_none.cc crypto_nss.cc crypto_openssl.cc crypto_wrap.cc daemon.cc - devlock.cc dlist.cc edit.cc fnmatch.cc guid_to_name.cc hmac.cc htable.cc - jcr.cc json.cc lockmgr.cc md5.cc mem_pool.cc message.cc mntent_cache.cc - output_formatter.cc ordered_cbuf.cc passphrase.cc path_list.cc plugins.cc - bpoll.cc priv.cc - queue.cc rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc scsi_lli.cc - sellist.cc serial.cc sha1.cc signal.cc smartall.cc tls.cc - tls_gnutls.cc tls_conf_base.cc tls_conf_psk.cc tls_conf_cert.cc tls_openssl.cc tls_openssl_crl.cc - tls_openssl_private.cc tree.cc util.cc var.cc - watchdog.cc workq.cc) - -IF(HAVE_WIN32) - LIST(APPEND BAREOS_SRCS - ../../win32/compat/compat.cc - ../../win32/compat/glob.cc - ../../win32/compat/print.cc - ../../win32/compat/winapi.cc - ) -ELSE() - LIST(APPEND BAREOS_SRCS - scsi_tapealert.cc) -ENDIF() - -set (BAREOSCFG_SRCS ini.cc lex.cc parse_bsr.cc res.cc parse_conf.cc res.cc qualified_resource_name_type_converter.cc) -LIST(APPEND BAREOS_SRCS ${BAREOSCFG_SRCS}) - -#link_directories(${PROJECT_BINARY_DIR}/src/lib/bareos) -add_library(bareos SHARED ${BAREOS_SRCS}) - -target_link_libraries(bareos - ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${FASTLZ_LIBRARIES} ${ZLIB_LIBRARIES} - ${ACL_LIBRARIES} ${LZO2_LIBRARIES} ${CAP_LIBRARIES} ${WRAP_LIBRARIES} ${CAM_LIBRARIES} - ${WINDOWS_LIBRARIES} ${JANSSON_LIBRARIES} ${BAREOSCFG_IMPORT_LIB}) - -INSTALL(TARGETS bareos DESTINATION ${libdir}) - -set_target_properties(bareos PROPERTIES VERSION "${VERSION}" - SOVERSION "${SOVERSION}") - -IF(HAVE_WIN32) - set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") -ENDIF() - diff --git a/core/src/lib/bareos/base64.cc b/core/src/lib/base64.cc similarity index 100% rename from core/src/lib/bareos/base64.cc rename to core/src/lib/base64.cc diff --git a/core/src/lib/bareos/berrno.cc b/core/src/lib/berrno.cc similarity index 100% rename from core/src/lib/bareos/berrno.cc rename to core/src/lib/berrno.cc diff --git a/core/src/lib/bareos/bget_msg.cc b/core/src/lib/bget_msg.cc similarity index 100% rename from core/src/lib/bareos/bget_msg.cc rename to core/src/lib/bget_msg.cc diff --git a/core/src/lib/bareos/binflate.cc b/core/src/lib/binflate.cc similarity index 100% rename from core/src/lib/bareos/binflate.cc rename to core/src/lib/binflate.cc diff --git a/core/src/lib/bareos/bnet.cc b/core/src/lib/bnet.cc similarity index 100% rename from core/src/lib/bareos/bnet.cc rename to core/src/lib/bnet.cc diff --git a/core/src/lib/bareos/bnet_server_tcp.cc b/core/src/lib/bnet_server_tcp.cc similarity index 100% rename from core/src/lib/bareos/bnet_server_tcp.cc rename to core/src/lib/bnet_server_tcp.cc diff --git a/core/src/lib/bareos/bpipe.cc b/core/src/lib/bpipe.cc similarity index 100% rename from core/src/lib/bareos/bpipe.cc rename to core/src/lib/bpipe.cc diff --git a/core/src/lib/bareos/bpoll.cc b/core/src/lib/bpoll.cc similarity index 100% rename from core/src/lib/bareos/bpoll.cc rename to core/src/lib/bpoll.cc diff --git a/core/src/lib/bareos/breg.cc b/core/src/lib/breg.cc similarity index 100% rename from core/src/lib/bareos/breg.cc rename to core/src/lib/breg.cc diff --git a/core/src/lib/bareos/bregex.cc b/core/src/lib/bregex.cc similarity index 100% rename from core/src/lib/bareos/bregex.cc rename to core/src/lib/bregex.cc diff --git a/core/src/lib/bareos/bsnprintf.cc b/core/src/lib/bsnprintf.cc similarity index 100% rename from core/src/lib/bareos/bsnprintf.cc rename to core/src/lib/bsnprintf.cc diff --git a/core/src/lib/bareos/bsock.cc b/core/src/lib/bsock.cc similarity index 100% rename from core/src/lib/bareos/bsock.cc rename to core/src/lib/bsock.cc diff --git a/core/src/lib/bareos/bsock_tcp.cc b/core/src/lib/bsock_tcp.cc similarity index 100% rename from core/src/lib/bareos/bsock_tcp.cc rename to core/src/lib/bsock_tcp.cc diff --git a/core/src/lib/bareos/bsys.cc b/core/src/lib/bsys.cc similarity index 100% rename from core/src/lib/bareos/bsys.cc rename to core/src/lib/bsys.cc diff --git a/core/src/lib/bareos/btime.cc b/core/src/lib/btime.cc similarity index 100% rename from core/src/lib/bareos/btime.cc rename to core/src/lib/btime.cc diff --git a/core/src/lib/bareos/btimers.cc b/core/src/lib/btimers.cc similarity index 100% rename from core/src/lib/bareos/btimers.cc rename to core/src/lib/btimers.cc diff --git a/core/src/lib/bareos/cbuf.cc b/core/src/lib/cbuf.cc similarity index 100% rename from core/src/lib/bareos/cbuf.cc rename to core/src/lib/cbuf.cc diff --git a/core/src/lib/bareos/compression.cc b/core/src/lib/compression.cc similarity index 100% rename from core/src/lib/bareos/compression.cc rename to core/src/lib/compression.cc diff --git a/core/src/lib/bareos/connection_pool.cc b/core/src/lib/connection_pool.cc similarity index 100% rename from core/src/lib/bareos/connection_pool.cc rename to core/src/lib/connection_pool.cc diff --git a/core/src/lib/bareos/cram-md5.cc b/core/src/lib/cram-md5.cc similarity index 100% rename from core/src/lib/bareos/cram-md5.cc rename to core/src/lib/cram-md5.cc diff --git a/core/src/lib/bareos/crypto.cc b/core/src/lib/crypto.cc similarity index 100% rename from core/src/lib/bareos/crypto.cc rename to core/src/lib/crypto.cc diff --git a/core/src/lib/bareos/crypto_cache.cc b/core/src/lib/crypto_cache.cc similarity index 100% rename from core/src/lib/bareos/crypto_cache.cc rename to core/src/lib/crypto_cache.cc diff --git a/core/src/lib/bareos/crypto_gnutls.cc b/core/src/lib/crypto_gnutls.cc similarity index 100% rename from core/src/lib/bareos/crypto_gnutls.cc rename to core/src/lib/crypto_gnutls.cc diff --git a/core/src/lib/bareos/crypto_none.cc b/core/src/lib/crypto_none.cc similarity index 100% rename from core/src/lib/bareos/crypto_none.cc rename to core/src/lib/crypto_none.cc diff --git a/core/src/lib/bareos/crypto_nss.cc b/core/src/lib/crypto_nss.cc similarity index 100% rename from core/src/lib/bareos/crypto_nss.cc rename to core/src/lib/crypto_nss.cc diff --git a/core/src/lib/bareos/crypto_openssl.cc b/core/src/lib/crypto_openssl.cc similarity index 100% rename from core/src/lib/bareos/crypto_openssl.cc rename to core/src/lib/crypto_openssl.cc diff --git a/core/src/lib/bareos/crypto_wrap.cc b/core/src/lib/crypto_wrap.cc similarity index 100% rename from core/src/lib/bareos/crypto_wrap.cc rename to core/src/lib/crypto_wrap.cc diff --git a/core/src/lib/bareos/daemon.cc b/core/src/lib/daemon.cc similarity index 100% rename from core/src/lib/bareos/daemon.cc rename to core/src/lib/daemon.cc diff --git a/core/src/lib/bareos/devlock.cc b/core/src/lib/devlock.cc similarity index 100% rename from core/src/lib/bareos/devlock.cc rename to core/src/lib/devlock.cc diff --git a/core/src/lib/bareos/dlist.cc b/core/src/lib/dlist.cc similarity index 100% rename from core/src/lib/bareos/dlist.cc rename to core/src/lib/dlist.cc diff --git a/core/src/lib/bareos/edit.cc b/core/src/lib/edit.cc similarity index 100% rename from core/src/lib/bareos/edit.cc rename to core/src/lib/edit.cc diff --git a/core/src/lib/bareos/fnmatch.cc b/core/src/lib/fnmatch.cc similarity index 100% rename from core/src/lib/bareos/fnmatch.cc rename to core/src/lib/fnmatch.cc diff --git a/core/src/lib/bareos/guid_to_name.cc b/core/src/lib/guid_to_name.cc similarity index 100% rename from core/src/lib/bareos/guid_to_name.cc rename to core/src/lib/guid_to_name.cc diff --git a/core/src/lib/bareos/hmac.cc b/core/src/lib/hmac.cc similarity index 100% rename from core/src/lib/bareos/hmac.cc rename to core/src/lib/hmac.cc diff --git a/core/src/lib/bareos/htable.cc b/core/src/lib/htable.cc similarity index 100% rename from core/src/lib/bareos/htable.cc rename to core/src/lib/htable.cc diff --git a/core/src/lib/bareos/ini.cc b/core/src/lib/ini.cc similarity index 100% rename from core/src/lib/bareos/ini.cc rename to core/src/lib/ini.cc diff --git a/core/src/lib/bareos/jcr.cc b/core/src/lib/jcr.cc similarity index 100% rename from core/src/lib/bareos/jcr.cc rename to core/src/lib/jcr.cc diff --git a/core/src/lib/bareos/json.cc b/core/src/lib/json.cc similarity index 100% rename from core/src/lib/bareos/json.cc rename to core/src/lib/json.cc diff --git a/core/src/lib/bareos/lex.cc b/core/src/lib/lex.cc similarity index 100% rename from core/src/lib/bareos/lex.cc rename to core/src/lib/lex.cc diff --git a/core/src/lib/bareos/lockmgr.cc b/core/src/lib/lockmgr.cc similarity index 100% rename from core/src/lib/bareos/lockmgr.cc rename to core/src/lib/lockmgr.cc diff --git a/core/src/lib/bareos/md5.cc b/core/src/lib/md5.cc similarity index 100% rename from core/src/lib/bareos/md5.cc rename to core/src/lib/md5.cc diff --git a/core/src/lib/bareos/mem_pool.cc b/core/src/lib/mem_pool.cc similarity index 100% rename from core/src/lib/bareos/mem_pool.cc rename to core/src/lib/mem_pool.cc diff --git a/core/src/lib/bareos/message.cc b/core/src/lib/message.cc similarity index 100% rename from core/src/lib/bareos/message.cc rename to core/src/lib/message.cc diff --git a/core/src/lib/bareos/mntent_cache.cc b/core/src/lib/mntent_cache.cc similarity index 100% rename from core/src/lib/bareos/mntent_cache.cc rename to core/src/lib/mntent_cache.cc diff --git a/core/src/lib/bareos/ordered_cbuf.cc b/core/src/lib/ordered_cbuf.cc similarity index 100% rename from core/src/lib/bareos/ordered_cbuf.cc rename to core/src/lib/ordered_cbuf.cc diff --git a/core/src/lib/bareos/output_formatter.cc b/core/src/lib/output_formatter.cc similarity index 100% rename from core/src/lib/bareos/output_formatter.cc rename to core/src/lib/output_formatter.cc diff --git a/core/src/lib/bareos/parse_bsr.cc b/core/src/lib/parse_bsr.cc similarity index 100% rename from core/src/lib/bareos/parse_bsr.cc rename to core/src/lib/parse_bsr.cc diff --git a/core/src/lib/bareos/parse_conf.cc b/core/src/lib/parse_conf.cc similarity index 100% rename from core/src/lib/bareos/parse_conf.cc rename to core/src/lib/parse_conf.cc diff --git a/core/src/lib/bareos/passphrase.cc b/core/src/lib/passphrase.cc similarity index 100% rename from core/src/lib/bareos/passphrase.cc rename to core/src/lib/passphrase.cc diff --git a/core/src/lib/bareos/path_list.cc b/core/src/lib/path_list.cc similarity index 100% rename from core/src/lib/bareos/path_list.cc rename to core/src/lib/path_list.cc diff --git a/core/src/lib/bareos/plugins.cc b/core/src/lib/plugins.cc similarity index 100% rename from core/src/lib/bareos/plugins.cc rename to core/src/lib/plugins.cc diff --git a/core/src/lib/bareos/priv.cc b/core/src/lib/priv.cc similarity index 100% rename from core/src/lib/bareos/priv.cc rename to core/src/lib/priv.cc diff --git a/core/src/lib/bareos/qualified_resource_name_type_converter.cc b/core/src/lib/qualified_resource_name_type_converter.cc similarity index 100% rename from core/src/lib/bareos/qualified_resource_name_type_converter.cc rename to core/src/lib/qualified_resource_name_type_converter.cc diff --git a/core/src/lib/bareos/queue.cc b/core/src/lib/queue.cc similarity index 100% rename from core/src/lib/bareos/queue.cc rename to core/src/lib/queue.cc diff --git a/core/src/lib/bareos/rblist.cc b/core/src/lib/rblist.cc similarity index 100% rename from core/src/lib/bareos/rblist.cc rename to core/src/lib/rblist.cc diff --git a/core/src/lib/bareos/res.cc b/core/src/lib/res.cc similarity index 100% rename from core/src/lib/bareos/res.cc rename to core/src/lib/res.cc diff --git a/core/src/lib/bareos/runscript.cc b/core/src/lib/runscript.cc similarity index 100% rename from core/src/lib/bareos/runscript.cc rename to core/src/lib/runscript.cc diff --git a/core/src/lib/bareos/rwlock.cc b/core/src/lib/rwlock.cc similarity index 100% rename from core/src/lib/bareos/rwlock.cc rename to core/src/lib/rwlock.cc diff --git a/core/src/lib/bareos/scan.cc b/core/src/lib/scan.cc similarity index 100% rename from core/src/lib/bareos/scan.cc rename to core/src/lib/scan.cc diff --git a/core/src/lib/bareos/scsi_crypto.cc b/core/src/lib/scsi_crypto.cc similarity index 100% rename from core/src/lib/bareos/scsi_crypto.cc rename to core/src/lib/scsi_crypto.cc diff --git a/core/src/lib/bareos/scsi_lli.cc b/core/src/lib/scsi_lli.cc similarity index 100% rename from core/src/lib/bareos/scsi_lli.cc rename to core/src/lib/scsi_lli.cc diff --git a/core/src/lib/bareos/scsi_tapealert.cc b/core/src/lib/scsi_tapealert.cc similarity index 100% rename from core/src/lib/bareos/scsi_tapealert.cc rename to core/src/lib/scsi_tapealert.cc diff --git a/core/src/lib/bareos/sellist.cc b/core/src/lib/sellist.cc similarity index 100% rename from core/src/lib/bareos/sellist.cc rename to core/src/lib/sellist.cc diff --git a/core/src/lib/bareos/serial.cc b/core/src/lib/serial.cc similarity index 100% rename from core/src/lib/bareos/serial.cc rename to core/src/lib/serial.cc diff --git a/core/src/lib/bareos/sha1.cc b/core/src/lib/sha1.cc similarity index 100% rename from core/src/lib/bareos/sha1.cc rename to core/src/lib/sha1.cc diff --git a/core/src/lib/bareos/signal.cc b/core/src/lib/signal.cc similarity index 100% rename from core/src/lib/bareos/signal.cc rename to core/src/lib/signal.cc diff --git a/core/src/lib/bareos/smartall.cc b/core/src/lib/smartall.cc similarity index 100% rename from core/src/lib/bareos/smartall.cc rename to core/src/lib/smartall.cc diff --git a/core/src/lib/bareos/tls.cc b/core/src/lib/tls.cc similarity index 100% rename from core/src/lib/bareos/tls.cc rename to core/src/lib/tls.cc diff --git a/core/src/lib/bareos/tls_conf_base.cc b/core/src/lib/tls_conf_base.cc similarity index 100% rename from core/src/lib/bareos/tls_conf_base.cc rename to core/src/lib/tls_conf_base.cc diff --git a/core/src/lib/bareos/tls_conf_cert.cc b/core/src/lib/tls_conf_cert.cc similarity index 100% rename from core/src/lib/bareos/tls_conf_cert.cc rename to core/src/lib/tls_conf_cert.cc diff --git a/core/src/lib/bareos/tls_conf_psk.cc b/core/src/lib/tls_conf_psk.cc similarity index 100% rename from core/src/lib/bareos/tls_conf_psk.cc rename to core/src/lib/tls_conf_psk.cc diff --git a/core/src/lib/bareos/tls_gnutls.cc b/core/src/lib/tls_gnutls.cc similarity index 100% rename from core/src/lib/bareos/tls_gnutls.cc rename to core/src/lib/tls_gnutls.cc diff --git a/core/src/lib/bareos/tls_openssl.cc b/core/src/lib/tls_openssl.cc similarity index 100% rename from core/src/lib/bareos/tls_openssl.cc rename to core/src/lib/tls_openssl.cc diff --git a/core/src/lib/bareos/tls_openssl_crl.cc b/core/src/lib/tls_openssl_crl.cc similarity index 100% rename from core/src/lib/bareos/tls_openssl_crl.cc rename to core/src/lib/tls_openssl_crl.cc diff --git a/core/src/lib/bareos/tls_openssl_private.cc b/core/src/lib/tls_openssl_private.cc similarity index 100% rename from core/src/lib/bareos/tls_openssl_private.cc rename to core/src/lib/tls_openssl_private.cc diff --git a/core/src/lib/bareos/tree.cc b/core/src/lib/tree.cc similarity index 100% rename from core/src/lib/bareos/tree.cc rename to core/src/lib/tree.cc diff --git a/core/src/lib/bareos/util.cc b/core/src/lib/util.cc similarity index 100% rename from core/src/lib/bareos/util.cc rename to core/src/lib/util.cc diff --git a/core/src/lib/bareos/var.cc b/core/src/lib/var.cc similarity index 100% rename from core/src/lib/bareos/var.cc rename to core/src/lib/var.cc diff --git a/core/src/lib/bareos/watchdog.cc b/core/src/lib/watchdog.cc similarity index 100% rename from core/src/lib/bareos/watchdog.cc rename to core/src/lib/watchdog.cc diff --git a/core/src/lib/bareos/workq.cc b/core/src/lib/workq.cc similarity index 100% rename from core/src/lib/bareos/workq.cc rename to core/src/lib/workq.cc