X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fautomake.mk;h=22c50d10af8cc804109da51e80c98375f4d33b15;hb=777af88d50b8271a8cc8f0a79d17022944481506;hp=47ca1b81f30bf45baa2a74d8547e41c559584ac5;hpb=e1ec7dd4608876283038c417065c4f9978255fa3;p=sliver-openvswitch.git

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index 47ca1b81f..22c50d10a 100644
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -5,8 +5,11 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without warranty of any kind.
 
-noinst_LIBRARIES += ofproto/libofproto.a
-ofproto_libofproto_a_SOURCES = \
+lib_LTLIBRARIES += ofproto/libofproto.la
+ofproto_libofproto_la_LDFLAGS = -release $(VERSION)
+ofproto_libofproto_la_SOURCES = \
+	ofproto/bond.c \
+	ofproto/bond.h \
 	ofproto/collectors.c \
 	ofproto/collectors.h \
 	ofproto/connmgr.c \
@@ -22,12 +25,14 @@ ofproto_libofproto_a_SOURCES = \
 	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-rid.c \
+	ofproto/ofproto-dpif-rid.h \
 	ofproto/ofproto-dpif-sflow.c \
 	ofproto/ofproto-dpif-sflow.h \
 	ofproto/ofproto-dpif-upcall.c \
@@ -40,11 +45,21 @@ ofproto_libofproto_a_SOURCES = \
 	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
+
 
 # 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
+ofproto_libofproto_la_SOURCES += ofproto/ipfix-entities.def
 
 BUILT_SOURCES += ofproto/ipfix-entities.def
 
@@ -56,4 +71,5 @@ MAN_FRAGMENTS += ofproto/ofproto-unixctl.man ofproto/ofproto-dpif-unixctl.man
 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 $< > $@
+	$(run_python) $(srcdir)/ofproto/ipfix-gen-entities $< > $@.tmp
+	mv $@.tmp $@