[#3333] applied #3730 changes

diff --git a/src/hooks/d2/gss_tsig/Makefile.am b/src/hooks/d2/gss_tsig/Makefile.am
index b182538089662175209ed0c4755ab2c84c69bd4b..06dcf6ad348f2f21e9bb308e79934019ee57d4b2 100644 (file)
--- a/src/hooks/d2/gss_tsig/Makefile.am
+++ b/src/hooks/d2/gss_tsig/Makefile.am
@@ -87,7 +87,8 @@ messages: gss_tsig_messages.h gss_tsig_messages.cc
        @echo Message files regenerated
 
 gss_tsig_messages.h gss_tsig_messages.cc: gss_tsig_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/d2/gss_tsig/gss_tsig_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/d2/gss_tsig/gss_tsig_messages.mes)
 
 else
 

diff --git a/src/hooks/d2/gss_tsig/gss_tsig_messages.cc b/src/hooks/d2/gss_tsig/gss_tsig_messages.cc
index 87f9106e0c3a553c52517d2b21c9cf085170ecd7..956f29f891a89ade6d996b266c131698ae61d3a1 100644 (file)
--- a/src/hooks/d2/gss_tsig/gss_tsig_messages.cc
+++ b/src/hooks/d2/gss_tsig/gss_tsig_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/d2/gss_tsig/gss_tsig_messages.mes
+// File created from src/hooks/d2/gss_tsig/gss_tsig_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/d2/gss_tsig/gss_tsig_messages.h b/src/hooks/d2/gss_tsig/gss_tsig_messages.h
index 93d6ee19ce4394b968e38def8653f88a4b8500ab..98cac94050262ecdd44ce9988a0f893ac2791ac6 100644 (file)
--- a/src/hooks/d2/gss_tsig/gss_tsig_messages.h
+++ b/src/hooks/d2/gss_tsig/gss_tsig_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/d2/gss_tsig/gss_tsig_messages.mes
+// File created from src/hooks/d2/gss_tsig/gss_tsig_messages.mes
 
 #ifndef GSS_TSIG_MESSAGES_H
 #define GSS_TSIG_MESSAGES_H

diff --git a/src/hooks/d2/gss_tsig/meson.build b/src/hooks/d2/gss_tsig/meson.build
index 1d50e7d60c038c704fa0813258c047930c56cd78..8b94588ccb97bba7b9a29762d5d1b4e59ac9d730 100644 (file)
--- a/src/hooks/d2/gss_tsig/meson.build
+++ b/src/hooks/d2/gss_tsig/meson.build
@@ -29,3 +29,16 @@ ddns_gss_tsig_archive = static_library(
 subdir('testutils')
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-d2-gss_tsig-gss_tsig_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/d2/gss_tsig/gss_tsig_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/d2/gss_tsig/tests/meson.build b/src/hooks/d2/gss_tsig/tests/meson.build
index b45cf6ed431f16e746bd73a64d3380454e5c498e..76e5beebc7e2bc8f7e280125f013bb4e20a60bc3 100644 (file)
--- a/src/hooks/d2/gss_tsig/tests/meson.build
+++ b/src/hooks/d2/gss_tsig/tests/meson.build
@@ -28,3 +28,12 @@ ddns_gss_tsig_tests = executable(
     link_with: [ddns_gss_tsig_tests_libs] + LIBS_BUILT_SO_FAR,
 )
 test('ddns-gss-tsig-tests', ddns_gss_tsig_tests, protocol: 'gtest')
+
+executable(
+    'nsupdate',
+    'nsupdate.cc',
+    cpp_args: [f'-DTEST_DATA_DIR="@current_source_dir@"'],
+    dependencies: [krb5],
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
+    link_with: [ddns_gss_tsig_archive] + LIBS_BUILT_SO_FAR,
+)

diff --git a/src/hooks/dhcp/class_cmds/Makefile.am b/src/hooks/dhcp/class_cmds/Makefile.am
index 4aeb150fddd7268d1fff9276eaf523ce94282deb..5103b343068677d98d12908a672334f8f394b169 100644 (file)
--- a/src/hooks/dhcp/class_cmds/Makefile.am
+++ b/src/hooks/dhcp/class_cmds/Makefile.am
@@ -81,7 +81,8 @@ messages: class_cmds_messages.h class_cmds_messages.cc
        @echo Message files regenerated
 
 class_cmds_messages.h class_cmds_messages.cc: class_cmds_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/class_cmds/class_cmds_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/class_cmds/class_cmds_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/class_cmds/class_cmds_messages.cc b/src/hooks/dhcp/class_cmds/class_cmds_messages.cc
index dc4e17436f39ab0f75b49b38d5da582c040f82f3..9f4416c60b809b44fac8ec66630d28861c9f814d 100644 (file)
--- a/src/hooks/dhcp/class_cmds/class_cmds_messages.cc
+++ b/src/hooks/dhcp/class_cmds/class_cmds_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/class_cmds/class_cmds_messages.mes
+// File created from src/hooks/dhcp/class_cmds/class_cmds_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/class_cmds/class_cmds_messages.h b/src/hooks/dhcp/class_cmds/class_cmds_messages.h
index a2c47c5eab996283ab6d9cf32c7c7df570bd3221..d71afa0438609dbb351ca1abb18c262df70e8170 100644 (file)
--- a/src/hooks/dhcp/class_cmds/class_cmds_messages.h
+++ b/src/hooks/dhcp/class_cmds/class_cmds_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/class_cmds/class_cmds_messages.mes
+// File created from src/hooks/dhcp/class_cmds/class_cmds_messages.mes
 
 #ifndef CLASS_CMDS_MESSAGES_H
 #define CLASS_CMDS_MESSAGES_H

diff --git a/src/hooks/dhcp/class_cmds/meson.build b/src/hooks/dhcp/class_cmds/meson.build
index def9cf6eeda1cede4e1198fd9048640b7e089491..77cadb9b6c1233f1a950fe4489b8fdecabd999d4 100644 (file)
--- a/src/hooks/dhcp/class_cmds/meson.build
+++ b/src/hooks/dhcp/class_cmds/meson.build
@@ -18,3 +18,16 @@ dhcp_class_cmds_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-class_cmds-class_cmds_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/class_cmds/class_cmds_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/ddns_tuning/.gitattributes b/src/hooks/dhcp/ddns_tuning/.gitattributes
new file mode 100644 (file)
index 0000000..1fc40e4
--- /dev/null
+++ b/src/hooks/dhcp/ddns_tuning/.gitattributes
@@ -0,0 +1,2 @@
+/ddns_tuning_messages.cc           -diff merge=ours
+/ddns_tuning_messages.h            -diff merge=ours

diff --git a/src/hooks/dhcp/ddns_tuning/.gitignore b/src/hooks/dhcp/ddns_tuning/.gitignore
new file mode 100644 (file)
index 0000000..1936cc1
--- /dev/null
+++ b/src/hooks/dhcp/ddns_tuning/.gitignore
@@ -0,0 +1 @@
+html

diff --git a/src/hooks/dhcp/ddns_tuning/Makefile.am b/src/hooks/dhcp/ddns_tuning/Makefile.am
index 549994ed0037b8ee8d0ff7f96307aeeaf5a0480b..96cf84cd0d1eb3005d2a2c39ad725f50b2ea223d 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/Makefile.am
+++ b/src/hooks/dhcp/ddns_tuning/Makefile.am
@@ -87,7 +87,8 @@ messages: ddns_tuning_messages.h ddns_tuning_messages.cc
        @echo Message files regenerated
 
 ddns_tuning_messages.h ddns_tuning_messages.cc: ddns_tuning_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.cc b/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.cc
index c7cab9dc932b36b0858b77400d70a4c1efdb71e3..723f5cc874270d05c97b6213be378080b8454efd 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.cc
+++ b/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes
+// File created from src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.h b/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.h
index f2c3be481fdf222b16b77528eb6d3a79543f425b..b47e6bef3afca37457ee53b193c89a3f431bdf5a 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.h
+++ b/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes
+// File created from src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes
 
 #ifndef DDNS_TUNING_MESSAGES_H
 #define DDNS_TUNING_MESSAGES_H

diff --git a/src/hooks/dhcp/ddns_tuning/meson.build b/src/hooks/dhcp/ddns_tuning/meson.build
index 43555eaa5d86f89b143f198f8a6d3ad60972978d..2d2879b39802c24f3c0c2371501a42ec8e78571b 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/meson.build
+++ b/src/hooks/dhcp/ddns_tuning/meson.build
@@ -19,3 +19,16 @@ dhcp_ddns_tuning_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-ddns_tuning-ddns_tuning_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/flex_id/Makefile.am b/src/hooks/dhcp/flex_id/Makefile.am
index a001ac9021f75efe83b937ba7e45209ccda31e23..0bf41495bbd0a7af743df94095c4f8f4991291f8 100644 (file)
--- a/src/hooks/dhcp/flex_id/Makefile.am
+++ b/src/hooks/dhcp/flex_id/Makefile.am
@@ -88,7 +88,8 @@ messages: flex_id_messages.h flex_id_messages.cc
        @echo Message files regenerated
 
 flex_id_messages.h flex_id_messages.cc: flex_id_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/flex_id/flex_id_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/flex_id/flex_id_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/flex_id/flex_id_messages.cc b/src/hooks/dhcp/flex_id/flex_id_messages.cc
index a9c9e4d6ad271637ec67dc8b5f6c47cafe53379b..b10344e1b8bb1389658c01fd2b0eafbbc6154c6e 100644 (file)
--- a/src/hooks/dhcp/flex_id/flex_id_messages.cc
+++ b/src/hooks/dhcp/flex_id/flex_id_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/flex_id/flex_id_messages.mes
+// File created from src/hooks/dhcp/flex_id/flex_id_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/flex_id/flex_id_messages.h b/src/hooks/dhcp/flex_id/flex_id_messages.h
index 4140e1b65e654b177361b2a2d03934104219a44d..1fb008951bd7836e00c8c4eb165c75b6c488247b 100644 (file)
--- a/src/hooks/dhcp/flex_id/flex_id_messages.h
+++ b/src/hooks/dhcp/flex_id/flex_id_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/flex_id/flex_id_messages.mes
+// File created from src/hooks/dhcp/flex_id/flex_id_messages.mes
 
 #ifndef FLEX_ID_MESSAGES_H
 #define FLEX_ID_MESSAGES_H

diff --git a/src/hooks/dhcp/flex_id/meson.build b/src/hooks/dhcp/flex_id/meson.build
index 7260443b6297b56009c469b4b27b77267753b4f0..277b9f1456d77ba53c0c0a32f5b48834331e0fc3 100644 (file)
--- a/src/hooks/dhcp/flex_id/meson.build
+++ b/src/hooks/dhcp/flex_id/meson.build
@@ -18,3 +18,16 @@ dhcp_flex_id_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-flex_id-flex_id_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/flex_id/flex_id_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/forensic_log/Makefile.am b/src/hooks/dhcp/forensic_log/Makefile.am
index 1bc04231ea6f7ba9a04190e7d6364ac769fd4b25..8d5de8705e021f6cd9e39efff5426eae186ddbc5 100644 (file)
--- a/src/hooks/dhcp/forensic_log/Makefile.am
+++ b/src/hooks/dhcp/forensic_log/Makefile.am
@@ -129,7 +129,8 @@ messages: legal_log_messages.h legal_log_messages.cc
        @echo Message files regenerated
 
 legal_log_messages.h legal_log_messages.cc: legal_log_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/forensic_log/legal_log_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/forensic_log/legal_log_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/forensic_log/legal_log_messages.cc b/src/hooks/dhcp/forensic_log/legal_log_messages.cc
index 988162a953a2056c650ce89b7206ed561d5782df..cc9b5d2c3c9c4f48f5888d60f73a5b372c406596 100644 (file)
--- a/src/hooks/dhcp/forensic_log/legal_log_messages.cc
+++ b/src/hooks/dhcp/forensic_log/legal_log_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/forensic_log/legal_log_messages.mes
+// File created from src/hooks/dhcp/forensic_log/legal_log_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/forensic_log/legal_log_messages.h b/src/hooks/dhcp/forensic_log/legal_log_messages.h
index 499490932ec3f26d0bee6a4d0251b1ae0f63dc23..1519188c6d73ede5010b72cb53c7932bdb6d41a7 100644 (file)
--- a/src/hooks/dhcp/forensic_log/legal_log_messages.h
+++ b/src/hooks/dhcp/forensic_log/legal_log_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/forensic_log/legal_log_messages.mes
+// File created from src/hooks/dhcp/forensic_log/legal_log_messages.mes
 
 #ifndef LEGAL_LOG_MESSAGES_H
 #define LEGAL_LOG_MESSAGES_H

diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build
index 020e6931b854407d34144f4830f1f21eb5d36db8..471545554d1c10753e9a12cc4b7a02be9a313322 100644 (file)
--- a/src/hooks/dhcp/forensic_log/meson.build
+++ b/src/hooks/dhcp/forensic_log/meson.build
@@ -32,3 +32,16 @@ dhcp_forensic_log_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-forensic_log-legal_log_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/forensic_log/legal_log_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/host_cache/Makefile.am b/src/hooks/dhcp/host_cache/Makefile.am
index 4705125a1a65c3600f334d2362bf0e4b2c443613..bb321a0d723da5328058eb24e7a8d35a16b68229 100644 (file)
--- a/src/hooks/dhcp/host_cache/Makefile.am
+++ b/src/hooks/dhcp/host_cache/Makefile.am
@@ -87,7 +87,8 @@ messages: host_cache_messages.h host_cache_messages.cc
        @echo Message files regenerated
 
 host_cache_messages.h host_cache_messages.cc: host_cache_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/host_cache/host_cache_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/host_cache/host_cache_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/host_cache/host_cache_messages.cc b/src/hooks/dhcp/host_cache/host_cache_messages.cc
index 08a67b1b2f8fbbba1076e411e0b0d252e310fc8c..c1f2e58d28f164ce9e78457a3fdc88b0d21f0ad3 100644 (file)
--- a/src/hooks/dhcp/host_cache/host_cache_messages.cc
+++ b/src/hooks/dhcp/host_cache/host_cache_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/host_cache/host_cache_messages.mes
+// File created from src/hooks/dhcp/host_cache/host_cache_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/host_cache/host_cache_messages.h b/src/hooks/dhcp/host_cache/host_cache_messages.h
index fddb2e71ca741af25d1a8092a280b7f0e6595d20..ccfda0ead2c0933db781c4ad9398ea36b8b102d6 100644 (file)
--- a/src/hooks/dhcp/host_cache/host_cache_messages.h
+++ b/src/hooks/dhcp/host_cache/host_cache_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/host_cache/host_cache_messages.mes
+// File created from src/hooks/dhcp/host_cache/host_cache_messages.mes
 
 #ifndef HOST_CACHE_MESSAGES_H
 #define HOST_CACHE_MESSAGES_H

diff --git a/src/hooks/dhcp/host_cache/meson.build b/src/hooks/dhcp/host_cache/meson.build
index 5667b564de2d989d108c55f111a244b9a955140e..3a4f1fe2c1b0a47a60912b960fb53f88cdb91b96 100644 (file)
--- a/src/hooks/dhcp/host_cache/meson.build
+++ b/src/hooks/dhcp/host_cache/meson.build
@@ -21,3 +21,16 @@ dhcp_host_cache_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-host_cache-host_cache_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/host_cache/host_cache_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/host_cmds/Makefile.am b/src/hooks/dhcp/host_cmds/Makefile.am
index bf3ba1cec5b9fcf90726a7116c972ddbe509b314..c6d91a68505fdab538ca1cf485cbb6f7192a6f23 100644 (file)
--- a/src/hooks/dhcp/host_cmds/Makefile.am
+++ b/src/hooks/dhcp/host_cmds/Makefile.am
@@ -82,7 +82,8 @@ messages: host_cmds_messages.h host_cmds_messages.cc
        @echo Message files regenerated
 
 host_cmds_messages.h host_cmds_messages.cc: host_cmds_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/host_cmds/host_cmds_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/host_cmds/host_cmds_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/host_cmds/host_cmds_messages.cc b/src/hooks/dhcp/host_cmds/host_cmds_messages.cc
index 5639ad0a06d94b3d790df51f3b8c1fb144c8dba3..83aee580b7e4ee22afa9f46ef10aca321a8b9258 100644 (file)
--- a/src/hooks/dhcp/host_cmds/host_cmds_messages.cc
+++ b/src/hooks/dhcp/host_cmds/host_cmds_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/host_cmds/host_cmds_messages.mes
+// File created from src/hooks/dhcp/host_cmds/host_cmds_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/host_cmds/host_cmds_messages.h b/src/hooks/dhcp/host_cmds/host_cmds_messages.h
index 59bfb633fae8f1de3b3cd941fbddb195afbd4e2f..c8b8684ddfe4f8d4a373c815e88f3e5c66574e16 100644 (file)
--- a/src/hooks/dhcp/host_cmds/host_cmds_messages.h
+++ b/src/hooks/dhcp/host_cmds/host_cmds_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/host_cmds/host_cmds_messages.mes
+// File created from src/hooks/dhcp/host_cmds/host_cmds_messages.mes
 
 #ifndef HOST_CMDS_MESSAGES_H
 #define HOST_CMDS_MESSAGES_H

diff --git a/src/hooks/dhcp/host_cmds/meson.build b/src/hooks/dhcp/host_cmds/meson.build
index 5edf38bb67f8cdf61017f2a5eafe150b45df1e3b..3a34ea90dcb15b2c5d75ff9e83973c040538655d 100644 (file)
--- a/src/hooks/dhcp/host_cmds/meson.build
+++ b/src/hooks/dhcp/host_cmds/meson.build
@@ -18,3 +18,16 @@ dhcp_host_cmds_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-host_cmds-host_cmds_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/host_cmds/host_cmds_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/lease_query/Makefile.am b/src/hooks/dhcp/lease_query/Makefile.am
index 415eb45fdce720af7f7ecf49045ad78cd62bf5c2..00cfb48cffbac668e2a52d9dfc26c100c9dfacc7 100644 (file)
--- a/src/hooks/dhcp/lease_query/Makefile.am
+++ b/src/hooks/dhcp/lease_query/Makefile.am
@@ -96,7 +96,8 @@ messages: lease_query_messages.h lease_query_messages.cc
        @echo Message files regenerated
 
 lease_query_messages.h lease_query_messages.cc: lease_query_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/lease_query/lease_query_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/lease_query/lease_query_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/lease_query/lease_query_messages.cc b/src/hooks/dhcp/lease_query/lease_query_messages.cc
index b512b3baa7fc2720ce04c1eee5cf29449967ea09..1862645e20db10163be5835fbae253deee015496 100644 (file)
--- a/src/hooks/dhcp/lease_query/lease_query_messages.cc
+++ b/src/hooks/dhcp/lease_query/lease_query_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/lease_query/lease_query_messages.mes
+// File created from src/hooks/dhcp/lease_query/lease_query_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/lease_query/lease_query_messages.h b/src/hooks/dhcp/lease_query/lease_query_messages.h
index 76ac9ce014e1977e39814d20294dfd0cf6cd48ba..405498adea108da4e76dfe549d9e18bb71349930 100644 (file)
--- a/src/hooks/dhcp/lease_query/lease_query_messages.h
+++ b/src/hooks/dhcp/lease_query/lease_query_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/lease_query/lease_query_messages.mes
+// File created from src/hooks/dhcp/lease_query/lease_query_messages.mes
 
 #ifndef LEASE_QUERY_MESSAGES_H
 #define LEASE_QUERY_MESSAGES_H

diff --git a/src/hooks/dhcp/lease_query/meson.build b/src/hooks/dhcp/lease_query/meson.build
index 34a050685ca16c25ca13e55ef96c22ea3ba911c5..aaadc24483ab0e48edebd3432b5625769b582b26 100644 (file)
--- a/src/hooks/dhcp/lease_query/meson.build
+++ b/src/hooks/dhcp/lease_query/meson.build
@@ -26,3 +26,16 @@ dhcp_lease_query_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-lease_query-lease_query_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/lease_query/lease_query_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/limits/Makefile.am b/src/hooks/dhcp/limits/Makefile.am
index a194b2f46dc34ba3b5ceaa6a014e67d58aa90c01..b890a26b81ab077692f6bf75abd0653b470986a8 100644 (file)
--- a/src/hooks/dhcp/limits/Makefile.am
+++ b/src/hooks/dhcp/limits/Makefile.am
@@ -100,7 +100,8 @@ messages: limits_messages.h limits_messages.cc
        @echo Message files regenerated
 
 limits_messages.h limits_messages.cc: limits_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/limits/limits_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/limits/limits_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/limits/limits_messages.cc b/src/hooks/dhcp/limits/limits_messages.cc
index bdd590dfddb3dc7d2e7ec23d512180f94aaa9622..1e69a18b3e26d71c6ee8433260671652a675f9a0 100644 (file)
--- a/src/hooks/dhcp/limits/limits_messages.cc
+++ b/src/hooks/dhcp/limits/limits_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/limits/limits_messages.mes
+// File created from src/hooks/dhcp/limits/limits_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/limits/limits_messages.h b/src/hooks/dhcp/limits/limits_messages.h
index 6cf520325c70f05509c36917a38d437392d3d3d5..32e40c9d5512449b3ad4d7149dccccf4f10c5980 100644 (file)
--- a/src/hooks/dhcp/limits/limits_messages.h
+++ b/src/hooks/dhcp/limits/limits_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/limits/limits_messages.mes
+// File created from src/hooks/dhcp/limits/limits_messages.mes
 
 #ifndef LIMITS_MESSAGES_H
 #define LIMITS_MESSAGES_H

diff --git a/src/hooks/dhcp/limits/meson.build b/src/hooks/dhcp/limits/meson.build
index a1b011fe257085b617c9a4b57c0eb7928296ec44..0fa22d6be6825d03f28b799de6f7f3e97120a8b4 100644 (file)
--- a/src/hooks/dhcp/limits/meson.build
+++ b/src/hooks/dhcp/limits/meson.build
@@ -21,3 +21,16 @@ dhcp_limits_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-limits-limits_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/limits/limits_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/ping_check/Makefile.am b/src/hooks/dhcp/ping_check/Makefile.am
index 463b8d9658aeee411bc8cba9cb4d496ad4b6d6e6..958dff030504a4aff6784e0de9142b25aaa90891 100644 (file)
--- a/src/hooks/dhcp/ping_check/Makefile.am
+++ b/src/hooks/dhcp/ping_check/Makefile.am
@@ -93,7 +93,8 @@ messages: ping_check_messages.h ping_check_messages.cc
        @echo Message files regenerated
 
 ping_check_messages.h ping_check_messages.cc: ping_check_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/ping_check/ping_check_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/ping_check/ping_check_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/ping_check/meson.build b/src/hooks/dhcp/ping_check/meson.build
index 02022b4dea2bda7cd2d7c267f3f9a0c7719eaddd..086f248bd34be999722ebdbbf5b7ae3cb7d681da 100644 (file)
--- a/src/hooks/dhcp/ping_check/meson.build
+++ b/src/hooks/dhcp/ping_check/meson.build
@@ -24,3 +24,16 @@ dhcp_ping_check_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-ping_check-ping_check_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/ping_check/ping_check_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/ping_check/ping_check_messages.cc b/src/hooks/dhcp/ping_check/ping_check_messages.cc
index 0b2431119ff3ce2aa7294b5f4ef33ca7b2716900..7dea2c2397c3d2cedb7e3e94f97ffb952c5eb127 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_messages.cc
+++ b/src/hooks/dhcp/ping_check/ping_check_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/ping_check/ping_check_messages.mes
+// File created from src/hooks/dhcp/ping_check/ping_check_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/ping_check/ping_check_messages.h b/src/hooks/dhcp/ping_check/ping_check_messages.h
index 2e0c1840280b8d52c925fde150e7ce4a9d225d8a..9326c699e86842e43a90851724e613e11b833441 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_messages.h
+++ b/src/hooks/dhcp/ping_check/ping_check_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/ping_check/ping_check_messages.mes
+// File created from src/hooks/dhcp/ping_check/ping_check_messages.mes
 
 #ifndef PING_CHECK_MESSAGES_H
 #define PING_CHECK_MESSAGES_H

diff --git a/src/hooks/dhcp/radius/Makefile.am b/src/hooks/dhcp/radius/Makefile.am
index ce718ca711bc24780957cb0b56375784c531c487..5d3ae277463f6ff889803c23e1b02f2232c3a191 100644 (file)
--- a/src/hooks/dhcp/radius/Makefile.am
+++ b/src/hooks/dhcp/radius/Makefile.am
@@ -106,7 +106,8 @@ messages: radius_messages.h radius_messages.cc
        @echo Message files regenerated
 
 radius_messages.h radius_messages.cc: radius_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/radius/radius_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/radius/radius_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/radius/meson.build b/src/hooks/dhcp/radius/meson.build
index aec8d23c139f7402f785fcf12b0e6c7f8855c214..3d9500b97418ec45b1f9b943c2c53d397dac35ba 100644 (file)
--- a/src/hooks/dhcp/radius/meson.build
+++ b/src/hooks/dhcp/radius/meson.build
@@ -39,3 +39,16 @@ dhcp_radius_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-radius-radius_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/radius/radius_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/radius/radius_messages.cc b/src/hooks/dhcp/radius/radius_messages.cc
index ef5cd95aff287f5520c229230848e18c277d3f19..a04a6343582de46e23ab5091c3852f97a67bacbe 100644 (file)
--- a/src/hooks/dhcp/radius/radius_messages.cc
+++ b/src/hooks/dhcp/radius/radius_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/radius/radius_messages.mes
+// File created from src/hooks/dhcp/radius/radius_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/radius/radius_messages.h b/src/hooks/dhcp/radius/radius_messages.h
index ceb2f5705f825202c83f6ea423a7246554142a37..9a65758bf0992d52a7be7c9cacd71e0679bfaf90 100644 (file)
--- a/src/hooks/dhcp/radius/radius_messages.h
+++ b/src/hooks/dhcp/radius/radius_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/radius/radius_messages.mes
+// File created from src/hooks/dhcp/radius/radius_messages.mes
 
 #ifndef RADIUS_MESSAGES_H
 #define RADIUS_MESSAGES_H

diff --git a/src/hooks/dhcp/subnet_cmds/Makefile.am b/src/hooks/dhcp/subnet_cmds/Makefile.am
index 15639eb632ab35e5ef8e4f9cd786bdabdeccb5ff..6eff28172465ad27e523e157b46d082fe8d2e7e1 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/Makefile.am
+++ b/src/hooks/dhcp/subnet_cmds/Makefile.am
@@ -81,7 +81,8 @@ messages: subnet_cmds_messages.h subnet_cmds_messages.cc
        @echo Message files regenerated
 
 subnet_cmds_messages.h subnet_cmds_messages.cc: subnet_cmds_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/subnet_cmds/meson.build b/src/hooks/dhcp/subnet_cmds/meson.build
index 479d7ee9f9e5e7604f17167b093447b134696fd4..156c6e897b6adf33b68b9fcca1fe503428ea19bb 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/meson.build
+++ b/src/hooks/dhcp/subnet_cmds/meson.build
@@ -18,3 +18,16 @@ dhcp_subnet_cmds_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if KEA_MSG_COMPILER.found()
+    target_gen_messages = run_target(
+        'premium-src-hooks-dhcp-subnet_cmds-subnet_cmds_messages',
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.cc b/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.cc
index 52aa7963f151f482b83af375f7107f5d0b73cb57..b49c4db6479f0dfa3a29342b041d6d876c2cea2c 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.cc
+++ b/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes
+// File created from src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h b/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h
index ddbab140e91edb6c20a67e6fd83e9e181b6e2778..3604a521163d1c5b6146545be905df3babf85348 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h
+++ b/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes
+// File created from src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.mes
 
 #ifndef SUBNET_CMDS_MESSAGES_H
 #define SUBNET_CMDS_MESSAGES_H