datapath: Change dp_idx to dp_ifindex, the ifindex of the local port.

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

diff --git a/lib/automake.mk b/lib/automake.mk
index a23a569..c51d3ed 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
@@ -68,6 +68,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/lockfile.h \
        lib/mac-learning.c \
        lib/mac-learning.h \
+       lib/multipath.c \
+       lib/multipath.h \
        lib/netdev-dummy.c \
        lib/netdev-provider.h \
        lib/netdev.c \
@@ -79,6 +81,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 \
@@ -180,6 +184,7 @@ endif
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
        lib/dpif-linux.c \
+       lib/dpif-linux.h \
        lib/netdev-linux.c \
        lib/netdev-vport.c \
        lib/netdev-vport.h \
@@ -187,7 +192,11 @@ lib_libopenvswitch_a_SOURCES += \
        lib/netlink-socket.c \
        lib/netlink-socket.h \
        lib/rtnetlink.c \
-       lib/rtnetlink.h
+       lib/rtnetlink.h \
+       lib/rtnetlink-link.c \
+       lib/rtnetlink-link.h \
+       lib/route-table.c \
+       lib/route-table.h
 endif
 
 if HAVE_OPENSSL
@@ -213,7 +222,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 \
@@ -239,6 +247,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)