summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-07-13 09:30:04 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commit1958da2130c04fbcc0bf1da2c40b57c785657e48 (patch)
tree5e6a47f55a519b2ded6a2955c2cb0b95435957ab
parent7678bfc942bd501f8e121ff153d1852d73578257 (diff)
glue: renamed output files to better represent their actual purpose
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--generate-binding-glue.py (renamed from generate-binding.py)4
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/app.hpp2
-rw-r--r--src/main.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/generate-binding.py b/generate-binding-glue.py
index 6c700de..cec4fea 100644
--- a/generate-binding.py
+++ b/generate-binding-glue.py
@@ -98,12 +98,12 @@ API = {
}
def main():
- with open('afb_binding.inl', 'w') as out:
+ with open('afb_binding_glue.inl', 'w') as out:
set_output(out)
p('// This file was generated, do not edit', '')
generate_names(API)
emit_binding(API)
- with open('afb_api.hpp', 'w') as out:
+ with open('afb_binding_api.hpp', 'w') as out:
set_output(out)
p('// This file was generated, do not edit', '')
emit_afb_api(API)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0d3db6..ebb1946 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,9 +8,9 @@ pkg_check_modules(SD REQUIRED libsystemd>=222)
set(CMAKE_SHARED_MODULE_PREFIX "")
add_custom_command(
- OUTPUT afb_api.hpp afb_binding.inl
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding.py
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding.py)
+ OUTPUT afb_binding_api.hpp afb_binding_glue.inl
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding-glue.py
+ COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding-glue.py)
add_library(winman MODULE
main.cpp
@@ -18,7 +18,7 @@ add_library(winman MODULE
wayland.hpp
util.cpp
util.hpp
- ${IVI_CON_PROTO} json_helper.cpp json_helper.hpp app.hpp app.cpp result.hpp afb_api.hpp afb_binding.inl)
+ ${IVI_CON_PROTO} json_helper.cpp json_helper.hpp app.hpp app.cpp result.hpp afb_binding_api.hpp afb_binding_glue.inl)
target_include_directories(winman
PRIVATE
diff --git a/src/app.hpp b/src/app.hpp
index f6238af..0fb929d 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -10,7 +10,7 @@
#include "wayland.hpp"
#include "result.hpp"
-#include "afb_api.hpp"
+#include "afb_binding_api.hpp"
namespace wl {
struct display;
diff --git a/src/main.cpp b/src/main.cpp
index 6de8597..8bb0b5c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -109,7 +109,7 @@ int binding_init() noexcept {
} // namespace
-#include "afb_binding.inl"
+#include "afb_binding_glue.inl"
extern "C" const struct afb_binding_v2 afbBindingV2 = {
"winman", NULL, NULL, winman_verbs, NULL, binding_init, NULL, 1};