ofproto: Move bond files to ofproto

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

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index df83aef..218a5b1 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -7,6 +7,8 @@
 
 noinst_LIBRARIES += ofproto/libofproto.a
 ofproto_libofproto_a_SOURCES = \
+       ofproto/bond.c \
+       ofproto/bond.h \
        ofproto/collectors.c \
        ofproto/collectors.h \
        ofproto/connmgr.c \
@@ -21,12 +23,41 @@ 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 \
        ofproto/pinsched.c \
-       ofproto/pinsched.h
+       ofproto/pinsched.h \
+       ofproto/tunnel.c \
+       ofproto/tunnel.h
 
-EXTRA_DIST += ofproto/ofproto-unixctl.man
+# 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 $< > $@