secchan: Better tolerate failing controller admission control in fail-open.

[openvswitch] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 4d2924b6394b4d5f7d06ec7b0f20c56cd6cfc512..2474dad8d690b8214ac9821c6dd806c7a72bc15b 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,3 +1,10 @@
+# Copyright (C) 2009 Nicira Networks, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without warranty of any kind.
+
 noinst_LIBRARIES += lib/libopenvswitch.a
 
 lib_libopenvswitch_a_SOURCES = \
@@ -14,7 +21,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/compiler.h \
        lib/coverage.c \
        lib/coverage.h \
-       lib/coverage-counters.c \
        lib/coverage-counters.h \
        lib/csum.c \
        lib/csum.h \
@@ -25,7 +31,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/dhcp.c \
        lib/dhcp.h \
        lib/dhparams.h \
-       lib/dirs.c \
        lib/dirs.h \
        lib/dynamic-string.c \
        lib/dynamic-string.h \
@@ -55,6 +60,7 @@ lib_libopenvswitch_a_SOURCES = \
        lib/ofp-print.h \
        lib/ofpbuf.c \
        lib/ofpbuf.h \
+       lib/packets.c \
        lib/packets.h \
        lib/pcap.c \
        lib/pcap.h \
@@ -105,6 +111,10 @@ lib_libopenvswitch_a_SOURCES = \
        lib/vlog.c \
        lib/vlog.h \
        lib/xtoxll.h
+nodist_lib_libopenvswitch_a_SOURCES = \
+       lib/coverage-counters.c \
+       lib/dirs.c
+CLEANFILES += $(nodist_lib_libopenvswitch_a_SOURCES)
 
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
@@ -118,7 +128,7 @@ endif
 if HAVE_OPENSSL
 lib_libopenvswitch_a_SOURCES += \
        lib/vconn-ssl.c 
-nodist_lib_libopenvswitch_a_SOURCES = lib/dhparams.c
+nodist_lib_libopenvswitch_a_SOURCES += lib/dhparams.c
 lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
        (echo '#include "lib/dhparams.h"' &&                            \
         openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout &&      \
@@ -139,10 +149,10 @@ EXTRA_DIST += \
        lib/daemon.man \
        lib/dpif.man \
        lib/leak-checker.man \
+       lib/vlog-unixctl.man \
        lib/vlog.man
 
 
-CLEANFILES += lib/dirs.c
 lib/dirs.c: Makefile
        ($(ro_c) && \
         echo 'const char ovs_pkgdatadir[] = "$(pkgdatadir)";' && \