lib: Rename rtnetlink.[ch] files.

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

diff --git a/lib/automake.mk b/lib/automake.mk
index 7c1977f..de2b635 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -18,6 +18,8 @@ lib_libopenvswitch_a_SOURCES = \
        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 \
@@ -55,6 +57,8 @@ 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 \
@@ -169,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 = \
@@ -199,11 +205,11 @@ lib_libopenvswitch_a_SOURCES += \
        lib/netdev-linux.h \
        lib/netdev-vport.c \
        lib/netdev-vport.h \
+       lib/netlink-notifier.c \
+       lib/netlink-notifier.h \
        lib/netlink-protocol.h \
        lib/netlink-socket.c \
        lib/netlink-socket.h \
-       lib/rtnetlink.c \
-       lib/rtnetlink.h \
        lib/rtnetlink-link.c \
        lib/rtnetlink-link.h \
        lib/route-table.c \
@@ -220,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 += \
@@ -228,7 +236,7 @@ EXTRA_DIST += \
        lib/dh4096.pem \
        lib/dirs.c.in
 
-EXTRA_DIST += \
+MAN_FRAGMENTS += \
        lib/common.man \
        lib/common-syn.man \
        lib/daemon.man \
@@ -255,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
@@ -267,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)