From cc6f0a06dd6e1291d80781fe2c95d0786fe6413e Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal <247110+sureshsundriyal@users.noreply.github.com> Date: Wed, 23 Sep 2020 13:55:21 -0700 Subject: [PATCH 1/2] [build] Add some explicit dependencies. This should fix the individual make targets. --- src/Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 63a061ec..955784a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -172,6 +172,17 @@ if HAVE_RE2C $(REC2_V)test $@ -ef $(srcdir)/$*.cc || cp $@ $(srcdir)/$*.cc endif +lnav_config.$(OBJEXT): default-config.h + +log_format_loader.$(OBJEXT): \ + builtin-scripts.h \ + builtin-sh-scripts.h \ + default-formats.h + +styling.$(OBJEXT): ansi-palette-json.h xterm-palette-json.h + +view_helpers.$(OBJEXT): help-txt.h + LNAV_BUILT_FILES = \ ansi-palette-json.h \ ansi-palette-json.c \ @@ -440,6 +451,8 @@ libdiag_a_SOURCES = \ xterm_mouse.cc \ spookyhash/SpookyV2.cpp +lnav.$(OBJEXT): help-txt.h init-sql.h + lnav_SOURCES = lnav.cc lnav_test_SOURCES = lnav.cc test_override.c From 3a9967cbf5d397ee852478a0e3a8c6649d2813b5 Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal <247110+sureshsundriyal@users.noreply.github.com> Date: Wed, 23 Sep 2020 16:00:56 -0700 Subject: [PATCH 2/2] [build] Get rid of BUILT_SOURCES --- src/Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 955784a9..1ff6bb0c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -365,11 +365,8 @@ noinst_HEADERS = \ fmtlib/fmt/posix.h \ fmtlib/fmt/format.h -BUILT_SOURCES = \ - $(LNAV_BUILT_FILES) - nodist_libdiag_a_SOURCES = \ - $(BUILT_SOURCES) + $(LNAV_BUILT_FILES) libdiag_a_SOURCES = \ ansi_scrubber.cc \ @@ -476,7 +473,7 @@ CLEANFILES = \ bin2c$(BUILD_EXEEXT) DISTCLEANFILES = \ - $(BUILT_SOURCES) \ + $(LNAV_BUILT_FILES) \ $(RE2C_FILES) uncrusty: