build: fix/improve clippy dependencies

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/common.am b/common.am
index e252b7429784e28cb5354ec0d766ffa14689fb0c..b115a871b9797d05b518a35f6a24b489ec07221e 100644 (file)
--- a/common.am
+++ b/common.am
@@ -8,9 +8,11 @@ am__v_CLIPPY_ = $(am__v_CLIPPY_$(AM_DEFAULT_VERBOSITY))
 am__v_CLIPPY_0 = @echo "  CLIPPY  " $@;
 am__v_CLIPPY_1 =
 
+CLIPPY_DEPS = $(HOSTTOOLS)lib/clippy $(top_srcdir)/python/clidef.py
+
 SUFFIXES = _clippy.c .proto .pb-c.c .pb-c.h .pb.h
 .c_clippy.c:
-       $(AM_V_at)$(MAKE) -C $(top_builddir)/$(HOSTTOOLS) lib/clippy
+       @{ test -x $(top_builddir)/$(HOSTTOOLS)lib/clippy || $(MAKE) -C $(top_builddir)/$(HOSTTOOLS) lib/clippy; }
        $(AM_V_CLIPPY)$(top_builddir)/$(HOSTTOOLS)lib/clippy $(top_srcdir)/python/clidef.py $< > $@.tmp
        @{ test -f $@ && diff $@.tmp $@ >/dev/null 2>/dev/null; } && rm $@.tmp || mv $@.tmp $@
 

diff --git a/lib/subdir.am b/lib/subdir.am
index a49781e18cdf9962ed4181d04854302420b24454..cc082a8e8594c6d131db5b0a6487f517a5bbaa58 100644 (file)
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -73,6 +73,7 @@ lib_libfrr_la_SOURCES = \
        lib/zclient.c \
        # end
 
+lib/plist_clippy.c: $(CLIPPY_DEPS)
 lib/plist.lo: lib/plist_clippy.c
 
 pkginclude_HEADERS += \
@@ -220,12 +221,18 @@ BUILT_SOURCES += \
        lib/route_types.h \
        # end
 
+## force route_types.h
+$(lib_clippy_OBJECTS): lib/route_types.h
+$(lib_libfrr_la_OBJECTS): lib/route_types.h
+
 AM_YFLAGS = -d -Dapi.prefix=@BISON_OPENBRACE@cmd_yy@BISON_CLOSEBRACE@ @BISON_VERBOSE@
 
 lib/command_lex.h: lib/command_lex.c
        @if test ! -f $@; then rm -f "lib/command_lex.c"; else :; fi
        @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) "lib/command_lex.c"; else :; fi
+lib/command_lex.lo: lib/command_parse.h
 lib/command_parse.lo: lib/command_lex.h
+lib/lib_clippy-command_lex.$(OBJEXT): lib/command_parse.h
 lib/lib_clippy-command_parse.$(OBJEXT): lib/command_lex.h
 
 lib/route_types.h: $(top_srcdir)/lib/route_types.txt $(top_srcdir)/lib/route_types.pl

diff --git a/zebra/subdir.am b/zebra/subdir.am
index 546da3cf25232f6305ad00b603347e133d6dc38f..ceffa863e97f5c1bd1ed148bd32b750cba4ceeea 100644 (file)
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -66,6 +66,7 @@ zebra_zebra_SOURCES = \
        zebra/zserv.c \
        # end
 
+zebra/zebra_vty_clippy.c: $(CLIPPY_DEPS)
 zebra/zebra_vty.$(OBJEXT): zebra/zebra_vty_clippy.c
 
 noinst_HEADERS += \