lib: Add const to _count() in new list APIs

[mirror_frr.git] / lib / subdir.am

diff --git a/lib/subdir.am b/lib/subdir.am
index 50ff1feeccf708f52640ba678e2500eb136fbdd1..aa89622028a881434489ee995c545af7544771c2 100644 (file)
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -3,7 +3,7 @@
 #
 lib_LTLIBRARIES += lib/libfrr.la
 lib_libfrr_la_LDFLAGS = -version-info 0:0:0 -Xlinker -e_libfrr_version
-lib_libfrr_la_LIBADD = $(LIBCAP) $(UNWIND_LIBS) $(LIBYANG_LIBS) $(LUA_LIB)
+lib_libfrr_la_LIBADD = $(LIBCAP) $(UNWIND_LIBS) $(LIBYANG_LIBS) $(LUA_LIB) $(LIBM)
 
 lib_libfrr_la_SOURCES = \
        lib/agg_table.c \
@@ -42,6 +42,7 @@ lib_libfrr_la_SOURCES = \
        lib/libfrr.c \
        lib/linklist.c \
        lib/log.c \
+       lib/log_vty.c \
        lib/md5.c \
        lib/memory.c \
        lib/memory_vty.c \
@@ -56,6 +57,7 @@ lib_libfrr_la_SOURCES = \
        lib/northbound.c \
        lib/northbound_cli.c \
        lib/northbound_db.c \
+       lib/ntop.c \
        lib/openbsd-tree.c \
        lib/pid_output.c \
        lib/plist.c \
@@ -136,6 +138,8 @@ lib/northbound_cli_clippy.c: $(CLIPPY_DEPS)
 lib/northbound_cli.lo: lib/northbound_cli_clippy.c
 lib/vty_clippy.c: $(CLIPPY_DEPS)
 lib/vty.lo: lib/vty_clippy.c
+lib/log_vty_clippy.c: $(CLIPPY_DEPS)
+lib/log_vty.lo: lib/log_vty_clippy.c
 
 pkginclude_HEADERS += \
        lib/agg_table.h \
@@ -164,6 +168,7 @@ pkginclude_HEADERS += \
        lib/graph.h \
        lib/hash.h \
        lib/hook.h \
+       lib/iana_afi.h \
        lib/id_alloc.h \
        lib/if.h \
        lib/if_rmap.h \
@@ -177,6 +182,7 @@ pkginclude_HEADERS += \
        lib/libospf.h \
        lib/linklist.h \
        lib/log.h \
+       lib/log_vty.h \
        lib/md5.h \
        lib/memory.h \
        lib/memory_vty.h \
@@ -186,6 +192,7 @@ pkginclude_HEADERS += \
        lib/network.h \
        lib/nexthop.h \
        lib/nexthop_group.h \
+       lib/nexthop_group_private.h \
        lib/northbound.h \
        lib/northbound_cli.h \
        lib/northbound_db.h \
@@ -278,6 +285,21 @@ lib_libfrrsnmp_la_SOURCES = \
        lib/snmp.c \
        # end
 
+#
+# c-ares support
+#
+if CARES
+lib_LTLIBRARIES += lib/libfrrcares.la
+pkginclude_HEADERS += lib/resolver.h
+endif
+
+lib_libfrrcares_la_CFLAGS = $(WERROR) $(CARES_CFLAGS)
+lib_libfrrcares_la_LDFLAGS = -version-info 0:0:0
+lib_libfrrcares_la_LIBADD = $(CARES_LIBS)
+lib_libfrrcares_la_SOURCES = \
+       lib/resolver.c \
+       #end
+
 #
 # ZeroMQ support
 #
@@ -339,8 +361,10 @@ noinst_PROGRAMS += \
 if BUILD_CLIPPY
 noinst_PROGRAMS += lib/clippy
 else
-$(HOSTTOOLS)lib/clippy:
-       @$(MAKE) -C $(top_builddir)/$(HOSTTOOLS) lib/route_types.h lib/clippy
+if HOSTTOOLS_CLIPPY
+$(CLIPPY):
+       @$(MAKE) -C $(top_builddir)/hosttools lib/route_types.h lib/clippy
+endif
 endif
 
 lib_grammar_sandbox_SOURCES = \
@@ -371,13 +395,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
+CLIPPY_DEPS = $(CLIPPY) $(top_srcdir)/python/clidef.py
 
 SUFFIXES = _clippy.c .proto .pb-c.c .pb-c.h .pb.h .pb.cc .grpc.pb.cc
 .c_clippy.c:
-       @{ 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 -o $@ $<
+       $(AM_V_CLIPPY) $(CLIPPY) $(top_srcdir)/python/clidef.py -o $@ $<
 
 ## automake's "ylwrap" is a great piece of GNU software... not.
 .l.c: