X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=82bafde22648b7e7cbc91d1d3a70340713a3204a;hb=2b540ecba2c583ec6050b5cc0017660eb101e4ed;hp=df30711298be038b2bd3c8c333b38c887d11dccf;hpb=75a75043564dc9b002fffa6c6ad71e0d4d5c892e;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index df307112..82bafde2 100644
--- 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 Networks, 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 \
@@ -85,10 +87,10 @@ lib_libopenvswitch_a_SOURCES = \
 	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 \
@@ -141,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 \
@@ -180,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)
@@ -247,6 +256,7 @@ MAN_FRAGMENTS += \
 	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 \
@@ -262,6 +272,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' \
@@ -273,13 +295,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
+	$(PYTHON) $(srcdir)/build-aux/extract-ofp-errors \
+		$(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
+lib/ofp-errors.c: 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: