libbareos: moved sources back into core/src/lib

bareos · Sep 11, 2018 · c27b27f · c27b27f
1 parent 7d7f4c2
commit c27b27f
Show file tree

Hide file tree

Showing 86 changed files with 57 additions and 80 deletions.
diff --git 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 → core/src/lib/address_conf.cc b/core/src/lib/bareos/address_conf.cc → core/src/lib/address_conf.cc
diff --git a/core/src/lib/bareos/alist.cc → core/src/lib/alist.cc b/core/src/lib/bareos/alist.cc → core/src/lib/alist.cc
diff --git a/core/src/lib/bareos/attr.cc → core/src/lib/attr.cc b/core/src/lib/bareos/attr.cc → core/src/lib/attr.cc
diff --git a/core/src/lib/bareos/attribs.cc → core/src/lib/attribs.cc b/core/src/lib/bareos/attribs.cc → core/src/lib/attribs.cc
diff --git a/core/src/lib/bareos/CMakeLists.txt b/core/src/lib/bareos/CMakeLists.txt
diff --git a/core/src/lib/bareos/base64.cc → core/src/lib/base64.cc b/core/src/lib/bareos/base64.cc → core/src/lib/base64.cc
diff --git a/core/src/lib/bareos/berrno.cc → core/src/lib/berrno.cc b/core/src/lib/bareos/berrno.cc → core/src/lib/berrno.cc
diff --git a/core/src/lib/bareos/bget_msg.cc → core/src/lib/bget_msg.cc b/core/src/lib/bareos/bget_msg.cc → core/src/lib/bget_msg.cc
diff --git a/core/src/lib/bareos/binflate.cc → core/src/lib/binflate.cc b/core/src/lib/bareos/binflate.cc → core/src/lib/binflate.cc
diff --git a/core/src/lib/bareos/bnet.cc → core/src/lib/bnet.cc b/core/src/lib/bareos/bnet.cc → core/src/lib/bnet.cc
diff --git a/core/src/lib/bareos/bnet_server_tcp.cc → core/src/lib/bnet_server_tcp.cc b/core/src/lib/bareos/bnet_server_tcp.cc → core/src/lib/bnet_server_tcp.cc
diff --git a/core/src/lib/bareos/bpipe.cc → core/src/lib/bpipe.cc b/core/src/lib/bareos/bpipe.cc → core/src/lib/bpipe.cc
diff --git a/core/src/lib/bareos/bpoll.cc → core/src/lib/bpoll.cc b/core/src/lib/bareos/bpoll.cc → core/src/lib/bpoll.cc
diff --git a/core/src/lib/bareos/breg.cc → core/src/lib/breg.cc b/core/src/lib/bareos/breg.cc → core/src/lib/breg.cc
diff --git a/core/src/lib/bareos/bregex.cc → core/src/lib/bregex.cc b/core/src/lib/bareos/bregex.cc → core/src/lib/bregex.cc
diff --git a/core/src/lib/bareos/bsnprintf.cc → core/src/lib/bsnprintf.cc b/core/src/lib/bareos/bsnprintf.cc → core/src/lib/bsnprintf.cc
diff --git a/core/src/lib/bareos/bsock.cc → core/src/lib/bsock.cc b/core/src/lib/bareos/bsock.cc → core/src/lib/bsock.cc
diff --git a/core/src/lib/bareos/bsock_tcp.cc → core/src/lib/bsock_tcp.cc b/core/src/lib/bareos/bsock_tcp.cc → core/src/lib/bsock_tcp.cc
diff --git a/core/src/lib/bareos/bsys.cc → core/src/lib/bsys.cc b/core/src/lib/bareos/bsys.cc → core/src/lib/bsys.cc
diff --git a/core/src/lib/bareos/btime.cc → core/src/lib/btime.cc b/core/src/lib/bareos/btime.cc → core/src/lib/btime.cc
diff --git a/core/src/lib/bareos/btimers.cc → core/src/lib/btimers.cc b/core/src/lib/bareos/btimers.cc → core/src/lib/btimers.cc
diff --git a/core/src/lib/bareos/cbuf.cc → core/src/lib/cbuf.cc b/core/src/lib/bareos/cbuf.cc → core/src/lib/cbuf.cc
diff --git a/core/src/lib/bareos/compression.cc → core/src/lib/compression.cc b/core/src/lib/bareos/compression.cc → core/src/lib/compression.cc
diff --git a/core/src/lib/bareos/connection_pool.cc → core/src/lib/connection_pool.cc b/core/src/lib/bareos/connection_pool.cc → core/src/lib/connection_pool.cc
diff --git a/core/src/lib/bareos/cram-md5.cc → core/src/lib/cram-md5.cc b/core/src/lib/bareos/cram-md5.cc → core/src/lib/cram-md5.cc
diff --git a/core/src/lib/bareos/crypto.cc → core/src/lib/crypto.cc b/core/src/lib/bareos/crypto.cc → core/src/lib/crypto.cc
diff --git a/core/src/lib/bareos/crypto_cache.cc → core/src/lib/crypto_cache.cc b/core/src/lib/bareos/crypto_cache.cc → core/src/lib/crypto_cache.cc
diff --git a/core/src/lib/bareos/crypto_gnutls.cc → core/src/lib/crypto_gnutls.cc b/core/src/lib/bareos/crypto_gnutls.cc → core/src/lib/crypto_gnutls.cc
diff --git a/core/src/lib/bareos/crypto_none.cc → core/src/lib/crypto_none.cc b/core/src/lib/bareos/crypto_none.cc → core/src/lib/crypto_none.cc
diff --git a/core/src/lib/bareos/crypto_nss.cc → core/src/lib/crypto_nss.cc b/core/src/lib/bareos/crypto_nss.cc → core/src/lib/crypto_nss.cc
diff --git a/core/src/lib/bareos/crypto_openssl.cc → core/src/lib/crypto_openssl.cc b/core/src/lib/bareos/crypto_openssl.cc → core/src/lib/crypto_openssl.cc
diff --git a/core/src/lib/bareos/crypto_wrap.cc → core/src/lib/crypto_wrap.cc b/core/src/lib/bareos/crypto_wrap.cc → core/src/lib/crypto_wrap.cc
diff --git a/core/src/lib/bareos/daemon.cc → core/src/lib/daemon.cc b/core/src/lib/bareos/daemon.cc → core/src/lib/daemon.cc
diff --git a/core/src/lib/bareos/devlock.cc → core/src/lib/devlock.cc b/core/src/lib/bareos/devlock.cc → core/src/lib/devlock.cc
diff --git a/core/src/lib/bareos/dlist.cc → core/src/lib/dlist.cc b/core/src/lib/bareos/dlist.cc → core/src/lib/dlist.cc
diff --git a/core/src/lib/bareos/edit.cc → core/src/lib/edit.cc b/core/src/lib/bareos/edit.cc → core/src/lib/edit.cc
diff --git a/core/src/lib/bareos/fnmatch.cc → core/src/lib/fnmatch.cc b/core/src/lib/bareos/fnmatch.cc → core/src/lib/fnmatch.cc
diff --git a/core/src/lib/bareos/guid_to_name.cc → core/src/lib/guid_to_name.cc b/core/src/lib/bareos/guid_to_name.cc → core/src/lib/guid_to_name.cc
diff --git a/core/src/lib/bareos/hmac.cc → core/src/lib/hmac.cc b/core/src/lib/bareos/hmac.cc → core/src/lib/hmac.cc
diff --git a/core/src/lib/bareos/htable.cc → core/src/lib/htable.cc b/core/src/lib/bareos/htable.cc → core/src/lib/htable.cc
diff --git a/core/src/lib/bareos/ini.cc → core/src/lib/ini.cc b/core/src/lib/bareos/ini.cc → core/src/lib/ini.cc
diff --git a/core/src/lib/bareos/jcr.cc → core/src/lib/jcr.cc b/core/src/lib/bareos/jcr.cc → core/src/lib/jcr.cc
diff --git a/core/src/lib/bareos/json.cc → core/src/lib/json.cc b/core/src/lib/bareos/json.cc → core/src/lib/json.cc
diff --git a/core/src/lib/bareos/lex.cc → core/src/lib/lex.cc b/core/src/lib/bareos/lex.cc → core/src/lib/lex.cc
diff --git a/core/src/lib/bareos/lockmgr.cc → core/src/lib/lockmgr.cc b/core/src/lib/bareos/lockmgr.cc → core/src/lib/lockmgr.cc
diff --git a/core/src/lib/bareos/md5.cc → core/src/lib/md5.cc b/core/src/lib/bareos/md5.cc → core/src/lib/md5.cc
diff --git a/core/src/lib/bareos/mem_pool.cc → core/src/lib/mem_pool.cc b/core/src/lib/bareos/mem_pool.cc → core/src/lib/mem_pool.cc
diff --git a/core/src/lib/bareos/message.cc → core/src/lib/message.cc b/core/src/lib/bareos/message.cc → core/src/lib/message.cc
diff --git a/core/src/lib/bareos/mntent_cache.cc → core/src/lib/mntent_cache.cc b/core/src/lib/bareos/mntent_cache.cc → core/src/lib/mntent_cache.cc
diff --git a/core/src/lib/bareos/ordered_cbuf.cc → core/src/lib/ordered_cbuf.cc b/core/src/lib/bareos/ordered_cbuf.cc → core/src/lib/ordered_cbuf.cc
diff --git a/core/src/lib/bareos/output_formatter.cc → core/src/lib/output_formatter.cc b/core/src/lib/bareos/output_formatter.cc → core/src/lib/output_formatter.cc
diff --git a/core/src/lib/bareos/parse_bsr.cc → core/src/lib/parse_bsr.cc b/core/src/lib/bareos/parse_bsr.cc → core/src/lib/parse_bsr.cc
diff --git a/core/src/lib/bareos/parse_conf.cc → core/src/lib/parse_conf.cc b/core/src/lib/bareos/parse_conf.cc → core/src/lib/parse_conf.cc
diff --git a/core/src/lib/bareos/passphrase.cc → core/src/lib/passphrase.cc b/core/src/lib/bareos/passphrase.cc → core/src/lib/passphrase.cc
diff --git a/core/src/lib/bareos/path_list.cc → core/src/lib/path_list.cc b/core/src/lib/bareos/path_list.cc → core/src/lib/path_list.cc
diff --git a/core/src/lib/bareos/plugins.cc → core/src/lib/plugins.cc b/core/src/lib/bareos/plugins.cc → core/src/lib/plugins.cc
diff --git a/core/src/lib/bareos/priv.cc → core/src/lib/priv.cc b/core/src/lib/bareos/priv.cc → core/src/lib/priv.cc
diff --git a/...qualified_resource_name_type_converter.cc → ...qualified_resource_name_type_converter.cc b/...qualified_resource_name_type_converter.cc → ...qualified_resource_name_type_converter.cc
diff --git a/core/src/lib/bareos/queue.cc → core/src/lib/queue.cc b/core/src/lib/bareos/queue.cc → core/src/lib/queue.cc
diff --git a/core/src/lib/bareos/rblist.cc → core/src/lib/rblist.cc b/core/src/lib/bareos/rblist.cc → core/src/lib/rblist.cc
diff --git a/core/src/lib/bareos/res.cc → core/src/lib/res.cc b/core/src/lib/bareos/res.cc → core/src/lib/res.cc
diff --git a/core/src/lib/bareos/runscript.cc → core/src/lib/runscript.cc b/core/src/lib/bareos/runscript.cc → core/src/lib/runscript.cc
diff --git a/core/src/lib/bareos/rwlock.cc → core/src/lib/rwlock.cc b/core/src/lib/bareos/rwlock.cc → core/src/lib/rwlock.cc
diff --git a/core/src/lib/bareos/scan.cc → core/src/lib/scan.cc b/core/src/lib/bareos/scan.cc → core/src/lib/scan.cc
diff --git a/core/src/lib/bareos/scsi_crypto.cc → core/src/lib/scsi_crypto.cc b/core/src/lib/bareos/scsi_crypto.cc → core/src/lib/scsi_crypto.cc
diff --git a/core/src/lib/bareos/scsi_lli.cc → core/src/lib/scsi_lli.cc b/core/src/lib/bareos/scsi_lli.cc → core/src/lib/scsi_lli.cc
diff --git a/core/src/lib/bareos/scsi_tapealert.cc → core/src/lib/scsi_tapealert.cc b/core/src/lib/bareos/scsi_tapealert.cc → core/src/lib/scsi_tapealert.cc
diff --git a/core/src/lib/bareos/sellist.cc → core/src/lib/sellist.cc b/core/src/lib/bareos/sellist.cc → core/src/lib/sellist.cc
diff --git a/core/src/lib/bareos/serial.cc → core/src/lib/serial.cc b/core/src/lib/bareos/serial.cc → core/src/lib/serial.cc
diff --git a/core/src/lib/bareos/sha1.cc → core/src/lib/sha1.cc b/core/src/lib/bareos/sha1.cc → core/src/lib/sha1.cc
diff --git a/core/src/lib/bareos/signal.cc → core/src/lib/signal.cc b/core/src/lib/bareos/signal.cc → core/src/lib/signal.cc
diff --git a/core/src/lib/bareos/smartall.cc → core/src/lib/smartall.cc b/core/src/lib/bareos/smartall.cc → core/src/lib/smartall.cc
diff --git a/core/src/lib/bareos/tls.cc → core/src/lib/tls.cc b/core/src/lib/bareos/tls.cc → core/src/lib/tls.cc
diff --git a/core/src/lib/bareos/tls_conf_base.cc → core/src/lib/tls_conf_base.cc b/core/src/lib/bareos/tls_conf_base.cc → core/src/lib/tls_conf_base.cc
diff --git a/core/src/lib/bareos/tls_conf_cert.cc → core/src/lib/tls_conf_cert.cc b/core/src/lib/bareos/tls_conf_cert.cc → core/src/lib/tls_conf_cert.cc
diff --git a/core/src/lib/bareos/tls_conf_psk.cc → core/src/lib/tls_conf_psk.cc b/core/src/lib/bareos/tls_conf_psk.cc → core/src/lib/tls_conf_psk.cc
diff --git a/core/src/lib/bareos/tls_gnutls.cc → core/src/lib/tls_gnutls.cc b/core/src/lib/bareos/tls_gnutls.cc → core/src/lib/tls_gnutls.cc
diff --git a/core/src/lib/bareos/tls_openssl.cc → core/src/lib/tls_openssl.cc b/core/src/lib/bareos/tls_openssl.cc → core/src/lib/tls_openssl.cc
diff --git a/core/src/lib/bareos/tls_openssl_crl.cc → core/src/lib/tls_openssl_crl.cc b/core/src/lib/bareos/tls_openssl_crl.cc → core/src/lib/tls_openssl_crl.cc
diff --git a/core/src/lib/bareos/tls_openssl_private.cc → core/src/lib/tls_openssl_private.cc b/core/src/lib/bareos/tls_openssl_private.cc → core/src/lib/tls_openssl_private.cc
diff --git a/core/src/lib/bareos/tree.cc → core/src/lib/tree.cc b/core/src/lib/bareos/tree.cc → core/src/lib/tree.cc
diff --git a/core/src/lib/bareos/util.cc → core/src/lib/util.cc b/core/src/lib/bareos/util.cc → core/src/lib/util.cc
diff --git a/core/src/lib/bareos/var.cc → core/src/lib/var.cc b/core/src/lib/bareos/var.cc → core/src/lib/var.cc
diff --git a/core/src/lib/bareos/watchdog.cc → core/src/lib/watchdog.cc b/core/src/lib/bareos/watchdog.cc → core/src/lib/watchdog.cc
diff --git a/core/src/lib/bareos/workq.cc → core/src/lib/workq.cc b/core/src/lib/bareos/workq.cc → core/src/lib/workq.cc