ripd: adapt to new YANG NB if_rmap conversion

[mirror_frr.git] / ripd / subdir.am

diff --git a/ripd/subdir.am b/ripd/subdir.am
index 8de0fc4b5a10d2dbb3f03b34f8a8a88456d62237..98cc765c91cfb559d5dd6a22a663a104c653e492 100644 (file)
--- a/ripd/subdir.am
+++ b/ripd/subdir.am
@@ -3,13 +3,7 @@
 #
 
 if RIPD
-noinst_LIBRARIES += ripd/librip.a
 sbin_PROGRAMS += ripd/ripd
-vtysh_scan += \
-       ripd/rip_cli.c \
-       ripd/rip_debug.c \
-       ripd/ripd.c \
-       # end
 vtysh_daemons += ripd
 
 if SNMP
@@ -18,12 +12,13 @@ endif
 man8 += $(MANBUILD)/frr-ripd.8
 endif
 
-ripd_librip_a_SOURCES = \
+ripd_ripd_SOURCES = \
        ripd/rip_cli.c \
        ripd/rip_debug.c \
        ripd/rip_errors.c \
        ripd/rip_interface.c \
        ripd/rip_offset.c \
+       ripd/rip_main.c \
        ripd/rip_nb.c \
        ripd/rip_nb_config.c \
        ripd/rip_nb_rpcs.c \
@@ -47,15 +42,12 @@ noinst_HEADERS += \
        ripd/ripd.h \
        # end
 
-ripd_ripd_LDADD = ripd/librip.a lib/libfrr.la $(LIBCAP)
-ripd_ripd_SOURCES = \
-       ripd/rip_main.c \
-       # end
+ripd_ripd_LDADD = lib/libfrr.la $(LIBCAP)
 nodist_ripd_ripd_SOURCES = \
        yang/frr-ripd.yang.c \
        # end
 
 ripd_ripd_snmp_la_SOURCES = ripd/rip_snmp.c
 ripd_ripd_snmp_la_CFLAGS = $(AM_CFLAGS) $(SNMP_CFLAGS) -std=gnu11
-ripd_ripd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+ripd_ripd_snmp_la_LDFLAGS = $(MODULE_LDFLAGS)
 ripd_ripd_snmp_la_LIBADD = lib/libfrrsnmp.la