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 <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>

diff --git a/lib/automake.mk b/lib/automake.mk
index a45f09d22eeba1df3f65f4425311cb899f1b76ef..d5927d69d2e7bf371f61a8951de2859ecaea880c 100644 (file)
--- 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