Use PYTHONDONTWRITEBYTECODE=yes for invoking Python for build or test.

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

diff --git a/lib/automake.mk b/lib/automake.mk
index 01eeb85..52e112b 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -45,6 +45,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/dpif-provider.h \
        lib/dpif.c \
        lib/dpif.h \
+       lib/heap.c \
+       lib/heap.h \
        lib/dynamic-string.c \
        lib/dynamic-string.h \
        lib/entropy.c \
@@ -67,6 +69,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/lacp.h \
        lib/leak-checker.c \
        lib/leak-checker.h \
+       lib/learn.c \
+       lib/learn.h \
        lib/learning-switch.c \
        lib/learning-switch.h \
        lib/list.c \
@@ -75,16 +79,18 @@ lib_libopenvswitch_a_SOURCES = \
        lib/lockfile.h \
        lib/mac-learning.c \
        lib/mac-learning.h \
+       lib/meta-flow.c \
+       lib/meta-flow.h \
        lib/multipath.c \
        lib/multipath.h \
        lib/netdev-dummy.c \
        lib/netdev-provider.h \
        lib/netdev.c \
        lib/netdev.h \
+       lib/netflow.h \
        lib/netlink.c \
        lib/netlink.h \
        lib/nx-match.c \
-       lib/nx-match.def \
        lib/nx-match.h \
        lib/odp-util.c \
        lib/odp-util.h \
@@ -137,6 +143,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/sort.h \
        lib/sset.c \
        lib/sset.h \
+       lib/stp.c \
+       lib/stp.h \
        lib/stream-fd.c \
        lib/stream-fd.h \
        lib/stream-provider.h \
@@ -176,8 +184,13 @@ lib_libopenvswitch_a_SOURCES = \
        lib/vconn.h \
        lib/vlan-bitmap.c \
        lib/vlan-bitmap.h \
+       lib/vlandev.c \
+       lib/vlandev.h \
        lib/vlog.c \
-       lib/vlog.h
+       lib/vlog.h \
+       lib/vswitch-idl.c \
+       lib/vswitch-idl.h
+
 nodist_lib_libopenvswitch_a_SOURCES = \
        lib/dirs.c
 CLEANFILES += $(nodist_lib_libopenvswitch_a_SOURCES)
@@ -240,9 +253,11 @@ EXTRA_DIST += \
 MAN_FRAGMENTS += \
        lib/common.man \
        lib/common-syn.man \
+       lib/coverage-unixctl.man \
        lib/daemon.man \
        lib/daemon-syn.man \
        lib/leak-checker.man \
+       lib/ovs.tmac \
        lib/ssl-bootstrap.man \
        lib/ssl-bootstrap-syn.man \
        lib/ssl-peer-ca-cert.man \
@@ -258,6 +273,18 @@ MAN_FRAGMENTS += \
        lib/vlog-syn.man \
        lib/vlog.man
 
+# vswitch IDL
+OVSIDL_BUILT += \
+       lib/vswitch-idl.c \
+       lib/vswitch-idl.h \
+       lib/vswitch-idl.ovsidl
+
+EXTRA_DIST += lib/vswitch-idl.ann
+VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema lib/vswitch-idl.ann
+lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
+       $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+       mv $@.tmp $@
+
 lib/dirs.c: lib/dirs.c.in Makefile
        ($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
                -e 's,[@]srcdir[@],$(srcdir),g' \
@@ -269,13 +296,12 @@ 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
+$(srcdir)/lib/ofp-errors.inc: \
+       lib/ofp-errors.h $(srcdir)/build-aux/extract-ofp-errors
+       $(run_python) $(srcdir)/build-aux/extract-ofp-errors \
+               $(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
+$(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
+EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
 
 INSTALL_DATA_LOCAL += lib-install-data-local
 lib-install-data-local: