netdev-dpdk: fix mbuf leaks

[cascardo/ovs.git] / ofproto / automake.mk

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index 1308820..7486f2b 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2014, 2016 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -6,7 +6,10 @@
 # without warranty of any kind.
 
 lib_LTLIBRARIES += ofproto/libofproto.la
-ofproto_libofproto_la_LDFLAGS = -release $(VERSION)
+ofproto_libofproto_la_LDFLAGS = \
+        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+        -Wl,--version-script=$(top_builddir)/ofproto/libofproto.sym \
+        $(AM_LDFLAGS)
 ofproto_libofproto_la_SOURCES = \
        ofproto/bond.c \
        ofproto/bond.h \
@@ -31,6 +34,8 @@ ofproto_libofproto_la_SOURCES = \
        ofproto/ofproto-dpif-mirror.h \
        ofproto/ofproto-dpif-monitor.c \
        ofproto/ofproto-dpif-monitor.h \
+       ofproto/ofproto-dpif-rid.c \
+       ofproto/ofproto-dpif-rid.h \
        ofproto/ofproto-dpif-sflow.c \
        ofproto/ofproto-dpif-sflow.h \
        ofproto/ofproto-dpif-upcall.c \
@@ -38,15 +43,22 @@ ofproto_libofproto_la_SOURCES = \
        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/tunnel.c \
-       ofproto/tunnel.h
+       ofproto/tunnel.h \
+       ofproto/bundles.c \
+       ofproto/bundles.h
+
 ofproto_libofproto_la_CPPFLAGS = $(AM_CPPFLAGS)
 ofproto_libofproto_la_CFLAGS = $(AM_CFLAGS)
 ofproto_libofproto_la_LIBADD = lib/libsflow.la
+if WIN32
+ofproto_libofproto_la_LIBADD += ${PTHREAD_LIBS}
+endif
+
+pkgconfig_DATA += \
+       $(srcdir)/ofproto/libofproto.pc
 
 # Distribute this generated file in order not to require Python at
 # build time if ofproto/ipfix.xml is not modified.
@@ -56,11 +68,17 @@ BUILT_SOURCES += ofproto/ipfix-entities.def
 
 CLEANFILES += ofproto/ipfix-entities.def
 
-MAN_FRAGMENTS += ofproto/ofproto-unixctl.man ofproto/ofproto-dpif-unixctl.man
+MAN_FRAGMENTS += ofproto/ofproto-unixctl.man ofproto/ofproto-dpif-unixctl.man \
+                ofproto/ofproto-tnl-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 $< > $@.tmp
+       $(AM_V_GEN)$(run_python) $(srcdir)/ofproto/ipfix-gen-entities $< > $@.tmp && \
        mv $@.tmp $@
+
+# IPFIX enterprise entity definition macros.
+EXTRA_DIST += ofproto/ipfix-enterprise-entities.def
+
+FLAKE8_PYFILES += ofproto/ipfix-gen-entities