build: clean up include_directories and use full path includes

Removed the relative search path include_directories from the CMakeLists files and changed the includes to also name the path.
bareos · Sep 4, 2018 · bd0aa12 · bd0aa12
1 parent 12e6863
commit bd0aa12
Show file tree

Hide file tree

Showing 63 changed files with 77 additions and 111 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -124,8 +124,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
    include_directories(
       ${CMAKE_SOURCE_DIR}/src/win32/include
       ${CMAKE_SOURCE_DIR}/src/win32/compat/include
-      #${CMAKE_SOURCE_DIR}/src/win32/cats/pgsql/include
-      #${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include
       )
    set(HAVE_WIN32 1)
 
@@ -254,6 +252,7 @@ include_directories(${PYTHON_INCLUDE_DIRS})
 
 include_directories(${PYTHON_INCLUDE_PATH})
 
+include_directories(${CMAKE_SOURCE_DIR}/src)
 
 # trick for socklen_t
 set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")

diff --git a/core/src/cats/CMakeLists.txt b/core/src/cats/CMakeLists.txt
@@ -18,7 +18,7 @@
 #   02110-1301, USA.
 
 
-include_directories(. .. ../include ${MYSQL_INCLUDE_DIR} ${PostgreSQL_INCLUDE_DIR})
+include_directories(${MYSQL_INCLUDE_DIR} ${PostgreSQL_INCLUDE_DIR})
 
 
 add_definitions( -D_BDB_PRIV_INTERFACE_)

diff --git a/core/src/cats/bvfs.cc b/core/src/cats/bvfs.cc
@@ -28,10 +28,10 @@
 
 #if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
 
-#include "cats.h"
-#include "sql.h"
+#include "cats/cats.h"
+#include "cats/sql.h"
 #include "lib/htable.h"
-#include "bvfs.h"
+#include "cats/bvfs.h"
 #include "lib/edit.h"
 
 #define dbglevel 10

diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
@@ -879,7 +879,7 @@ struct SqlPoolDescriptor {
    dlink link;                            /**< list management */
 };
 
-#include "jcr.h"
+#include "include/jcr.h"
 
 /**
  * Object used in db_list_xxx function

diff --git a/core/src/console/CMakeLists.txt b/core/src/console/CMakeLists.txt
@@ -17,7 +17,6 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-include_directories(. .. ../include )
 
 SET (BCONSSRCS console.cc console_conf.cc)
 IF(HAVE_WIN32)

diff --git a/core/src/console/console.cc b/core/src/console/console.cc
@@ -29,8 +29,8 @@
  */
 
 #include "include/bareos.h"
-#include "console_conf.h"
-#include "jcr.h"
+#include "console/console_conf.h"
+#include "include/jcr.h"
 #include "lib/bnet.h"
 
 #ifdef HAVE_CONIO

diff --git a/core/src/dird/CMakeLists.txt b/core/src/dird/CMakeLists.txt
@@ -39,13 +39,11 @@ IF(HAVE_WIN32)
 ENDIF()
 
 IF(HAVE_WIN32)
-   include_directories(${CMAKE_SOURCE_DIR}/src/win32/generic ${CMAKE_SOURCE_DIR}/src/win32/dird ../include ..)
+   include_directories(${CMAKE_SOURCE_DIR}/src/win32/generic ${CMAKE_SOURCE_DIR}/src/win32/dird)
    LIST(APPEND DIRDSRCS
       ../win32/generic/main.cc
       ../win32/generic/service.cc
       )
-ELSE()
-   include_directories(. .. ../include ../lmdb ../ndmp)
 ENDIF()
 
 

diff --git a/core/src/dird/dir_plugins.h b/core/src/dird/dir_plugins.h
@@ -45,8 +45,8 @@
 #endif
 
 #include <sys/types.h>
-#include "hostconfig.h"
-#include "bc_types.h"
+#include "include/hostconfig.h"
+#include "include/bc_types.h"
 #include "lib/plugins.h"
 
 /*

diff --git a/core/src/dird/dird.h b/core/src/dird/dird.h
@@ -40,7 +40,7 @@
 #include "dir_plugins.h"
 #include "cats/cats.h"
 
-#include "jcr.h"
+#include "include/jcr.h"
 #include "bsr.h"
 #include "ua.h"
 #include "jobq.h"

diff --git a/core/src/dird/ndmp_fhdb_lmdb.cc b/core/src/dird/ndmp_fhdb_lmdb.cc
@@ -34,7 +34,7 @@
 
 #include "ndmp/ndmagents.h"
 #include "ndmp_dma_priv.h"
-#include "lmdb.h"
+#include "lmdb/lmdb.h"
 
 /*
  * What is actually stored in the LMDB

diff --git a/core/src/filed/CMakeLists.txt b/core/src/filed/CMakeLists.txt
@@ -22,9 +22,8 @@ IF(HAVE_WIN32)
    include_directories(
       ${CMAKE_SOURCE_DIR}/src/win32/generic
       ${CMAKE_SOURCE_DIR}/src/win32/filed
-      ${CMAKE_SOURCE_DIR}/src/win32/vss/include  ../include . .. ../lmdb/)
-ELSE()
-   include_directories(. .. ../include ../lmdb)
+      ${CMAKE_SOURCE_DIR}/src/win32/vss/include
+      )
 ENDIF()
 
 set(FDSRCS accurate.cc authenticate.cc crypto.cc fd_plugins.cc fileset.cc sd_cmds.cc verify.cc

diff --git a/core/src/filed/accurate.h b/core/src/filed/accurate.h
@@ -41,7 +41,7 @@
  * also cost some bytes.
  */
 
-#include "hostconfig.h"
+#include "include/hostconfig.h"
 
 #ifdef HAVE_HPUX_OS
 #pragma pack(push,4)
@@ -153,7 +153,7 @@ class BareosAccurateFilelistHtable: public BareosAccurateFilelist {
 
 #ifdef HAVE_LMDB
 
-#include "lmdb.h"
+#include "lmdb/lmdb.h"
 
 /*
  * Lightning Memory DataBase (LMDB) specific storage abstraction class using the Symas LMDB.

diff --git a/core/src/filed/backup.cc b/core/src/filed/backup.cc
@@ -35,7 +35,7 @@
 #include "filed/crypto.h"
 #include "filed/heartbeat.h"
 #include "filed/backup.h"
-#include "ch.h"
+#include "include/ch.h"
 #include "findlib/attribs.h"
 #include "findlib/hardlink.h"
 #include "findlib/find_one.h"

diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
@@ -30,7 +30,7 @@
 
 #include "include/bareos.h"
 #include "filed/filed.h"
-#include "ch.h"
+#include "include/ch.h"
 #include "filed/authenticate.h"
 #include "filed/dir_cmd.h"
 #include "filed/estimate.h"

diff --git a/core/src/filed/fd_plugins.h b/core/src/filed/fd_plugins.h
@@ -44,11 +44,11 @@
 
 #include <sys/types.h>
 
-#include "hostconfig.h"
+#include "include/hostconfig.h"
 
-#include "version.h"
-#include "bc_types.h"
-#include "fileopts.h"
+#include "include/version.h"
+#include "include/bc_types.h"
+#include "include/fileopts.h"
 #include "lib/plugins.h"
 #include <sys/stat.h>
 

diff --git a/core/src/filed/filed.h b/core/src/filed/filed.h
@@ -34,15 +34,15 @@
 #ifdef HAVE_WIN32
 #include "vss.h"
 #endif
-#include "jcr.h"
+#include "include/jcr.h"
 #include "lib/breg.h"
 #include "lib/htable.h"
 #include "lib/runscript.h"
 #include "findlib/find.h"
 #include "fd_plugins.h"
-#include "ch.h"
-#include "backup.h"
-#include "restore.h"
+#include "include/ch.h"
+#include "filed/backup.h"
+#include "filed/restore.h"
 
 extern ClientResource *me;                 /* "Global" Client resource */
 extern ConfigurationParser *my_config;             /* Our Global config */

diff --git a/core/src/filed/fileset.cc b/core/src/filed/fileset.cc
@@ -33,7 +33,7 @@
 #include "filed/filed.h"
 #include "findlib/match.h"
 #include "lib/edit.h"
-#include "ch.h"
+#include "include/ch.h"
 
 #ifdef HAVE_WIN32
 #include "win32/findlib/win32.h"

diff --git a/core/src/filed/restore.cc b/core/src/filed/restore.cc
@@ -33,7 +33,7 @@
 #include "filed/compression.h"
 #include "filed/crypto.h"
 #include "filed/verify.h"
-#include "ch.h"
+#include "include/ch.h"
 #include "findlib/create_file.h"
 #include "findlib/attribs.h"
 #include "findlib/find.h"

diff --git a/core/src/findlib/CMakeLists.txt b/core/src/findlib/CMakeLists.txt
@@ -17,8 +17,6 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-include_directories(../include .. .)
-
 SET(BAREOSFIND_SRCS acl.cc attribs.cc bfile.cc create_file.cc drivetype.cc
       enable_priv.cc find_one.cc find.cc fstype.cc hardlink.cc match.cc
       mkpath.cc shadowing.cc xattr.cc)

diff --git a/core/src/findlib/acl.cc b/core/src/findlib/acl.cc
@@ -62,7 +62,7 @@
  */
 
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "find.h"
 
 #if !defined(HAVE_ACL) && !defined(HAVE_AFS_ACL)

diff --git a/core/src/findlib/attribs.cc b/core/src/findlib/attribs.cc
@@ -29,9 +29,9 @@
  */
 
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "find.h"
-#include "ch.h"
+#include "include/ch.h"
 #include "findlib/attribs.h"
 #include "lib/edit.h"
 

diff --git a/core/src/findlib/create_file.cc b/core/src/findlib/create_file.cc
@@ -29,7 +29,7 @@
  */
 
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "find.h"
 #include "findlib/makepath.h"
 #include "findlib/create_file.h"

diff --git a/core/src/findlib/enable_priv.cc b/core/src/findlib/enable_priv.cc
@@ -29,7 +29,7 @@
 
 #include "include/bareos.h"
 #include "find.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "findlib/enable_priv.h"
 
 /*=============================================================*/

diff --git a/core/src/findlib/find.cc b/core/src/findlib/find.cc
@@ -33,7 +33,7 @@
  */
 
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "find.h"
 #include "findlib/find_one.h"
 

diff --git a/core/src/findlib/find.h b/core/src/findlib/find.h
@@ -31,7 +31,7 @@
 #ifndef BAREOS_FINDLIB_FIND_H_
 #define BAREOS_FINDLIB_FIND_H_
 
-#include "fileopts.h"
+#include "include/fileopts.h"
 #include "bfile.h"
 
 #ifdef HAVE_DIRENT_H

diff --git a/core/src/findlib/find_one.cc b/core/src/findlib/find_one.cc
@@ -32,7 +32,7 @@
  */
 
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "find.h"
 #include "findlib/match.h"
 #include "findlib/find_one.h"

diff --git a/core/src/findlib/match.cc b/core/src/findlib/match.cc
@@ -38,9 +38,9 @@
  */
 
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "find.h"
-#include "ch.h"
+#include "include/ch.h"
 
 #include <sys/types.h>
 #include "findlib/match.h"

diff --git a/core/src/findlib/mkpath.cc b/core/src/findlib/mkpath.cc
@@ -35,7 +35,7 @@
  * the top, which can be rather inefficient for long path names.
  */
 #include "include/bareos.h"
-#include "jcr.h"
+#include "include/jcr.h"
 #include "lib/path_list.h"
 
 #define debuglevel 50

diff --git a/core/src/findlib/unittests/CMakeLists.txt b/core/src/findlib/unittests/CMakeLists.txt
@@ -17,8 +17,6 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-include_directories(.. ../.. ../../include/)
-
 set (TEST_SRC
 #   drivetype_test.cc
 #   fstype_test.cc

diff --git a/core/src/findlib/xattr.cc b/core/src/findlib/xattr.cc
@@ -58,7 +58,7 @@
 
 #include "include/bareos.h"
 #include "find.h"
-#include "jcr.h"
+#include "include/jcr.h"
 
 #if !defined(HAVE_XATTR)
 /**

diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -17,7 +17,7 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-include_directories(../include ..
+include_directories(
    ${OPENSSL_INCLUDE_DIRS}
    ${PTHREAD_INCLUDE_DIRS}
    ${FASTLZ_INCLUDE_DIRS}

diff --git a/core/src/lib/compression.cc b/core/src/lib/compression.cc
@@ -31,8 +31,8 @@
 
 #include "include/bareos.h"
 #include "include/jcr.h"
-#include "ch.h"
-#include "streams.h"
+#include "include/ch.h"
+#include "include/streams.h"
 #include "lib/edit.h"
 
 #if defined(HAVE_LZO) || defined(HAVE_LIBZ) || defined(HAVE_FASTLZ)

diff --git a/core/src/lib/htable.cc b/core/src/lib/htable.cc
@@ -40,7 +40,7 @@
  * Kern Sibbald, July MMIII
  */
 
-#include "hostconfig.h"
+#include "include/hostconfig.h"
 
 #ifdef HAVE_HPUX_OS
 #pragma pack(4)

diff --git a/core/src/lib/htable.h b/core/src/lib/htable.h
@@ -46,7 +46,7 @@
 #endif
 
 
-#include "hostconfig.h"
+#include "include/hostconfig.h"
 
 #ifdef HAVE_HPUX_OS
 #pragma pack(push,4)

diff --git a/core/src/lib/parse_conf.h b/core/src/lib/parse_conf.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "include/bareos.h"
-#include "bc_types.h"
+#include "include/bc_types.h"
 
 #include <functional>
 

diff --git a/core/src/lib/tree.h b/core/src/lib/tree.h
@@ -27,9 +27,9 @@
  * Directory tree build/traverse routines
  */
 
-#include "htable.h"
+#include "lib/htable.h"
 
-#include "hostconfig.h"
+#include "include/hostconfig.h"
 
 #ifdef HAVE_HPUX_OS
 #pragma pack(push,4)

diff --git a/core/src/lib/unittests/CMakeLists.txt b/core/src/lib/unittests/CMakeLists.txt
@@ -17,7 +17,6 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-include_directories(.. ../.. ../../include/)
 IF(HAVE_WIN32)
    link_libraries(kernel32
       user32 gdi32 winspool shell32 ole32 oleaut32 uuid comdlg32 advapi32)