Provide interface to linuxdeploy_util

src/core/appdir.cpp

@@ -13,7 +13,7 @@
 #include "linuxdeploy/core/appdir.h"
 #include "linuxdeploy/core/elf.h"
 #include "linuxdeploy/core/log.h"
-#include "util.h"
+#include "linuxdeploy/util/util.h"
 #include "excludelist.h"
 
 using namespace linuxdeploy::core;

src/core/elf.cpp

@@ -8,7 +8,7 @@
 // local headers
 #include "linuxdeploy/core/elf.h"
 #include "linuxdeploy/core/log.h"
-#include "util.h"
+#include "linuxdeploy/util/util.h"
 
 using namespace linuxdeploy::core::log;
 

src/plugin/plugin.cpp

@@ -13,7 +13,7 @@
 #include "linuxdeploy/core/log.h"
 #include "linuxdeploy/plugin/base.h"
 #include "linuxdeploy/plugin/plugin.h"
-#include "util.h"
+#include "linuxdeploy/util/util.h"
 #include "plugin_type0.h"
 
 using namespace linuxdeploy::core;

src/util/CMakeLists.txt

@@ -1,2 +1,7 @@
-add_library(linuxdeploy_util STATIC magicwrapper.cpp magicwrapper.h util.h misc.h)
-target_include_directories(linuxdeploy_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(linuxdeploy_util STATIC
+    magicwrapper.cpp
+    magicwrapper.h
+    ${PROJECT_SOURCE_DIR}/include/linuxdeploy/util/util.h
+    ${PROJECT_SOURCE_DIR}/include/linuxdeploy/util/misc.h
+)
+target_include_directories(linuxdeploy_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include)