diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-04-21 17:36:52 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-04-21 18:44:40 -0700 |
| commit | e3df8838451bdc3b025d3049009c37f8addc7d41 (patch) | |
| tree | 1507d4a03ddf2ba69d385d04c1ea978799119024 /ovn/lib/automake.mk | |
| parent | 907a0edf84437f4f6951bc06747ccd18777863ca (diff) | |
| download | openvswitch-e3df8838451bdc3b025d3049009c37f8addc7d41.tar.gz | |
ovn: Move all library files into ovn/lib, and merge libraries.
There is no value in having two separate libraries for OVN.
Reported-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'ovn/lib/automake.mk')
| -rw-r--r-- | ovn/lib/automake.mk | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/ovn/lib/automake.mk b/ovn/lib/automake.mk index 91a4fe871..454f2efe4 100644 --- a/ovn/lib/automake.mk +++ b/ovn/lib/automake.mk @@ -1,6 +1,43 @@ lib_LTLIBRARIES += ovn/lib/libovn.la +ovn_lib_libovn_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -Wl,--version-script=$(top_builddir)/ovn/lib/libovn.sym \ + $(AM_LDFLAGS) ovn_lib_libovn_la_SOURCES = \ ovn/lib/expr.c \ ovn/lib/expr.h \ ovn/lib/lex.c \ - ovn/lib/lex.h + ovn/lib/lex.h \ + ovn/lib/ovn-nb-idl.c \ + ovn/lib/ovn-nb-idl.h \ + ovn/lib/ovn-sb-idl.c \ + ovn/lib/ovn-sb-idl.h + +# ovn-sb IDL +OVSIDL_BUILT += \ + $(srcdir)/ovn/lib/ovn-sb-idl.c \ + $(srcdir)/ovn/lib/ovn-sb-idl.h \ + $(srcdir)/ovn/lib/ovn-sb-idl.ovsidl +EXTRA_DIST += $(srcdir)/ovn/lib/ovn-sb-idl.ann +OVN_SB_IDL_FILES = \ + $(srcdir)/ovn/ovn-sb.ovsschema \ + $(srcdir)/ovn/lib/ovn-sb-idl.ann +$(srcdir)/ovn/lib/ovn-sb-idl.ovsidl: $(OVN_SB_IDL_FILES) + $(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_SB_IDL_FILES) > $@.tmp && \ + mv $@.tmp $@ +CLEANFILES += ovn/lib/ovn-sb-idl.c ovn/lib/ovn-sb-idl.h + +# ovn-nb IDL +OVSIDL_BUILT += \ + $(srcdir)/ovn/lib/ovn-nb-idl.c \ + $(srcdir)/ovn/lib/ovn-nb-idl.h \ + $(srcdir)/ovn/lib/ovn-nb-idl.ovsidl +EXTRA_DIST += $(srcdir)/ovn/lib/ovn-nb-idl.ann +OVN_NB_IDL_FILES = \ + $(srcdir)/ovn/ovn-nb.ovsschema \ + $(srcdir)/ovn/lib/ovn-nb-idl.ann +$(srcdir)/ovn/lib/ovn-nb-idl.ovsidl: $(OVN_NB_IDL_FILES) + $(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_NB_IDL_FILES) > $@.tmp && \ + mv $@.tmp $@ +CLEANFILES += ovn/lib/ovn-nb-idl.c ovn/lib/ovn-nb-idl.h + |