Merge branch 'mainstream'

[sliver-openvswitch.git] / ofproto / automake.mk

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index 69f014f..432f083 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -21,10 +21,21 @@ ofproto_libofproto_a_SOURCES = \
        ofproto/ofproto.c \
        ofproto/ofproto.h \
        ofproto/ofproto-dpif.c \
+       ofproto/ofproto-dpif.h \
        ofproto/ofproto-dpif-governor.c \
        ofproto/ofproto-dpif-governor.h \
+       ofproto/ofproto-dpif-ipfix.c \
+       ofproto/ofproto-dpif-ipfix.h \
+       ofproto/ofproto-dpif-mirror.c \
+       ofproto/ofproto-dpif-mirror.h \
+       ofproto/ofproto-dpif-monitor.c \
+       ofproto/ofproto-dpif-monitor.h \
        ofproto/ofproto-dpif-sflow.c \
        ofproto/ofproto-dpif-sflow.h \
+       ofproto/ofproto-dpif-upcall.c \
+       ofproto/ofproto-dpif-upcall.h \
+       ofproto/ofproto-dpif-xlate.c \
+       ofproto/ofproto-dpif-xlate.h \
        ofproto/ofproto-provider.h \
        ofproto/pktbuf.c \
        ofproto/pktbuf.h \
@@ -33,4 +44,18 @@ ofproto_libofproto_a_SOURCES = \
        ofproto/tunnel.c \
        ofproto/tunnel.h
 
+# Distribute this generated file in order not to require Python at
+# build time if ofproto/ipfix.xml is not modified.
+ofproto_libofproto_a_SOURCES += ofproto/ipfix-entities.def
+
+BUILT_SOURCES += ofproto/ipfix-entities.def
+
+CLEANFILES += ofproto/ipfix-entities.def
+
 MAN_FRAGMENTS += ofproto/ofproto-unixctl.man ofproto/ofproto-dpif-unixctl.man
+
+# IPFIX entity definition macros generation from IANA's XML definition.
+EXTRA_DIST += ofproto/ipfix.xml
+dist_noinst_SCRIPTS = ofproto/ipfix-gen-entities
+ofproto/ipfix-entities.def: ofproto/ipfix.xml ofproto/ipfix-gen-entities
+       $(run_python) $(srcdir)/ofproto/ipfix-gen-entities $< > $@