diff options
author | Ethan Jackson <ethan@nicira.com> | 2012-03-15 17:10:41 -0700 |
---|---|---|
committer | Ethan Jackson <ethan@nicira.com> | 2012-03-19 10:52:53 -0700 |
commit | 6e037e3ca6381fa36fdf6009c4ccc97d0f041be4 (patch) | |
tree | f54b0f23358eec1dbac93d46adb0bcbce1acf903 /vswitchd | |
parent | 8a07709cb80462edb32fc11d056bfc08ce90f62d (diff) |
idl: Move vswitch-idl to libopenvswitch.
This is cleaner then having multiple programs build the idl
independently.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'vswitchd')
-rw-r--r-- | vswitchd/.gitignore | 3 | ||||
-rw-r--r-- | vswitchd/automake.mk | 16 | ||||
-rw-r--r-- | vswitchd/bridge.c | 2 | ||||
-rw-r--r-- | vswitchd/ovs-vswitchd.c | 2 | ||||
-rw-r--r-- | vswitchd/vswitch-idl.ann | 9 |
5 files changed, 4 insertions, 28 deletions
diff --git a/vswitchd/.gitignore b/vswitchd/.gitignore index 60bacaf0..d5c239b7 100644 --- a/vswitchd/.gitignore +++ b/vswitchd/.gitignore @@ -6,6 +6,3 @@ /ovs-vswitchd.8 /ovs-vswitchd.conf.db.5 /vswitch.ovsschema.stamp -/vswitch-idl.c -/vswitch-idl.h -/vswitch-idl.ovsidl diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index 861c1526..4df5f22c 100644 --- a/vswitchd/automake.mk +++ b/vswitchd/automake.mk @@ -13,8 +13,6 @@ vswitchd_ovs_vswitchd_SOURCES = \ vswitchd/ovs-vswitchd.c \ vswitchd/system-stats.c \ vswitchd/system-stats.h \ - vswitchd/vswitch-idl.c \ - vswitchd/vswitch-idl.h \ vswitchd/xenserver.c \ vswitchd/xenserver.h vswitchd_ovs_vswitchd_LDADD = \ @@ -29,25 +27,15 @@ if BUILD_BRCOMPAT if HAVE_NETLINK sbin_PROGRAMS += vswitchd/ovs-brcompatd vswitchd_ovs_brcompatd_SOURCES = \ - vswitchd/ovs-brcompatd.c \ - vswitchd/vswitch-idl.c \ - vswitchd/vswitch-idl.h + vswitchd/ovs-brcompatd.c vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS) endif MAN_ROOTS += vswitchd/ovs-brcompatd.8.in endif # vswitch schema and IDL -OVSIDL_BUILT += \ - vswitchd/vswitch-idl.c \ - vswitchd/vswitch-idl.h \ - vswitchd/vswitch-idl.ovsidl -VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann -EXTRA_DIST += $(VSWITCH_IDL_FILES) +EXTRA_DIST += vswitchd/vswitch.ovsschema pkgdata_DATA += vswitchd/vswitch.ovsschema -vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES) - $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp - mv $@.tmp $@ # vswitch E-R diagram # diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 4761cbf0..5b6976a2 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -50,7 +50,7 @@ #include "util.h" #include "unixctl.h" #include "vlandev.h" -#include "vswitchd/vswitch-idl.h" +#include "vswitch-idl.h" #include "xenserver.h" #include "vlog.h" #include "sflow_api.h" diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 22a26c1c..ebac1aa5 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -49,7 +49,7 @@ #include "util.h" #include "vconn.h" #include "vlog.h" -#include "vswitchd/vswitch-idl.h" +#include "vswitch-idl.h" VLOG_DEFINE_THIS_MODULE(vswitchd); diff --git a/vswitchd/vswitch-idl.ann b/vswitchd/vswitch-idl.ann deleted file mode 100644 index 7a5cc314..00000000 --- a/vswitchd/vswitch-idl.ann +++ /dev/null @@ -1,9 +0,0 @@ -# -*- python -*- - -# This code, when invoked by "ovsdb-idlc annotate" (by the build -# process), annotates vswitch.ovsschema with additional data that give -# the ovsdb-idl engine information about the types involved, so that -# it can generate more programmer-friendly data structures. - -s["idlPrefix"] = "ovsrec_" -s["idlHeader"] = "\"vswitchd/vswitch-idl.h\"" |