build: non-recursive pimd

Signed-off-by: David Lamparter <[email protected]>

Makefile.am

@@ -51,16 +51,16 @@ include nhrpd/subdir.am
 include ldpd/subdir.am
 include babeld/subdir.am
 include eigrpd/subdir.am
+include pimd/subdir.am
 
 SUBDIRS = . @LIBRFP@ @RFPTEST@ \
 	 @BGPD@ \
-         @PIMD@ \
 	 @VTYSH@ @DOC@ \
          @SOLARIS@ tests
 
 DIST_SUBDIRS = . bgpd \
 	  vtysh doc tests \
-	  solaris pimd bgpd/rfp-example/librfp \
+	  solaris bgpd/rfp-example/librfp \
 	  bgpd/rfp-example/rfptest \
 	  # end
 

configure.ac

@@ -1298,12 +1298,7 @@ AM_CONDITIONAL(RIPNGD, test "${enable_ripngd}" != "no")
 AM_CONDITIONAL(BABELD, test "${enable_babeld}" != "no")
 AM_CONDITIONAL(OSPF6D, test "${enable_ospf6d}" != "no")
 AM_CONDITIONAL(ISISD, test "${enable_isisd}" != "no")
-
-case "${enable_pimd}" in
-  "no" ) PIMD="";;
-  *    ) PIMD="pimd";;
-esac
-AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd")
+AM_CONDITIONAL(PIMD, test "${enable_pimd}" != "no")
 
 if test "${enable_bgp_announce}" = "no";then
   AC_DEFINE(DISABLE_BGP_ANNOUNCE,1,Disable BGP installation to zebra)
@@ -1337,7 +1332,6 @@ AC_SUBST(RFPTEST)
 AC_SUBST(LIBRFP)
 AC_SUBST(RFPINC)
 AC_SUBST(BGPD)
-AC_SUBST(PIMD)
 AC_SUBST(SOLARIS)
 AC_SUBST(VTYSH)
 AC_SUBST(CURSES)
@@ -1814,7 +1808,6 @@ AC_CONFIG_FILES([Makefile
 	  vtysh/Makefile
 	  doc/Makefile tests/Makefile
 	  bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile
-	  pimd/Makefile
 	  redhat/frr.spec
 	  snapcraft/snapcraft.yaml
 	  lib/version.h

pimd/.gitignore

@@ -1,4 +1,4 @@
-Makefile
+!Makefile
 Makefile.in
 libpim.a
 pimd

pimd/Makefile

@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. pimd/pimd
+%: ALWAYS
+	@$(MAKE) -s -C .. pimd/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:

pimd/pimd.h

@@ -40,6 +40,8 @@
 #define PIM_IP_PROTO_PIM              (103)
 #define PIM_IGMP_MIN_LEN              (8)
 
+#define PIM_ENFORCE_LOOPFREE_MFC
+
 /*
  * PIM MSG Header Format
  *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

pimd/subdir.am

@@ -0,0 +1,110 @@
+#
+# pimd
+#
+
+if PIMD
+noinst_LIBRARIES += pimd/libpim.a
+sbin_PROGRAMS += pimd/pimd
+noinst_PROGRAMS += pimd/test_igmpv3_join
+dist_examples_DATA += pimd/pimd.conf.sample
+endif
+
+pimd_libpim_a_SOURCES = \
+	pimd/pim_assert.c \
+	pimd/pim_bfd.c \
+	pimd/pim_br.c \
+	pimd/pim_cmd.c \
+	pimd/pim_hello.c \
+	pimd/pim_iface.c \
+	pimd/pim_ifchannel.c \
+	pimd/pim_igmp.c \
+	pimd/pim_igmpv2.c \
+	pimd/pim_igmpv3.c \
+	pimd/pim_instance.c \
+	pimd/pim_int.c \
+	pimd/pim_join.c \
+	pimd/pim_jp_agg.c \
+	pimd/pim_macro.c \
+	pimd/pim_memory.c \
+	pimd/pim_mroute.c \
+	pimd/pim_msdp.c \
+	pimd/pim_msdp_packet.c \
+	pimd/pim_msdp_socket.c \
+	pimd/pim_msg.c \
+	pimd/pim_neighbor.c \
+	pimd/pim_nht.c \
+	pimd/pim_oil.c \
+	pimd/pim_pim.c \
+	pimd/pim_register.c \
+	pimd/pim_routemap.c \
+	pimd/pim_rp.c \
+	pimd/pim_rpf.c \
+	pimd/pim_signals.c \
+	pimd/pim_sock.c \
+	pimd/pim_ssm.c \
+	pimd/pim_ssmpingd.c \
+	pimd/pim_static.c \
+	pimd/pim_str.c \
+	pimd/pim_time.c \
+	pimd/pim_tlv.c \
+	pimd/pim_upstream.c \
+	pimd/pim_util.c \
+	pimd/pim_version.c \
+	pimd/pim_vty.c \
+	pimd/pim_zebra.c \
+	pimd/pim_zlookup.c \
+	pimd/pimd.c \
+	# end
+
+noinst_HEADERS += \
+	pimd/pim_assert.h \
+	pimd/pim_bfd.h \
+	pimd/pim_br.h \
+	pimd/pim_cmd.h \
+	pimd/pim_hello.h \
+	pimd/pim_iface.h \
+	pimd/pim_ifchannel.h \
+	pimd/pim_igmp.h \
+	pimd/pim_igmp_join.h \
+	pimd/pim_igmpv2.h \
+	pimd/pim_igmpv3.h \
+	pimd/pim_instance.h \
+	pimd/pim_int.h \
+	pimd/pim_join.h \
+	pimd/pim_jp_agg.h \
+	pimd/pim_macro.h \
+	pimd/pim_memory.h \
+	pimd/pim_mroute.h \
+	pimd/pim_msdp.h \
+	pimd/pim_msdp_packet.h \
+	pimd/pim_msdp_socket.h \
+	pimd/pim_msg.h \
+	pimd/pim_neighbor.h \
+	pimd/pim_nht.h \
+	pimd/pim_oil.h \
+	pimd/pim_pim.h \
+	pimd/pim_register.h \
+	pimd/pim_rp.h \
+	pimd/pim_rpf.h \
+	pimd/pim_signals.h \
+	pimd/pim_sock.h \
+	pimd/pim_ssm.h \
+	pimd/pim_ssmpingd.h \
+	pimd/pim_static.h \
+	pimd/pim_str.h \
+	pimd/pim_time.h \
+	pimd/pim_tlv.h \
+	pimd/pim_upstream.h \
+	pimd/pim_util.h \
+	pimd/pim_version.h \
+	pimd/pim_vty.h \
+	pimd/pim_zebra.h \
+	pimd/pim_zlookup.h \
+	pimd/pimd.h \
+	# end
+
+pimd_pimd_LDADD = pimd/libpim.a lib/libfrr.la @LIBCAP@
+pimd_pimd_SOURCES = pimd/pim_main.c
+
+pimd_test_igmpv3_join_LDADD = lib/libfrr.la
+pimd_test_igmpv3_join_SOURCES = pimd/test_igmpv3_join.c