From: Razvan Becheriu Date: Fri, 21 Feb 2025 18:39:36 +0000 (+0200) Subject: [#3333] applied #3730 changes X-Git-Tag: Kea-2.7.7~173 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc5bc2c62154ad1bfb07747eda2d38353203fdb5;p=thirdparty%2Fkea.git [#3333] applied #3730 changes --- diff --git a/src/hooks/d2/gss_tsig/Makefile.am b/src/hooks/d2/gss_tsig/Makefile.am index b182538089..06dcf6ad34 100644 --- 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 87f9106e0c..956f29f891 100644 --- 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 #include diff --git a/src/hooks/d2/gss_tsig/gss_tsig_messages.h b/src/hooks/d2/gss_tsig/gss_tsig_messages.h index 93d6ee19ce..98cac94050 100644 --- 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 1d50e7d60c..8b94588ccb 100644 --- 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 b45cf6ed43..76e5beebc7 100644 --- 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 4aeb150fdd..5103b34306 100644 --- 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 dc4e17436f..9f4416c60b 100644 --- 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 #include diff --git a/src/hooks/dhcp/class_cmds/class_cmds_messages.h b/src/hooks/dhcp/class_cmds/class_cmds_messages.h index a2c47c5eab..d71afa0438 100644 --- 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 def9cf6eed..77cadb9b6c 100644 --- 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 index 0000000000..1fc40e4543 --- /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 index 0000000000..1936cc1d44 --- /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 549994ed00..96cf84cd0d 100644 --- 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 c7cab9dc93..723f5cc874 100644 --- 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 #include diff --git a/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.h b/src/hooks/dhcp/ddns_tuning/ddns_tuning_messages.h index f2c3be481f..b47e6bef3a 100644 --- 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 43555eaa5d..2d2879b398 100644 --- 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 a001ac9021..0bf41495bb 100644 --- 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 a9c9e4d6ad..b10344e1b8 100644 --- 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 #include diff --git a/src/hooks/dhcp/flex_id/flex_id_messages.h b/src/hooks/dhcp/flex_id/flex_id_messages.h index 4140e1b65e..1fb008951b 100644 --- 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 7260443b62..277b9f1456 100644 --- 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 1bc04231ea..8d5de8705e 100644 --- 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 988162a953..cc9b5d2c3c 100644 --- 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 #include diff --git a/src/hooks/dhcp/forensic_log/legal_log_messages.h b/src/hooks/dhcp/forensic_log/legal_log_messages.h index 499490932e..1519188c6d 100644 --- 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 020e6931b8..471545554d 100644 --- 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 4705125a1a..bb321a0d72 100644 --- 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 08a67b1b2f..c1f2e58d28 100644 --- 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 #include diff --git a/src/hooks/dhcp/host_cache/host_cache_messages.h b/src/hooks/dhcp/host_cache/host_cache_messages.h index fddb2e71ca..ccfda0ead2 100644 --- 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 5667b564de..3a4f1fe2c1 100644 --- 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 bf3ba1cec5..c6d91a6850 100644 --- 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 5639ad0a06..83aee580b7 100644 --- 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 #include diff --git a/src/hooks/dhcp/host_cmds/host_cmds_messages.h b/src/hooks/dhcp/host_cmds/host_cmds_messages.h index 59bfb633fa..c8b8684ddf 100644 --- 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 5edf38bb67..3a34ea90dc 100644 --- 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 415eb45fdc..00cfb48cff 100644 --- 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 b512b3baa7..1862645e20 100644 --- 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 #include diff --git a/src/hooks/dhcp/lease_query/lease_query_messages.h b/src/hooks/dhcp/lease_query/lease_query_messages.h index 76ac9ce014..405498adea 100644 --- 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 34a050685c..aaadc24483 100644 --- 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 a194b2f46d..b890a26b81 100644 --- 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 bdd590dfdd..1e69a18b3e 100644 --- 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 #include diff --git a/src/hooks/dhcp/limits/limits_messages.h b/src/hooks/dhcp/limits/limits_messages.h index 6cf520325c..32e40c9d55 100644 --- 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 a1b011fe25..0fa22d6be6 100644 --- 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 463b8d9658..958dff0305 100644 --- 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 02022b4dea..086f248bd3 100644 --- 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 0b2431119f..7dea2c2397 100644 --- 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 #include diff --git a/src/hooks/dhcp/ping_check/ping_check_messages.h b/src/hooks/dhcp/ping_check/ping_check_messages.h index 2e0c184028..9326c699e8 100644 --- 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 ce718ca711..5d3ae27746 100644 --- 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 aec8d23c13..3d9500b974 100644 --- 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 ef5cd95aff..a04a634358 100644 --- 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 #include diff --git a/src/hooks/dhcp/radius/radius_messages.h b/src/hooks/dhcp/radius/radius_messages.h index ceb2f5705f..9a65758bf0 100644 --- 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 15639eb632..6eff281724 100644 --- 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 479d7ee9f9..156c6e897b 100644 --- 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 52aa7963f1..b49c4db647 100644 --- 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 #include diff --git a/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h b/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h index ddbab140e9..3604a52116 100644 --- 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