Skip to content

Commit 0f71c39

Browse files
committed
[#1743] fix circular dependency in src/lib/log
Fixes the problem where to generate log_messages.(cc|h), you need kea-msg-compiler, but to compile kea-msg-compiler you need log_messages.(cc|h). This halted compilation even when building from scratch. Simply only regenerate log_messages.(cc|h) only if kea-msg-compiler exists. It will not regenerate the files on first pass, but one can explicitly call `make messages -C src/lib/log` afterwards to regenerate the files.
1 parent 809f8ad commit 0f71c39

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/lib/log/Makefile.am

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,19 @@ if GENERATE_MESSAGES
104104
messages: log_messages.cc log_messages.h logimpl_messages.cc logimpl_messages.h
105105
@echo Message files regenerated
106106

107+
# If bootstrapping, do not generate log messages because there is nothing to generate them with.
108+
# A second make command or an explicit "make messages" command should do the job.
107109
log_messages.cc log_messages.h: log_messages.mes
108-
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/log_messages.mes
110+
@if test -f $(top_builddir)/src/lib/log/compiler/kea-msg-compiler; then \
111+
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/log_messages.mes; \
112+
fi
109113

114+
# If bootstrapping, do not generate log messages because there is nothing to generate them with.
115+
# A second make command or an explicit "make messages" command should do the job.
110116
logimpl_messages.cc logimpl_messages.h: logimpl_messages.mes
111-
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/logimpl_messages.mes
117+
@if test -f $(top_builddir)/src/lib/log/compiler/kea-msg-compiler; then \
118+
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/logimpl_messages.mes; \
119+
fi
112120

113121
else
114122

0 commit comments

Comments
 (0)