[ovs-dev] [PATCH] ovn: Merge ovn/lib/libovn.la into ovn/libovn.la.

[Ben Pfaff]

I'm going to do it, just wanted to make sure you agreed first.

On Tue, Apr 21, 2015 at 05:02:38PM -0700, Justin Pettit wrote:
> I think it does.  Did you want me to do that or should I?
> 
> --Justin
> 
> 
> > On Apr 21, 2015, at 5:02 PM, Ben Pfaff <blp at nicira.com> wrote:
> > 
> > If you're OK with moving the IDL files into ovn/lib then I'd agree with
> > generating the library there too.  Does that make sense?
> > 
> > On Tue, Apr 21, 2015 at 04:59:34PM -0700, Justin Pettit wrote:
> >> I guess I would have expected that we'd keep it in "ovn/lib" to keep down the clutter in that directory.  Plus, we seemed to generate library files that way in the main OVS "lib" directory.
> >> 
> >> However, if you think this is better:
> >> 
> >> Acked-by: Justin Pettit <jpettit at nicira.com>
> >> 
> >> --Justin
> >> 
> >> 
> >>> On Apr 21, 2015, at 4:48 PM, Ben Pfaff <blp at nicira.com> wrote:
> >>> 
> >>> There is no value in having two separate libraries for OVN.
> >>> 
> >>> Reported-by: Justin Pettit <jpettit at nicira.com>
> >>> Signed-off-by: Ben Pfaff <blp at nicira.com>
> >>> ---
> >>> ovn/lib/automake.mk    | 3 +--
> >>> ovn/northd/automake.mk | 1 -
> >>> tests/automake.mk      | 2 +-
> >>> 3 files changed, 2 insertions(+), 4 deletions(-)
> >>> 
> >>> diff --git a/ovn/lib/automake.mk b/ovn/lib/automake.mk
> >>> index 91a4fe8..d9be997 100644
> >>> --- a/ovn/lib/automake.mk
> >>> +++ b/ovn/lib/automake.mk
> >>> @@ -1,5 +1,4 @@
> >>> -lib_LTLIBRARIES += ovn/lib/libovn.la
> >>> -ovn_lib_libovn_la_SOURCES = \
> >>> +ovn_libovn_la_SOURCES += \
> >>> 	ovn/lib/expr.c \
> >>> 	ovn/lib/expr.h \
> >>> 	ovn/lib/lex.c \
> >>> diff --git a/ovn/northd/automake.mk b/ovn/northd/automake.mk
> >>> index 6f6c1f5..0364d8b 100644
> >>> --- a/ovn/northd/automake.mk
> >>> +++ b/ovn/northd/automake.mk
> >>> @@ -3,6 +3,5 @@ bin_PROGRAMS += ovn/northd/ovn-northd
> >>> ovn_northd_ovn_northd_SOURCES = ovn/northd/ovn-northd.c
> >>> ovn_northd_ovn_northd_LDADD = \
> >>> 	ovn/libovn.la \
> >>> -	ovn/lib/libovn.la \
> >>> 	ovsdb/libovsdb.la \
> >>> 	lib/libopenvswitch.la
> >>> diff --git a/tests/automake.mk b/tests/automake.mk
> >>> index 4c2817b..9ff0bde 100644
> >>> --- a/tests/automake.mk
> >>> +++ b/tests/automake.mk
> >>> @@ -292,7 +292,7 @@ tests_ovstest_SOURCES += \
> >>> 	tests/test-unix-socket.c
> >>> endif
> >>> 
> >>> -tests_ovstest_LDADD = lib/libopenvswitch.la ovn/lib/libovn.la
> >>> +tests_ovstest_LDADD = lib/libopenvswitch.la ovn/libovn.la
> >>> dist_check_SCRIPTS = tests/flowgen.pl
> >>> 
> >>> noinst_PROGRAMS += tests/test-strtok_r
> >>> -- 
> >>> 2.1.3
> >>> 
> >> 
>