Merge 'master' into 'next'.

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

diff --git a/lib/automake.mk b/lib/automake.mk
index 4c6a877..8c97100 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -10,10 +10,14 @@ 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/byte-order.h \
        lib/byteq.c \
        lib/byteq.h \
@@ -30,12 +34,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 +55,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 \
@@ -81,6 +86,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/nx-match.h \
        lib/odp-util.c \
        lib/odp-util.h \
+       lib/ofp-errors.c \
+       lib/ofp-errors.h \
        lib/ofp-parse.c \
        lib/ofp-parse.h \
        lib/ofp-print.c \
@@ -125,6 +132,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 \
@@ -135,11 +144,16 @@ lib_libopenvswitch_a_SOURCES = \
        lib/stream.h \
        lib/stress.c \
        lib/stress.h \
+       lib/string.c \
        lib/string.h \
        lib/svec.c \
        lib/svec.h \
+       lib/table.c \
+       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 \
@@ -157,6 +171,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 = \
@@ -182,7 +198,9 @@ endif
 if HAVE_NETLINK
 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 \
@@ -191,7 +209,9 @@ lib_libopenvswitch_a_SOURCES += \
        lib/rtnetlink.c \
        lib/rtnetlink.h \
        lib/rtnetlink-link.c \
-       lib/rtnetlink-link.h
+       lib/rtnetlink-link.h \
+       lib/route-table.c \
+       lib/route-table.h
 endif
 
 if HAVE_OPENSSL
@@ -204,6 +224,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 += \
@@ -217,7 +239,6 @@ EXTRA_DIST += \
        lib/common-syn.man \
        lib/daemon.man \
        lib/daemon-syn.man \
-       lib/dpif.man \
        lib/leak-checker.man \
        lib/ssl-bootstrap.man \
        lib/ssl-bootstrap-syn.man \
@@ -225,6 +246,7 @@ EXTRA_DIST += \
        lib/ssl.man \
        lib/ssl-syn.man \
        lib/stress-unixctl.man \
+       lib/table.man \
        lib/unixctl.man \
        lib/unixctl-syn.man \
        lib/vconn-active.man \
@@ -243,6 +265,14 @@ lib/dirs.c: lib/dirs.c.in Makefile
             > lib/dirs.c.tmp
        mv lib/dirs.c.tmp lib/dirs.c
 
+$(srcdir)/lib/ofp-errors.c: \
+       include/openflow/openflow.h include/openflow/nicira-ext.h \
+       build-aux/extract-ofp-errors
+       cd $(srcdir)/include && \
+       $(PYTHON) ../build-aux/extract-ofp-errors \
+               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
 lib-install-data-local:
        $(MKDIR_P) $(DESTDIR)$(RUNDIR)