[#3730] Fixed message file headers

diff --git a/meson.build b/meson.build
index 2f4dacf83cdf5f213c713a805d026a07d7fab820..47d4b36cbc43515c6e82f306203426aa989959c5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -182,6 +182,7 @@ if awk_exe.found()
     AWK = awk_exe.full_path()
 endif
 CD_AND_RUN = f'@TOP_SOURCE_DIR@/cd-and-run.sh'
+KEA_MSG_COMPILER = f'@TOP_BUILD_DIR@/src/lib/log/compiler/kea-msg-compiler'
 
 #### Dependencies
 

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index a2839307996b5a8f63728e5541ce4653b5947692..f217270cfd5ce81b730867fa24318e8d82af1b45 100644 (file)
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -84,7 +84,8 @@ messages: ca_messages.h ca_messages.cc
        @echo Message files regenerated
 
 ca_messages.h ca_messages.cc: ca_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/agent/ca_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/bin/agent/ca_messages.mes)
 
 else
 

diff --git a/src/bin/agent/ca_messages.cc b/src/bin/agent/ca_messages.cc
index 0ef1261c65abe2654f26a3123b74368caa9fae91..1a091536335d5e2d5ead931668e1a10f4b84f24b 100644 (file)
--- a/src/bin/agent/ca_messages.cc
+++ b/src/bin/agent/ca_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/agent/ca_messages.mes
+// File created from src/bin/agent/ca_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/bin/agent/ca_messages.h b/src/bin/agent/ca_messages.h
index d643e0bbaa059a7b46cf0ace59cbc108ad2f3b3a..280bf250e2dfbef22cd8936c70cc1b25c0708c2a 100644 (file)
--- a/src/bin/agent/ca_messages.h
+++ b/src/bin/agent/ca_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/agent/ca_messages.mes
+// File created from src/bin/agent/ca_messages.mes
 
 #ifndef CA_MESSAGES_H
 #define CA_MESSAGES_H

diff --git a/src/bin/agent/meson.build b/src/bin/agent/meson.build
index 89e24e39d7e66bb2d0a75e67508fbf35f879eae7..8b5f21057705779d1e6cf2c999811b03d8c0c25a 100644 (file)
--- a/src/bin/agent/meson.build
+++ b/src/bin/agent/meson.build
@@ -29,7 +29,12 @@ current_source_dir = meson.current_source_dir()
 if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-bin-agent-ca_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/ca_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/bin/agent/ca_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index c496c1f6666a037935504db308677ea4166c1acd..6a8987e6dc3c8774485dacb63f8534387b8c12b3 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -85,7 +85,8 @@ messages: dhcp4_messages.h dhcp4_messages.cc
        @echo Message files regenerated
 
 dhcp4_messages.h dhcp4_messages.cc: dhcp4_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/bin/dhcp4/dhcp4_messages.mes)
 
 else
 

diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc
index 12d08498d283de1776dc39597a6dc5a2c16d76d2..d097cd398019ef0377b5e103b5569b8df63f7141 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.cc
+++ b/src/bin/dhcp4/dhcp4_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes
+// File created from src/bin/dhcp4/dhcp4_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h
index 01c8c9130881c5049c643e61b2b61895a0200a2e..7c2104fe6accb8c32e282dd36024fe50cb01d8cc 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.h
+++ b/src/bin/dhcp4/dhcp4_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes
+// File created from src/bin/dhcp4/dhcp4_messages.mes
 
 #ifndef DHCP4_MESSAGES_H
 #define DHCP4_MESSAGES_H

diff --git a/src/bin/dhcp4/meson.build b/src/bin/dhcp4/meson.build
index 4303513cd14aa8afe40f2f685499b0b6169f7d5a..6c0fce94c394e0d90aee045ee7e89f1b61c2d2ed 100644 (file)
--- a/src/bin/dhcp4/meson.build
+++ b/src/bin/dhcp4/meson.build
@@ -28,7 +28,12 @@ current_source_dir = meson.current_source_dir()
 if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-bin-dhcp4-dhcp4_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/dhcp4_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/bin/dhcp4/dhcp4_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 4ec3e18db94c1dc519d0b2157874980883800614..788d78250fc0ba732f31df4d4806e14f6e12c01b 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -85,7 +85,8 @@ messages: dhcp6_messages.h dhcp6_messages.cc
        @echo Message files regenerated
 
 dhcp6_messages.h dhcp6_messages.cc: dhcp6_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/bin/dhcp6/dhcp6_messages.mes)
 
 else
 

diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc
index f06ea20a9e1e51fa973f3257ec71f58fb2b3da27..641b44f5e754dac79d27a041347bc0bcb70f764a 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.cc
+++ b/src/bin/dhcp6/dhcp6_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes
+// File created from src/bin/dhcp6/dhcp6_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h
index 3cb2b2b6cc47553d6355a7291a98b3505dac62d1..935f4a681107ce6ca16d5336d1617d41a8264f46 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.h
+++ b/src/bin/dhcp6/dhcp6_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes
+// File created from src/bin/dhcp6/dhcp6_messages.mes
 
 #ifndef DHCP6_MESSAGES_H
 #define DHCP6_MESSAGES_H

diff --git a/src/bin/dhcp6/meson.build b/src/bin/dhcp6/meson.build
index e1a8ac89ff6f73c9fedd033da5fa374f5a09ade2..37d9a6dec855373aa31eeb9dcc849ccf08e078c5 100644 (file)
--- a/src/bin/dhcp6/meson.build
+++ b/src/bin/dhcp6/meson.build
@@ -29,7 +29,12 @@ current_source_dir = meson.current_source_dir()
 if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-bin-dhcp6-dhcp6_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/dhcp6_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/bin/dhcp6/dhcp6_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index 5f7e9687a113bbf4a380f807eaeeeeb8347d6606..c83d3363f5999d624532ffd2c375aa0580291bd9 100644 (file)
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@ -74,7 +74,8 @@ messages: lfc_messages.h lfc_messages.cc
        @echo Message files regenerated
 
 lfc_messages.h lfc_messages.cc: lfc_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/lfc/lfc_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/bin/lfc/lfc_messages.mes)
 
 else
 

diff --git a/src/bin/lfc/lfc_messages.cc b/src/bin/lfc/lfc_messages.cc
index 0fe0396d9841d22446943c614cdf0550a1ac7eba..878bc808c24e367e606edd47bcd0e6296030a9ed 100644 (file)
--- a/src/bin/lfc/lfc_messages.cc
+++ b/src/bin/lfc/lfc_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/lfc/lfc_messages.mes
+// File created from src/bin/lfc/lfc_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/bin/lfc/lfc_messages.h b/src/bin/lfc/lfc_messages.h
index 23d01096f5123b800a0ecf9fc1d42ec0f68a25ba..36dfd033fe2229d72fc1c3f225618dba4e36956e 100644 (file)
--- a/src/bin/lfc/lfc_messages.h
+++ b/src/bin/lfc/lfc_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/lfc/lfc_messages.mes
+// File created from src/bin/lfc/lfc_messages.mes
 
 #ifndef LFC_MESSAGES_H
 #define LFC_MESSAGES_H

diff --git a/src/bin/lfc/meson.build b/src/bin/lfc/meson.build
index cfc57042550e045f2cd19d132dba4a048a521cc7..90ddb6ce2893cca34011cb8b9836e9146450f2e2 100644 (file)
--- a/src/bin/lfc/meson.build
+++ b/src/bin/lfc/meson.build
@@ -16,10 +16,14 @@ executable(
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-bin-lfc-lfc_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/lfc_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/bin/lfc/lfc_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 5f82d72866a4d28dbdf944e7cc1a07a811580dae..c36c224886c574b51b6f85dd9c25f9ba7a1d921f 100644 (file)
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -96,7 +96,8 @@ messages: netconf_messages.h netconf_messages.cc
        @echo Message files regenerated
 
 netconf_messages.h netconf_messages.cc: netconf_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/netconf/netconf_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/bin/netconf/netconf_messages.mes)
 
 else
 

diff --git a/src/bin/netconf/meson.build b/src/bin/netconf/meson.build
index 24c93a12e1ad79c739ee1e693cb1e2be0cab5d61..8b196a684791ccf6fc5e7f477b12737d71e1378b 100644 (file)
--- a/src/bin/netconf/meson.build
+++ b/src/bin/netconf/meson.build
@@ -43,8 +43,10 @@ if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-bin-netconf-netconf_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/netconf_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/bin/netconf/netconf_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

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

diff --git a/src/hooks/dhcp/bootp/bootp_messages.cc b/src/hooks/dhcp/bootp/bootp_messages.cc
index e9d49bee7afae4dc6ccd751e0f8e470d49119f64..3c6969e8159bda1646cccde3b1c0a7395adf8ae4 100644 (file)
--- a/src/hooks/dhcp/bootp/bootp_messages.cc
+++ b/src/hooks/dhcp/bootp/bootp_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/bootp/bootp_messages.mes
+// File created from src/hooks/dhcp/bootp/bootp_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/bootp/bootp_messages.h b/src/hooks/dhcp/bootp/bootp_messages.h
index 6333b22da7b9199a46c44bd6f40bf04f267ba858..05c091dc401883c8e37fff641306820b6d71e7e5 100644 (file)
--- a/src/hooks/dhcp/bootp/bootp_messages.h
+++ b/src/hooks/dhcp/bootp/bootp_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/bootp/bootp_messages.mes
+// File created from src/hooks/dhcp/bootp/bootp_messages.mes
 
 #ifndef BOOTP_MESSAGES_H
 #define BOOTP_MESSAGES_H

diff --git a/src/hooks/dhcp/bootp/meson.build b/src/hooks/dhcp/bootp/meson.build
index 3e605f5f6bce2b27fb924d183f5501c88a286643..a07848cc4ee519ca29c09c43fa934d8af9b0a43f 100644 (file)
--- a/src/hooks/dhcp/bootp/meson.build
+++ b/src/hooks/dhcp/bootp/meson.build
@@ -18,10 +18,14 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-bootp-bootp_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/bootp_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/bootp/bootp_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

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

diff --git a/src/hooks/dhcp/flex_option/flex_option_messages.cc b/src/hooks/dhcp/flex_option/flex_option_messages.cc
index 7b7a08aedde1f336f1b246498a19930abd802078..e1bd676cec8c1986602f3b0fd5d02d60629818a4 100644 (file)
--- a/src/hooks/dhcp/flex_option/flex_option_messages.cc
+++ b/src/hooks/dhcp/flex_option/flex_option_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/flex_option/flex_option_messages.mes
+// File created from src/hooks/dhcp/flex_option/flex_option_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/flex_option/flex_option_messages.h b/src/hooks/dhcp/flex_option/flex_option_messages.h
index 0ace6cf6f4ab43b68ce75c464b99ffdb86c2835a..7ffe7d81bebf9c3f3d12bda3d3fd2a4752172d91 100644 (file)
--- a/src/hooks/dhcp/flex_option/flex_option_messages.h
+++ b/src/hooks/dhcp/flex_option/flex_option_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/flex_option/flex_option_messages.mes
+// File created from src/hooks/dhcp/flex_option/flex_option_messages.mes
 
 #ifndef FLEX_OPTION_MESSAGES_H
 #define FLEX_OPTION_MESSAGES_H

diff --git a/src/hooks/dhcp/flex_option/meson.build b/src/hooks/dhcp/flex_option/meson.build
index 0d113cecb8634404337da9328743cae6863783b3..f2f77016d5f4780f61bef4d4a9d7443348bb7393 100644 (file)
--- a/src/hooks/dhcp/flex_option/meson.build
+++ b/src/hooks/dhcp/flex_option/meson.build
@@ -20,12 +20,13 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-flex_option-flex_option_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/flex_option_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/flex_option/flex_option_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

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

diff --git a/src/hooks/dhcp/high_availability/ha_messages.cc b/src/hooks/dhcp/high_availability/ha_messages.cc
index 19308e671a1a62eefdc98fc812cade0962560d0f..764bd231ba56ead8cec439266fc5161a42bffd60 100644 (file)
--- a/src/hooks/dhcp/high_availability/ha_messages.cc
+++ b/src/hooks/dhcp/high_availability/ha_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/high_availability/ha_messages.mes
+// File created from src/hooks/dhcp/high_availability/ha_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/high_availability/ha_messages.h b/src/hooks/dhcp/high_availability/ha_messages.h
index 334c999210fe5a3deb3344b13aa7e0d00a616e7d..d93824053672b0c573f63ec239b94c4e14967c46 100644 (file)
--- a/src/hooks/dhcp/high_availability/ha_messages.h
+++ b/src/hooks/dhcp/high_availability/ha_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/high_availability/ha_messages.mes
+// File created from src/hooks/dhcp/high_availability/ha_messages.mes
 
 #ifndef HA_MESSAGES_H
 #define HA_MESSAGES_H

diff --git a/src/hooks/dhcp/high_availability/meson.build b/src/hooks/dhcp/high_availability/meson.build
index 16cc26ac5727fc10930a105db5f6865c887aef18..30300fec8260eda7b3b763d85203d6e4f4acede7 100644 (file)
--- a/src/hooks/dhcp/high_availability/meson.build
+++ b/src/hooks/dhcp/high_availability/meson.build
@@ -29,10 +29,14 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-high_availability-ha_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/ha_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/high_availability/ha_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am
index 65b8f0817df33bb6814d3d2de1ff0940837ade2c..0505df40845071f466b659317642572d23905bdb 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/Makefile.am
@@ -79,7 +79,8 @@ messages: lease_cmds_messages.h lease_cmds_messages.cc
        @echo Message files regenerated
 
 lease_cmds_messages.h lease_cmds_messages.cc: lease_cmds_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
index b9797109ca36b264d1f53c75537ac08eef2518e2..0c03f67c9628259a50c1fe0554fd5921bbe58dc3 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
+// File created from src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h
index 9db140f4875d21883dcd749f80ffac4252f7ffa2..50af15b2ea0dfb379e936173513ca36da7a75f0a 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
+// File created from src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
 
 #ifndef LEASE_CMDS_MESSAGES_H
 #define LEASE_CMDS_MESSAGES_H

diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build
index e03dbc0b32f0a6f146b2b6bbe648c7ce446cd89c..863c498606ef13c140f1d269c802b020aecf7932 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/meson.build
+++ b/src/hooks/dhcp/lease_cmds/meson.build
@@ -22,12 +22,13 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-lease_cmds-lease_cmds_messages',
         command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
             kea_msg_compiler,
-            f'@current_source_dir@/lease_cmds_messages.mes',
+            'src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/hooks/dhcp/mysql/Makefile.am b/src/hooks/dhcp/mysql/Makefile.am
index 9c77522b9cb3be6084cbb7a27be98eb883c50f69..6faae540a07eda6b4cc498fc41f073235c0feb70 100644 (file)
--- a/src/hooks/dhcp/mysql/Makefile.am
+++ b/src/hooks/dhcp/mysql/Makefile.am
@@ -92,13 +92,16 @@ messages: mysql_cb_messages.h mysql_cb_messages.cc \
        @echo Message files regenerated
 
 mysql_cb_messages.h mysql_cb_messages.cc: mysql_cb_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/mysql/mysql_cb_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/mysql/mysql_cb_messages.mes)
 
 mysql_hb_messages.h mysql_hb_messages.cc: mysql_hb_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/mysql/mysql_hb_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/mysql/mysql_hb_messages.mes)
 
 mysql_lb_messages.h mysql_lb_messages.cc: mysql_lb_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/mysql/mysql_lb_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/mysql/mysql_lb_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/mysql/meson.build b/src/hooks/dhcp/mysql/meson.build
index 2d17e3d5fd845b31aba2f5e686d8424e862749e1..3786d9d3327f3f503bb02af8f0153cace477dce7 100644 (file)
--- a/src/hooks/dhcp/mysql/meson.build
+++ b/src/hooks/dhcp/mysql/meson.build
@@ -32,28 +32,33 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-mysql-mysql_cb_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/mysql_cb_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/mysql/mysql_cb_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-hooks-dhcp-mysql-mysql_hb_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/mysql_hb_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/mysql/mysql_hb_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-hooks-dhcp-mysql-mysql_lb_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/mysql_lb_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/mysql/mysql_lb_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/hooks/dhcp/mysql/mysql_cb_messages.cc b/src/hooks/dhcp/mysql/mysql_cb_messages.cc
index 098168c42e19fc2352664d8f7764b1e549ea7fa8..defaddd0aa42d1c90ac25837324eb71be6027666 100644 (file)
--- a/src/hooks/dhcp/mysql/mysql_cb_messages.cc
+++ b/src/hooks/dhcp/mysql/mysql_cb_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/mysql/mysql_cb_messages.mes
+// File created from src/hooks/dhcp/mysql/mysql_cb_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/mysql/mysql_cb_messages.h b/src/hooks/dhcp/mysql/mysql_cb_messages.h
index 4b89d63a44821a1a167d8c51a8da1cab53212923..bae8b8f98b1f73991a450966eeed43f5fbf4df05 100644 (file)
--- a/src/hooks/dhcp/mysql/mysql_cb_messages.h
+++ b/src/hooks/dhcp/mysql/mysql_cb_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/mysql/mysql_cb_messages.mes
+// File created from src/hooks/dhcp/mysql/mysql_cb_messages.mes
 
 #ifndef MYSQL_CB_MESSAGES_H
 #define MYSQL_CB_MESSAGES_H

diff --git a/src/hooks/dhcp/mysql/mysql_hb_messages.cc b/src/hooks/dhcp/mysql/mysql_hb_messages.cc
index 63a6a6a5aa0f0ed15638465b9969dbee7358f53e..547a19198c1a178e77efd0a5dae36cdd3df04456 100644 (file)
--- a/src/hooks/dhcp/mysql/mysql_hb_messages.cc
+++ b/src/hooks/dhcp/mysql/mysql_hb_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/mysql/mysql_hb_messages.mes
+// File created from src/hooks/dhcp/mysql/mysql_hb_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/mysql/mysql_hb_messages.h b/src/hooks/dhcp/mysql/mysql_hb_messages.h
index 47a26db2de1ec1832ecf277a66b4658786933de5..b6844faeb8ebbb7dcf07f31dd52ba18fd2e553c2 100644 (file)
--- a/src/hooks/dhcp/mysql/mysql_hb_messages.h
+++ b/src/hooks/dhcp/mysql/mysql_hb_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/mysql/mysql_hb_messages.mes
+// File created from src/hooks/dhcp/mysql/mysql_hb_messages.mes
 
 #ifndef MYSQL_HB_MESSAGES_H
 #define MYSQL_HB_MESSAGES_H

diff --git a/src/hooks/dhcp/mysql/mysql_lb_messages.cc b/src/hooks/dhcp/mysql/mysql_lb_messages.cc
index 57d3d2a34c18e4efdcbad40993b4ec47553501f6..bd5bdafa2f979c91475bb738b8328a2e59f34fff 100644 (file)
--- a/src/hooks/dhcp/mysql/mysql_lb_messages.cc
+++ b/src/hooks/dhcp/mysql/mysql_lb_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/mysql/mysql_lb_messages.mes
+// File created from src/hooks/dhcp/mysql/mysql_lb_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/mysql/mysql_lb_messages.h b/src/hooks/dhcp/mysql/mysql_lb_messages.h
index ff4ac0a2e05bd800f634d172fd5c1c119ab7af15..8b879cc8756879e04461ceee958092f84d2393c0 100644 (file)
--- a/src/hooks/dhcp/mysql/mysql_lb_messages.h
+++ b/src/hooks/dhcp/mysql/mysql_lb_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/mysql/mysql_lb_messages.mes
+// File created from src/hooks/dhcp/mysql/mysql_lb_messages.mes
 
 #ifndef MYSQL_LB_MESSAGES_H
 #define MYSQL_LB_MESSAGES_H

diff --git a/src/hooks/dhcp/perfmon/Makefile.am b/src/hooks/dhcp/perfmon/Makefile.am
index 64f2ea7ef0f16072c836e21eaa104e0fce3f8e62..2f5f29c82c775cf169fe1e65c1cd667723bf8fba 100644 (file)
--- a/src/hooks/dhcp/perfmon/Makefile.am
+++ b/src/hooks/dhcp/perfmon/Makefile.am
@@ -81,7 +81,8 @@ messages: perfmon_messages.h perfmon_messages.cc
        @echo Message files regenerated
 
 perfmon_messages.h perfmon_messages.cc: perfmon_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/perfmon/perfmon_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/perfmon/perfmon_messages.mes
 
 else
 

diff --git a/src/hooks/dhcp/perfmon/meson.build b/src/hooks/dhcp/perfmon/meson.build
index b8c31b704de2345c18e3f1ba2fc2c07be70f18a7..75c71ac06b821d124589ad5fcbd39119504b42ea 100644 (file)
--- a/src/hooks/dhcp/perfmon/meson.build
+++ b/src/hooks/dhcp/perfmon/meson.build
@@ -25,12 +25,13 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-perfmon-perfmon_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/perfmon_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/perfmon/perfmon_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/hooks/dhcp/perfmon/perfmon_messages.cc b/src/hooks/dhcp/perfmon/perfmon_messages.cc
index 6ddf64c5744c660566932656202ba6cbb92af4cc..c4eccdbfc86822fffbd3cccab0f8b6201723f899 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_messages.cc
+++ b/src/hooks/dhcp/perfmon/perfmon_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/perfmon/perfmon_messages.mes
+// File created from src/hooks/dhcp/perfmon/perfmon_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/perfmon/perfmon_messages.h b/src/hooks/dhcp/perfmon/perfmon_messages.h
index 9cec553bdd6125c39112baa0eddab9c286668d28..2db5171a32f89502f817d0fd7f3b488c0da931d3 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_messages.h
+++ b/src/hooks/dhcp/perfmon/perfmon_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/perfmon/perfmon_messages.mes
+// File created from src/hooks/dhcp/perfmon/perfmon_messages.mes
 
 #ifndef PERFMON_MESSAGES_H
 #define PERFMON_MESSAGES_H

diff --git a/src/hooks/dhcp/pgsql/Makefile.am b/src/hooks/dhcp/pgsql/Makefile.am
index bc06050d7dc618f10e6514c4ae43882d815984d7..2a4e43b442a96fe5caada12355afee22d15bc045 100644 (file)
--- a/src/hooks/dhcp/pgsql/Makefile.am
+++ b/src/hooks/dhcp/pgsql/Makefile.am
@@ -92,13 +92,16 @@ messages: pgsql_cb_messages.h pgsql_cb_messages.cc \
        @echo Message files regenerated
 
 pgsql_cb_messages.h pgsql_cb_messages.cc: pgsql_cb_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/pgsql/pgsql_cb_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/pgsql/pgsql_cb_messages.mes)
 
 pgsql_hb_messages.h pgsql_hb_messages.cc: pgsql_hb_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/pgsql/pgsql_hb_messages.mes)
 
 pgsql_lb_messages.h pgsql_lb_messages.cc: pgsql_lb_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/pgsql/pgsql_lb_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/pgsql/meson.build b/src/hooks/dhcp/pgsql/meson.build
index 278363ecbbb6ec235be663d1a9d06d1e6c86c7fb..f764ce062b7d70992b94a6d09dd4a0d798518695 100644 (file)
--- a/src/hooks/dhcp/pgsql/meson.build
+++ b/src/hooks/dhcp/pgsql/meson.build
@@ -32,28 +32,33 @@ subdir('libloadtests')
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-pgsql-pgsql_cb_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/pgsql_cb_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/pgsql/pgsql_cb_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-hooks-dhcp-pgsql-pgsql_hb_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/pgsql_hb_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/pgsql/pgsql_hb_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-hooks-dhcp-pgsql-pgsql_lb_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/pgsql_lb_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/pgsql/pgsql_lb_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/hooks/dhcp/pgsql/pgsql_cb_messages.cc b/src/hooks/dhcp/pgsql/pgsql_cb_messages.cc
index 69b183ceb82bd5cc38ea22113b3205ef2253465f..6817056483cafbbf32d33ec251f345da795edf98 100644 (file)
--- a/src/hooks/dhcp/pgsql/pgsql_cb_messages.cc
+++ b/src/hooks/dhcp/pgsql/pgsql_cb_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_cb_messages.mes
+// File created from src/hooks/dhcp/pgsql/pgsql_cb_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/pgsql/pgsql_cb_messages.h b/src/hooks/dhcp/pgsql/pgsql_cb_messages.h
index 82285db49501115d44a5841dd9a724554c9b64eb..9a301e6445ec815da9d36c2ae87a2ef0d91d3523 100644 (file)
--- a/src/hooks/dhcp/pgsql/pgsql_cb_messages.h
+++ b/src/hooks/dhcp/pgsql/pgsql_cb_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_cb_messages.mes
+// File created from src/hooks/dhcp/pgsql/pgsql_cb_messages.mes
 
 #ifndef PGSQL_CB_MESSAGES_H
 #define PGSQL_CB_MESSAGES_H

diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc b/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc
index 0577826c6ca218d87ff7a69f464af9bce5759e25..98dbb2a414d6a7d09b161c9ef86be1b88fdae67f 100644 (file)
--- a/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc
+++ b/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
+// File created from src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_messages.h b/src/hooks/dhcp/pgsql/pgsql_hb_messages.h
index 59555531c69ebd1476e7144480b779c3bddbb136..ba403b4b3f2049ae9a75d4ba020fca4c8f51daaa 100644 (file)
--- a/src/hooks/dhcp/pgsql/pgsql_hb_messages.h
+++ b/src/hooks/dhcp/pgsql/pgsql_hb_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
+// File created from src/hooks/dhcp/pgsql/pgsql_hb_messages.mes
 
 #ifndef PGSQL_HB_MESSAGES_H
 #define PGSQL_HB_MESSAGES_H

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

diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_messages.h b/src/hooks/dhcp/pgsql/pgsql_lb_messages.h
index 16cf841e9f36394843121475c060ee21a32d8351..fc9ae19030e884208fce2ae26226f95e637a4913 100644 (file)
--- a/src/hooks/dhcp/pgsql/pgsql_lb_messages.h
+++ b/src/hooks/dhcp/pgsql/pgsql_lb_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_lb_messages.mes
+// File created from src/hooks/dhcp/pgsql/pgsql_lb_messages.mes
 
 #ifndef PGSQL_LB_MESSAGES_H
 #define PGSQL_LB_MESSAGES_H

diff --git a/src/hooks/dhcp/run_script/Makefile.am b/src/hooks/dhcp/run_script/Makefile.am
index 3aad99428d898e79955b0650cd7c1a07205d53b5..383055690943d2dfcfd56f88a878c9bce65b28e3 100644 (file)
--- a/src/hooks/dhcp/run_script/Makefile.am
+++ b/src/hooks/dhcp/run_script/Makefile.am
@@ -76,7 +76,8 @@ messages: run_script_messages.h run_script_messages.cc
        @echo Message files regenerated
 
 run_script_messages.h run_script_messages.cc: run_script_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/run_script/run_script_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/run_script/run_script_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/run_script/meson.build b/src/hooks/dhcp/run_script/meson.build
index 10bc51c33241ea5d06964c69a63edcfa77c1ee73..61631754f01a2ac3a3cef80ea1985d6b1d7d4d15 100644 (file)
--- a/src/hooks/dhcp/run_script/meson.build
+++ b/src/hooks/dhcp/run_script/meson.build
@@ -21,12 +21,13 @@ subdir('tests')
 subdir('libloadtests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-run_script-run_script_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/run_script_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/run_script/run_script_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

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

diff --git a/src/hooks/dhcp/run_script/run_script_messages.h b/src/hooks/dhcp/run_script/run_script_messages.h
index a70c8ca9cd3524ddbc7cf1d8b3193ef8bbb2092b..ab6314b64f495911835eab5a7fb27074c2ccde5f 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script_messages.h
+++ b/src/hooks/dhcp/run_script/run_script_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/run_script/run_script_messages.mes
+// File created from src/hooks/dhcp/run_script/run_script_messages.mes
 
 #ifndef RUN_SCRIPT_MESSAGES_H
 #define RUN_SCRIPT_MESSAGES_H

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

diff --git a/src/hooks/dhcp/stat_cmds/meson.build b/src/hooks/dhcp/stat_cmds/meson.build
index 31e4c928d8de23ae3be2b99148ea5051731259a8..6279f71bbfaf16ecc2baa52a171cb35de114a398 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/meson.build
+++ b/src/hooks/dhcp/stat_cmds/meson.build
@@ -19,12 +19,13 @@ dhcp_stat_cmds_archive = static_library(
 subdir('libloadtests')
 subdir('tests')
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-stat_cmds-stat_cmds_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/stat_cmds_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/stat_cmds/stat_cmds_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc
index 66329ca0bab525d62c9402de8b58d63f42b8f414..7e3426b9b3af1b24405ac3b6725994b72e5935f2 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc
+++ b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/stat_cmds/stat_cmds_messages.mes
+// File created from src/hooks/dhcp/stat_cmds/stat_cmds_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h
index 100d7a8e4626ecca43eec9a98bf16f58c9ecee6a..f4ace09a68da67bbf7d9824b6a7b43fa5fbcc714 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h
+++ b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/stat_cmds/stat_cmds_messages.mes
+// File created from src/hooks/dhcp/stat_cmds/stat_cmds_messages.mes
 
 #ifndef STAT_CMDS_MESSAGES_H
 #define STAT_CMDS_MESSAGES_H

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

diff --git a/src/hooks/dhcp/user_chk/meson.build b/src/hooks/dhcp/user_chk/meson.build
index ebeb42436c256adfd5aae2715d246370cf2a781b..6d52018d2c63ee5278aa757b926d9f5a1aecc369 100644 (file)
--- a/src/hooks/dhcp/user_chk/meson.build
+++ b/src/hooks/dhcp/user_chk/meson.build
@@ -24,12 +24,13 @@ dhcp_user_chk_archive = static_library(
 subdir('tests')
 
 if HAS_KEA_MSG_COMPILER
-    current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-hooks-dhcp-user_chk-user_chk_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/user_chk_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/hooks/dhcp/user_chk/user_chk_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/hooks/dhcp/user_chk/user_chk_messages.cc b/src/hooks/dhcp/user_chk/user_chk_messages.cc
index 109a3f0fe3d0cdbed16c21baa3e8d9f7120a93ab..88bc8a3ecb936ae6f97105d61f61a7fdf23daff7 100644 (file)
--- a/src/hooks/dhcp/user_chk/user_chk_messages.cc
+++ b/src/hooks/dhcp/user_chk/user_chk_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/user_chk/user_chk_messages.mes
+// File created from src/hooks/dhcp/user_chk/user_chk_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/hooks/dhcp/user_chk/user_chk_messages.h b/src/hooks/dhcp/user_chk/user_chk_messages.h
index d5aa6211ea4b04ea83573fee945d3c8a280fff1d..3b5c4707e8d63a0a41e2632d3d91bb1f81824f83 100644 (file)
--- a/src/hooks/dhcp/user_chk/user_chk_messages.h
+++ b/src/hooks/dhcp/user_chk/user_chk_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/hooks/dhcp/user_chk/user_chk_messages.mes
+// File created from src/hooks/dhcp/user_chk/user_chk_messages.mes
 
 #ifndef USER_CHK_MESSAGES_H
 #define USER_CHK_MESSAGES_H

diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
index 5ff0f38c68d460b1aa8280f02e4ae457c96cdfa8..6ed191cdaf125c4e5bcf97383403d69ba2ed738f 100644 (file)
--- a/src/lib/asiodns/Makefile.am
+++ b/src/lib/asiodns/Makefile.am
@@ -55,7 +55,8 @@ messages: asiodns_messages.h asiodns_messages.cc
        @echo Message files regenerated
 
 asiodns_messages.h asiodns_messages.cc: asiodns_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/asiodns/asiodns_messages.mes)
 
 else
 

diff --git a/src/lib/asiodns/asiodns_messages.cc b/src/lib/asiodns/asiodns_messages.cc
index c61d9f3ff54ad814ee8b26b382889bef5f73d55e..2ebbbc56ab61ee0235fcb502a3619eb10fb6d8cf 100644 (file)
--- a/src/lib/asiodns/asiodns_messages.cc
+++ b/src/lib/asiodns/asiodns_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/asiodns/asiodns_messages.mes
+// File created from src/lib/asiodns/asiodns_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/asiodns/asiodns_messages.h b/src/lib/asiodns/asiodns_messages.h
index e4b45788ffd8c6876a5575feb729657d653f2073..c5d6a3c5835786823a3423c29f6702fa20d6471b 100644 (file)
--- a/src/lib/asiodns/asiodns_messages.h
+++ b/src/lib/asiodns/asiodns_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/asiodns/asiodns_messages.mes
+// File created from src/lib/asiodns/asiodns_messages.mes
 
 #ifndef ASIODNS_MESSAGES_H
 #define ASIODNS_MESSAGES_H

diff --git a/src/lib/asiodns/meson.build b/src/lib/asiodns/meson.build
index a54f65a1186849e295e10cd1f0d4f7efdbba852c..9a8764a118dcd4f8655a0e8c08f8b7d746418a83 100644 (file)
--- a/src/lib/asiodns/meson.build
+++ b/src/lib/asiodns/meson.build
@@ -18,8 +18,10 @@ if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-lib-asiodns-asiodns_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/asiodns_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/asiodns/asiodns_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index d7caf5d378ef20dcdbe7fe8153981d77e5c47ea1..5aa14e131988f3355057e466ea7cc9b35b093b6b 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -69,7 +69,8 @@ messages: config_messages.h config_messages.cc
        @echo Message files regenerated
 
 config_messages.h config_messages.cc: config_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/config/config_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/config/config_messages.mes)
 
 else
 

diff --git a/src/lib/config/config_messages.cc b/src/lib/config/config_messages.cc
index 8e36564403f50a8a5722b73fb23c771cb83c7ca4..6152b0f1a67ccbc9f0e0003d50767122934a453b 100644 (file)
--- a/src/lib/config/config_messages.cc
+++ b/src/lib/config/config_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/config/config_messages.mes
+// File created from src/lib/config/config_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/config/config_messages.h b/src/lib/config/config_messages.h
index c42b17d0b74247fc1a4120e68be353a165434eb2..3619abdea2cd86b62987c2d03d5618fe0eb9e0ca 100644 (file)
--- a/src/lib/config/config_messages.h
+++ b/src/lib/config/config_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/config/config_messages.mes
+// File created from src/lib/config/config_messages.mes
 
 #ifndef CONFIG_MESSAGES_H
 #define CONFIG_MESSAGES_H

diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build
index e409f77f11a41c4ce757e9b6b953985f88c91e11..6f64b8906d3cd99c869824357ecc9f6d42569f63 100644 (file)
--- a/src/lib/config/meson.build
+++ b/src/lib/config/meson.build
@@ -46,7 +46,12 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-config-config_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/config_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/config/config_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/d2srv/Makefile.am b/src/lib/d2srv/Makefile.am
index a00f45170f297b594fd2950532deee985b4f525e..e0cc21f52c651437cf9cbd91c88c7d643292d904 100644 (file)
--- a/src/lib/d2srv/Makefile.am
+++ b/src/lib/d2srv/Makefile.am
@@ -72,7 +72,8 @@ messages: d2_messages.h d2_messages.cc
        @echo Message files regenerated
 
 d2_messages.h d2_messages.cc: d2_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/d2srv/d2_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/d2srv/d2_messages.mes)
 
 else
 

diff --git a/src/lib/d2srv/d2_messages.cc b/src/lib/d2srv/d2_messages.cc
index d45ee2892b8cdb4f477ab18cac6a9946de7ba3c0..bd83429495f4b6e2321b7f28271945a9f57e9772 100644 (file)
--- a/src/lib/d2srv/d2_messages.cc
+++ b/src/lib/d2srv/d2_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/d2srv/d2_messages.mes
+// File created from src/lib/d2srv/d2_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/d2srv/d2_messages.h b/src/lib/d2srv/d2_messages.h
index c06490e6b506af8c1f0be7b3dad7b0150aeff0a0..22eade8928368bfe2e765dde83db433bb0ab2536 100644 (file)
--- a/src/lib/d2srv/d2_messages.h
+++ b/src/lib/d2srv/d2_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/d2srv/d2_messages.mes
+// File created from src/lib/d2srv/d2_messages.mes
 
 #ifndef D2_MESSAGES_H
 #define D2_MESSAGES_H

diff --git a/src/lib/d2srv/meson.build b/src/lib/d2srv/meson.build
index 3ffd92d40922c7143781619924a298fdaaae4b3f..dd7389c9a43428b9bedee98478dba009cec45f0a 100644 (file)
--- a/src/lib/d2srv/meson.build
+++ b/src/lib/d2srv/meson.build
@@ -39,7 +39,12 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-d2srv-d2_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/d2_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/d2srv/d2_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/database/Makefile.am b/src/lib/database/Makefile.am
index 5f09f5061715a92c1cbcbe8324d30acd0b64a2a3..027c7e55a0fe5a5b912aaeb9ef4ef573c69d749f 100644 (file)
--- a/src/lib/database/Makefile.am
+++ b/src/lib/database/Makefile.am
@@ -55,7 +55,8 @@ messages: db_messages.h db_messages.cc
        @echo Message files regenerated
 
 db_messages.h db_messages.cc: db_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/database/db_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/database/db_messages.mes)
 
 else
 

diff --git a/src/lib/database/db_messages.cc b/src/lib/database/db_messages.cc
index d3781b31e19426d95eaad0a7326feadaa2049d3e..3e76b0c5bb1c9de67e2198490eb30a0523e6b2d4 100644 (file)
--- a/src/lib/database/db_messages.cc
+++ b/src/lib/database/db_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/database/db_messages.mes
+// File created from src/lib/database/db_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/database/db_messages.h b/src/lib/database/db_messages.h
index bb6a059a620883015780bf9ef6e13258f098d940..aa5c299564218006ac1b048c23d158e25cbd0f21 100644 (file)
--- a/src/lib/database/db_messages.h
+++ b/src/lib/database/db_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/database/db_messages.mes
+// File created from src/lib/database/db_messages.mes
 
 #ifndef DB_MESSAGES_H
 #define DB_MESSAGES_H

diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build
index b4d758319ae86e891215c9583c61d56746ce716d..b81fd5e7381815883bff346f87b2f195758703fe 100644 (file)
--- a/src/lib/database/meson.build
+++ b/src/lib/database/meson.build
@@ -39,7 +39,12 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-database-db_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/db_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/database/db_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index 10e6e1583e6708b4a335af2726571a29d4b345b1..df89104e498a0e17cde283087a43aa3100bdc643 100644 (file)
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -59,7 +59,8 @@ messages: dhcp_ddns_messages.h dhcp_ddns_messages.cc
        @echo Message files regenerated
 
 dhcp_ddns_messages.h dhcp_ddns_messages.cc: dhcp_ddns_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/dhcp_ddns/dhcp_ddns_messages.mes)
 
 else
 

diff --git a/src/lib/dhcp_ddns/dhcp_ddns_messages.cc b/src/lib/dhcp_ddns/dhcp_ddns_messages.cc
index 2c440c930cffc9d331dcb3580c7c7b42b738c9e6..74b3e9d99ef2b4eedd364eb98dbd8b6f79004d7d 100644 (file)
--- a/src/lib/dhcp_ddns/dhcp_ddns_messages.cc
+++ b/src/lib/dhcp_ddns/dhcp_ddns_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcp_ddns/dhcp_ddns_messages.mes
+// File created from src/lib/dhcp_ddns/dhcp_ddns_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/dhcp_ddns/dhcp_ddns_messages.h b/src/lib/dhcp_ddns/dhcp_ddns_messages.h
index cb8594606a76ce38f26e3edb960cd5944ee57080..10c43622088886b78a111d467e316162dd86fd72 100644 (file)
--- a/src/lib/dhcp_ddns/dhcp_ddns_messages.h
+++ b/src/lib/dhcp_ddns/dhcp_ddns_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcp_ddns/dhcp_ddns_messages.mes
+// File created from src/lib/dhcp_ddns/dhcp_ddns_messages.mes
 
 #ifndef DHCP_DDNS_MESSAGES_H
 #define DHCP_DDNS_MESSAGES_H

diff --git a/src/lib/dhcp_ddns/meson.build b/src/lib/dhcp_ddns/meson.build
index 7b633b08d1ea9896f7b9c76dea2b5cdec1b582f0..84461b2a92429e9d498af3a90afbbb17b778f23f 100644 (file)
--- a/src/lib/dhcp_ddns/meson.build
+++ b/src/lib/dhcp_ddns/meson.build
@@ -30,8 +30,10 @@ if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-lib-dhcp_ddns-dhcp_ddns_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/dhcp_ddns_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/dhcp_ddns/dhcp_ddns_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index e74f02dcec8938e93dd88e29795881f01c128b94..ff74e78f0e60c59016ded4d75edbb03b6c1ff54f 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -238,16 +238,20 @@ messages: alloc_engine_messages.h alloc_engine_messages.cc \
        @echo Message files regenerated
 
 alloc_engine_messages.h alloc_engine_messages.cc: alloc_engine_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/dhcpsrv/alloc_engine_messages.mes)
 
 dhcpsrv_messages.h dhcpsrv_messages.cc: dhcpsrv_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/dhcpsrv/dhcpsrv_messages.mes)
 
 hosts_messages.h hosts_messages.cc: hosts_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/dhcpsrv/hosts_messages.mes)
 
 fuzz_messages.h fuzz_messages.cc: fuzz_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/fuzz_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/dhcpsrv/fuzz_messages.mes)
 
 else
 

diff --git a/src/lib/dhcpsrv/alloc_engine_messages.cc b/src/lib/dhcpsrv/alloc_engine_messages.cc
index dab647a0fafe4ab6dc3e7f265df4604b97db4542..3ef098908fa72dfe53bfbc9d6721dad0023a82d6 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine_messages.cc
+++ b/src/lib/dhcpsrv/alloc_engine_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/alloc_engine_messages.mes
+// File created from src/lib/dhcpsrv/alloc_engine_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/dhcpsrv/alloc_engine_messages.h b/src/lib/dhcpsrv/alloc_engine_messages.h
index 40bc79a388cd3ffcff1516eff680dc43052d9a33..9d9c132d5d6e513bc105247b3aa426b5e094eb96 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine_messages.h
+++ b/src/lib/dhcpsrv/alloc_engine_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/alloc_engine_messages.mes
+// File created from src/lib/dhcpsrv/alloc_engine_messages.mes
 
 #ifndef ALLOC_ENGINE_MESSAGES_H
 #define ALLOC_ENGINE_MESSAGES_H

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc
index a6d8f62d1ca1899364baf5c713791c95ff9ac183..7d51603726bb9e272edeabf9a2838c620f5df0c5 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes
+// File created from src/lib/dhcpsrv/dhcpsrv_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h
index 956c97924b75e8eb2e3c81e1e9d714c532de7686..c130961fa485cb55436413dd6dea10e3c6f22e3d 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.h
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes
+// File created from src/lib/dhcpsrv/dhcpsrv_messages.mes
 
 #ifndef DHCPSRV_MESSAGES_H
 #define DHCPSRV_MESSAGES_H

diff --git a/src/lib/dhcpsrv/fuzz_messages.cc b/src/lib/dhcpsrv/fuzz_messages.cc
index 66e878710bbf8df3a6a92ea291fb3fc9b98a88cc..6ec0cd31a6a19ee30f01f5ca52c83419bcf94298 100644 (file)
--- a/src/lib/dhcpsrv/fuzz_messages.cc
+++ b/src/lib/dhcpsrv/fuzz_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/fuzz_messages.mes
+// File created from src/lib/dhcpsrv/fuzz_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/dhcpsrv/fuzz_messages.h b/src/lib/dhcpsrv/fuzz_messages.h
index c9f9e12d717fc80b3cc979982231d095365f92b0..6d06ca73891a020a4c8a0c16b8c9db95541859af 100644 (file)
--- a/src/lib/dhcpsrv/fuzz_messages.h
+++ b/src/lib/dhcpsrv/fuzz_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/fuzz_messages.mes
+// File created from src/lib/dhcpsrv/fuzz_messages.mes
 
 #ifndef FUZZ_MESSAGES_H
 #define FUZZ_MESSAGES_H

diff --git a/src/lib/dhcpsrv/hosts_messages.cc b/src/lib/dhcpsrv/hosts_messages.cc
index edcd1f62cca5680d94010c4fcd17f773049d8677..7d04e4bfcc48102c256c0f59a4f2b96a166b5216 100644 (file)
--- a/src/lib/dhcpsrv/hosts_messages.cc
+++ b/src/lib/dhcpsrv/hosts_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes
+// File created from src/lib/dhcpsrv/hosts_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/dhcpsrv/hosts_messages.h b/src/lib/dhcpsrv/hosts_messages.h
index 63725bae67e083b9297490f55839ad3ea0ff8cf6..6427899ee84d7de44b7cac950928e66e989d0b2c 100644 (file)
--- a/src/lib/dhcpsrv/hosts_messages.h
+++ b/src/lib/dhcpsrv/hosts_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes
+// File created from src/lib/dhcpsrv/hosts_messages.mes
 
 #ifndef HOSTS_MESSAGES_H
 #define HOSTS_MESSAGES_H

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index e6cb3b05fc42c397dd7c4d00cf9536b0f154a280..44a5a97ce28c0388d9a34b7e5fe0e6a95d5a57c8 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -211,27 +211,41 @@ if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-lib-dhcpsrv-alloc_engine_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/alloc_engine_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/dhcpsrv/alloc_engine_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-lib-dhcpsrv-dhcpsrv_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/dhcpsrv_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/dhcpsrv/dhcpsrv_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-lib-dhcpsrv-hosts_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/hosts_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/dhcpsrv/hosts_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-lib-dhcpsrv-fuzz_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/fuzz_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/dhcpsrv/fuzz_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index c25a3eb3f86ff06d0b6b01888e03709d20542939..64feca1401f66b538f3576fad0c278c2da89a31d 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -61,7 +61,8 @@ messages: eval_messages.h eval_messages.cc
        @echo Message files regenerated
 
 eval_messages.h eval_messages.cc: eval_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/eval/eval_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/eval/eval_messages.mes)
 
 else
 

diff --git a/src/lib/eval/eval_messages.cc b/src/lib/eval/eval_messages.cc
index 5872f8ca3badd68ca6a7930b61c1582718761141..c3ccd6aa162b8abfaa7e163bf57a87b1c83bbfc8 100644 (file)
--- a/src/lib/eval/eval_messages.cc
+++ b/src/lib/eval/eval_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/eval/eval_messages.mes
+// File created from src/lib/eval/eval_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/eval/eval_messages.h b/src/lib/eval/eval_messages.h
index 41747f774385c1194dcd3bfa69c56a078c37118e..9c1c25c37c2420e1f5b4a16cbf3b32450a88a5bd 100644 (file)
--- a/src/lib/eval/eval_messages.h
+++ b/src/lib/eval/eval_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/eval/eval_messages.mes
+// File created from src/lib/eval/eval_messages.mes
 
 #ifndef EVAL_MESSAGES_H
 #define EVAL_MESSAGES_H

diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build
index def72b171cd82e628a8cd509bf59a7d1f54c2ef1..9b4452b1484563df9193241adc0283cd2f8ccbbf 100644 (file)
--- a/src/lib/eval/meson.build
+++ b/src/lib/eval/meson.build
@@ -31,7 +31,12 @@ current_source_dir = meson.current_source_dir()
 if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-lib-eval-eval_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/eval_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/eval/eval_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

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

diff --git a/src/lib/hooks/hooks_messages.cc b/src/lib/hooks/hooks_messages.cc
index dc75fb4a1baa343d4c932384178ca0fd983ba831..b06d563e0b669974348ff47e20329c57d988544d 100644 (file)
--- a/src/lib/hooks/hooks_messages.cc
+++ b/src/lib/hooks/hooks_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/hooks/hooks_messages.mes
+// File created from src/lib/hooks/hooks_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/hooks/hooks_messages.h b/src/lib/hooks/hooks_messages.h
index a80626c43e541a4d7263a33124ea3ae635bc8de3..f79e0943fa37029b744d5f726a7907eb177f5d66 100644 (file)
--- a/src/lib/hooks/hooks_messages.h
+++ b/src/lib/hooks/hooks_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/hooks/hooks_messages.mes
+// File created from src/lib/hooks/hooks_messages.mes
 
 #ifndef HOOKS_MESSAGES_H
 #define HOOKS_MESSAGES_H

diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build
index b156cf8aaa11385812b74e991da8d11027fc486a..e43fdcea889f2a3ff5ba8a66fd74ddd0a59415fa 100644 (file)
--- a/src/lib/hooks/meson.build
+++ b/src/lib/hooks/meson.build
@@ -45,7 +45,12 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-hooks-hooks_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/hooks_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/hooks/hooks_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am
index fafabb654d022c33077e182aa8b6c0b982b6f299..96258ed7985685f37dd5548c0f64d6631e171c96 100644 (file)
--- a/src/lib/http/Makefile.am
+++ b/src/lib/http/Makefile.am
@@ -84,10 +84,12 @@ messages: auth_messages.cc auth_messages.h http_messages.h http_messages.cc
        @echo Message files regenerated
 
 auth_messages.cc auth_messages.h: auth_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/http/auth_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/http/auth_messages.mes)
 
 http_messages.h http_messages.cc: http_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/http/http_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/http/http_messages.mes)
 
 else
 

diff --git a/src/lib/http/auth_messages.cc b/src/lib/http/auth_messages.cc
index ebf9da5bab645b4c0f5c75c986e50c5acd55f193..993ba8f9987106cb9b6e0c9b520d2a1163477993 100644 (file)
--- a/src/lib/http/auth_messages.cc
+++ b/src/lib/http/auth_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/http/auth_messages.mes
+// File created from src/lib/http/auth_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/http/auth_messages.h b/src/lib/http/auth_messages.h
index ff02ef529afc9d4c0fb6921a79f7bfd461644cb5..96dde53e06caca8a9744a68c00ed9adfd5306f9f 100644 (file)
--- a/src/lib/http/auth_messages.h
+++ b/src/lib/http/auth_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/http/auth_messages.mes
+// File created from src/lib/http/auth_messages.mes
 
 #ifndef AUTH_MESSAGES_H
 #define AUTH_MESSAGES_H

diff --git a/src/lib/http/http_messages.cc b/src/lib/http/http_messages.cc
index 965609c4d0a5f29042812e35ce55ff3b2c206332..72e5e1bf0c139f79a5dd84751144af9a425a0edd 100644 (file)
--- a/src/lib/http/http_messages.cc
+++ b/src/lib/http/http_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/http/http_messages.mes
+// File created from src/lib/http/http_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/http/http_messages.h b/src/lib/http/http_messages.h
index 48bc84f13ea3bcc4f097b58497c1d05bf5874d91..324735fad39c763962d1c0120fa4d624899cdd0a 100644 (file)
--- a/src/lib/http/http_messages.h
+++ b/src/lib/http/http_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/http/http_messages.mes
+// File created from src/lib/http/http_messages.mes
 
 #ifndef HTTP_MESSAGES_H
 #define HTTP_MESSAGES_H

diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build
index a412213498f7868f48d0448fd8aad0bea89003d8..b4c717ed6680ec569c1fe0c16e44cc748b1d44df 100644 (file)
--- a/src/lib/http/meson.build
+++ b/src/lib/http/meson.build
@@ -73,12 +73,22 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-http-auth_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/auth_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/http/auth_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-lib-http-http_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/http_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/http/http_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index 43917726f329399d768ed5dff5d497d19e6bfa81..a82178da268770b49c9e4fdf825ec60bf29ee041 100644 (file)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -107,15 +107,17 @@ messages: log_messages.cc log_messages.h logimpl_messages.cc logimpl_messages.h
 # If bootstrapping, do not generate log messages because there is nothing to generate them with.
 # A second make command or an explicit "make messages" command should do the job.
 log_messages.cc log_messages.h: log_messages.mes
-       @if test -f $(top_builddir)/src/lib/log/compiler/kea-msg-compiler; then \
-               $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/log_messages.mes; \
+       @if test -f $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler; then \
+               (cd $(top_srcdir); \
+               $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/log/log_messages.mes); \
        fi
 
 # If bootstrapping, do not generate log messages because there is nothing to generate them with.
 # A second make command or an explicit "make messages" command should do the job.
 logimpl_messages.cc logimpl_messages.h: logimpl_messages.mes
-       @if test -f $(top_builddir)/src/lib/log/compiler/kea-msg-compiler; then \
-               $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/logimpl_messages.mes; \
+       @if test -f $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler; then \
+               (cd $(top_srcdir); \
+               $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/log/logimpl_messages.mes); \
        fi
 
 else

diff --git a/src/lib/log/log_messages.cc b/src/lib/log/log_messages.cc
index 65d6bd8773f3bc3afa90932bc4fc6fc943d7b51a..fd29662ca0fae0c0227a944196e16f713889cc3f 100644 (file)
--- a/src/lib/log/log_messages.cc
+++ b/src/lib/log/log_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/log/log_messages.mes
+// File created from src/lib/log/log_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/log/log_messages.h b/src/lib/log/log_messages.h
index d8af641476b4c19501b49868d7a8dd76453594c8..8ac9dda348e63ba0058e366b80570e2eeb0a2bc7 100644 (file)
--- a/src/lib/log/log_messages.h
+++ b/src/lib/log/log_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/log/log_messages.mes
+// File created from src/lib/log/log_messages.mes
 
 #ifndef LOG_MESSAGES_H
 #define LOG_MESSAGES_H

diff --git a/src/lib/log/logimpl_messages.cc b/src/lib/log/logimpl_messages.cc
index 12a6442901fb64f7640799149a30a64a1cf5ae17..2c114c428e734668511edaf719561d4d2276516f 100644 (file)
--- a/src/lib/log/logimpl_messages.cc
+++ b/src/lib/log/logimpl_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/log/logimpl_messages.mes
+// File created from src/lib/log/logimpl_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/log/logimpl_messages.h b/src/lib/log/logimpl_messages.h
index e0813d67e8278e3fdad92e44ca9c88f88270741f..b1715d992190d6b79cd68647996db1a0a45090c2 100644 (file)
--- a/src/lib/log/logimpl_messages.h
+++ b/src/lib/log/logimpl_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/log/logimpl_messages.mes
+// File created from src/lib/log/logimpl_messages.mes
 
 #ifndef LOGIMPL_MESSAGES_H
 #define LOGIMPL_MESSAGES_H

diff --git a/src/lib/log/meson.build b/src/lib/log/meson.build
index b651712baf38a57fe486044f3d3445bfd0771e9d..4b4678460b75aca247aee2cf49e060dbe0798d76 100644 (file)
--- a/src/lib/log/meson.build
+++ b/src/lib/log/meson.build
@@ -59,14 +59,21 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-log-log_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/log_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/log/log_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
     target_gen_messages = run_target(
         'src-lib-log-logimpl_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/logimpl_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/log/logimpl_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 7d7d1e9ca3f754df7495bed482140f05743d7aa3..33134196ff897796e093e6012429659920ebbb24 100644 (file)
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -148,7 +148,8 @@ messages: log_test_messages.h log_test_messages.cc
        @echo Message files regenerated
 
 log_test_messages.h log_test_messages.cc: log_test_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/tests/log_test_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/log/tests/log_test_messages.mes)
 
 else
 

diff --git a/src/lib/log/tests/log_test_messages.cc b/src/lib/log/tests/log_test_messages.cc
index 5cb25ad9d8e704befca2063322ee8a3012977d34..79291274380c1163ae1d1ded76de1de32f44aed2 100644 (file)
--- a/src/lib/log/tests/log_test_messages.cc
+++ b/src/lib/log/tests/log_test_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../../src/lib/log/tests/log_test_messages.mes
+// File created from src/lib/log/tests/log_test_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/log/tests/log_test_messages.h b/src/lib/log/tests/log_test_messages.h
index 96553f545ab36dac6a84ac6df929eb95eaf342bb..a70c7b023d61a038815f83b8120cd12084bbe01e 100644 (file)
--- a/src/lib/log/tests/log_test_messages.h
+++ b/src/lib/log/tests/log_test_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../../src/lib/log/tests/log_test_messages.mes
+// File created from src/lib/log/tests/log_test_messages.mes
 
 #ifndef LOG_TEST_MESSAGES_H
 #define LOG_TEST_MESSAGES_H

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index 3bfe8b9f4b78cfa6b09f6bc7ba38856a9077051d..b15cae13020770853e7e19544d587294a998c443 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -95,8 +95,10 @@ if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-lib-log-tests-log_test_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/log_test_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/log/tests/log_test_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am
index 715e266a7414170bb0faacfb303d1830540e4ea5..8ed5ec84088dba38c155cfbfb3acd9b8af1c8d52 100644 (file)
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@ -69,7 +69,8 @@ messages: process_messages.h process_messages.cc
        @echo Message files regenerated
 
 process_messages.h process_messages.cc: process_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/process/process_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/process/process_messages.mes)
 
 else
 

diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build
index ba7ff1a3c7adac3ea3a69ef207100f82728c6689..422ed5618b9582c7dcea91e013244e76d0f7ed50 100644 (file)
--- a/src/lib/process/meson.build
+++ b/src/lib/process/meson.build
@@ -44,8 +44,10 @@ if HAS_KEA_MSG_COMPILER
     target_gen_messages = run_target(
         'src-lib-process-process_messages',
         command: [
-            kea_msg_compiler,
-            f'@current_source_dir@/process_messages.mes',
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/process/process_messages.mes',
         ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]

diff --git a/src/lib/process/process_messages.cc b/src/lib/process/process_messages.cc
index 8f5e42c9c160a38e220a285760323794056cf9d2..3f013b1a0b5d5e76e10800ee2d1adb74565bd277 100644 (file)
--- a/src/lib/process/process_messages.cc
+++ b/src/lib/process/process_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/process/process_messages.mes
+// File created from src/lib/process/process_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h
index f79e7db4d5d8e91f1f4f44ee4e1e7264ec5b37be..652dc704105b0b37ee8d203121f7c3c05a8902b5 100644 (file)
--- a/src/lib/process/process_messages.h
+++ b/src/lib/process/process_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/process/process_messages.mes
+// File created from src/lib/process/process_messages.mes
 
 #ifndef PROCESS_MESSAGES_H
 #define PROCESS_MESSAGES_H

diff --git a/src/lib/tcp/Makefile.am b/src/lib/tcp/Makefile.am
index 86623e8f66286146ecfabdf5b2e5526ef865ad8a..0d436e5910297f977e985f6769e39aab8c9c3ee6 100644 (file)
--- a/src/lib/tcp/Makefile.am
+++ b/src/lib/tcp/Makefile.am
@@ -58,7 +58,8 @@ messages: tcp_messages.h tcp_messages.cc
        @echo Message files regenerated
 
 tcp_messages.h tcp_messages.cc: tcp_messages.mes
-       $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/tcp/tcp_messages.mes
+       (cd $(top_srcdir); \
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/lib/tcp/tcp_messages.mes)
 
 else
 

diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build
index b6b95cf7cec3d0b133fe036fdcd29a204c5a75d3..554cda4dc7097f5023c7262df06b4c1217c23461 100644 (file)
--- a/src/lib/tcp/meson.build
+++ b/src/lib/tcp/meson.build
@@ -31,7 +31,12 @@ if HAS_KEA_MSG_COMPILER
     current_source_dir = meson.current_source_dir()
     target_gen_messages = run_target(
         'src-lib-tcp-tcp_messages',
-        command: [kea_msg_compiler, f'@current_source_dir@/tcp_messages.mes'],
+        command: [
+            CD_AND_RUN,
+            TOP_SOURCE_DIR,
+            KEA_MSG_COMPILER,
+            'src/lib/tcp/tcp_messages.mes',
+        ],
     )
     TARGETS_GEN_MESSAGES += [target_gen_messages]
 endif

diff --git a/src/lib/tcp/tcp_messages.cc b/src/lib/tcp/tcp_messages.cc
index 3dd0b4ea7c7b333be3bce27eab371275815f0db1..dd61eee9cf0084c3616878769028dc7ec7c8701e 100644 (file)
--- a/src/lib/tcp/tcp_messages.cc
+++ b/src/lib/tcp/tcp_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/tcp/tcp_messages.mes
+// File created from src/lib/tcp/tcp_messages.mes
 
 #include <cstddef>
 #include <log/message_types.h>

diff --git a/src/lib/tcp/tcp_messages.h b/src/lib/tcp/tcp_messages.h
index 2770c58556d06f7bbd797c4349a6ec3ea2428ba6..c7215dc3a6e2d21cf8f2b2d5f4988d0bae5b56f5 100644 (file)
--- a/src/lib/tcp/tcp_messages.h
+++ b/src/lib/tcp/tcp_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/tcp/tcp_messages.mes
+// File created from src/lib/tcp/tcp_messages.mes
 
 #ifndef TCP_MESSAGES_H
 #define TCP_MESSAGES_H