From 8c8c0f3a9662f612752beaf67c68a25722f496a9 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 4 Oct 2012 15:53:14 -0700 Subject: [PATCH] Fix vswitch-idl.ovsidl build rule with separate source and build dirs. Before commit e3a880272 (lib: Specify idl location more precisely.), the files named in VSWITCH_IDL_FILES were relative to the source directory. That commit made them inconsistent: one remained relative to the source directory, the other became relative to the build directory. This meant that if the source and build directories differed, the ovsdb-idlc invocation had no change of succeeding. This commit fixes the problem by making the file names consistently relative to the build directory and then adjusting the ovsdb-idlc invocation to expect that. Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- lib/automake.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/automake.mk b/lib/automake.mk index a45f09d2..d5927d69 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -305,9 +305,11 @@ OVSIDL_BUILT += \ $(srcdir)/lib/vswitch-idl.ovsidl EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann -VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema $(srcdir)/lib/vswitch-idl.ann +VSWITCH_IDL_FILES = \ + $(srcdir)/vswitchd/vswitch.ovsschema \ + $(srcdir)/lib/vswitch-idl.ann $(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES) - $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp + $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp mv $@.tmp $@ lib/dirs.c: lib/dirs.c.in Makefile -- 2.30.2