X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=d55465bb60d0e51d5c6a7a3d7328ff5ff1f7a518;hb=2fad9ebd12e03a4be9d6f0227b32242287a8bec2;hp=5da1971e42bd718c230121ee0a05476ed4034cf0;hpb=71d7c22f54ae32d15133571e09ddf7ab435e8afa;p=sliver-openvswitch.git

diff --git a/lib/automake.mk b/lib/automake.mk
index 5da1971e4..d55465bb6 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -10,10 +10,16 @@ noinst_LIBRARIES += lib/libopenvswitch.a
 lib_libopenvswitch_a_SOURCES = \
 	lib/aes128.c \
 	lib/aes128.h \
+	lib/autopath.c \
+	lib/autopath.h \
 	lib/backtrace.c \
 	lib/backtrace.h \
 	lib/bitmap.c \
 	lib/bitmap.h \
+	lib/bond.c \
+	lib/bond.h \
+	lib/bundle.c \
+	lib/bundle.h \
 	lib/byte-order.h \
 	lib/byteq.c \
 	lib/byteq.h \
@@ -30,12 +36,9 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/csum.h \
 	lib/daemon.c \
 	lib/daemon.h \
+	lib/dhcp.h \
 	lib/dummy.c \
 	lib/dummy.h \
-	lib/dhcp-client.c \
-	lib/dhcp-client.h \
-	lib/dhcp.c \
-	lib/dhcp.h \
 	lib/dhparams.h \
 	lib/dirs.h \
 	lib/dpif-netdev.c \
@@ -54,10 +57,14 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/hash.h \
 	lib/hmap.c \
 	lib/hmap.h \
+	lib/hmapx.c \
+	lib/hmapx.h \
 	lib/json.c \
 	lib/json.h \
 	lib/jsonrpc.c \
 	lib/jsonrpc.h \
+	lib/lacp.c \
+	lib/lacp.h \
 	lib/leak-checker.c \
 	lib/leak-checker.h \
 	lib/learning-switch.c \
@@ -127,6 +134,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/socket-util.h \
 	lib/sort.c \
 	lib/sort.h \
+	lib/sset.c \
+	lib/sset.h \
 	lib/stream-fd.c \
 	lib/stream-fd.h \
 	lib/stream-provider.h \
@@ -145,6 +154,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/table.h \
 	lib/tag.c \
 	lib/tag.h \
+	lib/timer.c \
+	lib/timer.h \
 	lib/timeval.c \
 	lib/timeval.h \
 	lib/type-props.h \
@@ -162,6 +173,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/vconn-stream.c \
 	lib/vconn.c \
 	lib/vconn.h \
+	lib/vlan-bitmap.c \
+	lib/vlan-bitmap.h \
 	lib/vlog.c \
 	lib/vlog.h
 nodist_lib_libopenvswitch_a_SOURCES = \
@@ -189,6 +202,7 @@ lib_libopenvswitch_a_SOURCES += \
 	lib/dpif-linux.c \
 	lib/dpif-linux.h \
 	lib/netdev-linux.c \
+	lib/netdev-linux.h \
 	lib/netdev-vport.c \
 	lib/netdev-vport.h \
 	lib/netlink-protocol.h \
@@ -212,6 +226,8 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
 	 openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout)	\
 	| sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp
 	mv lib/dhparams.c.tmp lib/dhparams.c
+else
+lib_libopenvswitch_a_SOURCES += lib/stream-nossl.c
 endif
 
 EXTRA_DIST += \
@@ -247,6 +263,7 @@ lib/dirs.c: lib/dirs.c.in Makefile
 		-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
 		-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
 		-e 's,[@]bindir[@],"$(bindir)",g' \
+		-e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
 		-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
 	     > lib/dirs.c.tmp
 	mv lib/dirs.c.tmp lib/dirs.c
@@ -259,7 +276,7 @@ $(srcdir)/lib/ofp-errors.c: \
 		openflow/openflow.h openflow/nicira-ext.h > ../lib/ofp-errors.c
 EXTRA_DIST += build-aux/extract-ofp-errors
 
-install-data-local: lib-install-data-local
+INSTALL_DATA_LOCAL += lib-install-data-local
 lib-install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(RUNDIR)
 	$(MKDIR_P) $(DESTDIR)$(PKIDIR)