classifier: Change classifier_rule_overlaps() to take a cls_rule *.

[openvswitch] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index eedb5721327711581fffd063b280913bb655f0c5..5cfac240060e306ad4c5656c5e657a9ef5c642bc 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -14,6 +14,7 @@ lib_libopenvswitch_a_SOURCES = \
        lib/backtrace.h \
        lib/bitmap.c \
        lib/bitmap.h \
+       lib/byte-order.h \
        lib/byteq.c \
        lib/byteq.h \
        lib/classifier.c \
@@ -117,8 +118,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/socket-util.h \
        lib/sort.c \
        lib/sort.h \
-       lib/stp.c \
-       lib/stp.h \
        lib/stream-fd.c \
        lib/stream-fd.h \
        lib/stream-provider.h \
@@ -151,8 +150,7 @@ lib_libopenvswitch_a_SOURCES = \
        lib/vconn.h \
        lib/vlog-modules.def \
        lib/vlog.c \
-       lib/vlog.h \
-       lib/xtoxll.h
+       lib/vlog.h
 nodist_lib_libopenvswitch_a_SOURCES = \
        lib/coverage-counters.c \
        lib/dirs.c
@@ -177,9 +175,7 @@ endif
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
        lib/dpif-linux.c \
-       lib/netdev-gre.c \
        lib/netdev-linux.c \
-       lib/netdev-patch.c \
        lib/netdev-vport.c \
        lib/netdev-vport.h \
        lib/netlink-protocol.h \
@@ -236,7 +232,8 @@ lib/dirs.c: Makefile
         echo 'const char ovs_bindir[] = "$(bindir)";') > lib/dirs.c.tmp
        mv lib/dirs.c.tmp lib/dirs.c
 
-install-data-local:
+install-data-local: lib-install-data-local
+lib-install-data-local:
        $(MKDIR_P) $(DESTDIR)$(RUNDIR)
        $(MKDIR_P) $(DESTDIR)$(PKIDIR)
        $(MKDIR_P) $(DESTDIR)$(LOGDIR)