Re: [PATCH] Add missing library dependancies

[Angus Salkeld <asalkeld@xxxxxxxxxx>]

On 07/11/12 05:28 +0100, Fabio M. Di Nitto wrote:
> On 11/07/2012 03:03 AM, Angus Salkeld wrote:
> > Needed to do a clean build on ubuntu
>
> What version of ubuntu? this really shouldn't be necessary.

ubuntu-12.04.1-server-amd64.iso

> all lib*.la should pull in corosync_common automatically.
>
> Fabio
>
> > Signed-off-by: Angus Salkeld <asalkeld@xxxxxxxxxx>
> > ---
> >  test/Makefile.am  | 6 +++---
> >  tools/Makefile.am | 6 ++++--
> >  2 files changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/test/Makefile.am b/test/Makefile.am
> > index c19e506..693ecff 100644
> > --- a/test/Makefile.am
> > +++ b/test/Makefile.am
> > @@ -54,9 +54,9 @@ testvotequorum2_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libvotequorum.la
> >  cpgverify_CPPFLAGS	= $(nss_CFLAGS)
> >  cpgverify_LDADD		= $(LIBQB_LIBS) $(nss_LIBS) $(top_builddir)/lib/libcpg.la
> >  cpgbound_LDADD		= $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la
> > -cpgbench_LDADD		= $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la
> > -cpgbenchzc_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la
> > -testsam_LDADD		= $(LIBQB_LIBS) $(top_builddir)/lib/libsam.la
> > +cpgbench_LDADD		= $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la  $(top_builddir)/common_lib/libcorosync_common.la
> > +cpgbenchzc_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la  $(top_builddir)/common_lib/libcorosync_common.la
> > +testsam_LDADD		= $(LIBQB_LIBS) $(top_builddir)/lib/libsam.la  $(top_builddir)/lib/libcmap.la
> >
> >  ploadstart: ploadstart.sh
> >  	sed -e 's#@''BASHPATH@#${BASHPATH}#g' $< > $@
> > diff --git a/tools/Makefile.am b/tools/Makefile.am
> > index 8f4064a..be03134 100644
> > --- a/tools/Makefile.am
> > +++ b/tools/Makefile.am
> > @@ -54,7 +54,8 @@ corosync-xmlproc: corosync-xmlproc.sh
> >  corosync-blackbox: corosync-blackbox.sh
> >  	sed -e 's#@''LOCALSTATEDIR@#${localstatedir}#g' $< > $@
> >
> > -corosync_cmapctl_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libcmap.la
> > +corosync_cmapctl_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libcmap.la \
> > +			    $(top_builddir)/common_lib/libcorosync_common.la
> >
> >  corosync_cfgtool_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libcfg.la
> >
> > @@ -65,7 +66,8 @@ corosync_quorumtool_LDADD = $(LIBQB_LIBS) \
> >  			    $(top_builddir)/lib/libcmap.la \
> >  			    $(top_builddir)/lib/libcfg.la \
> >  			    $(top_builddir)/lib/libquorum.la \
> > -			    $(top_builddir)/lib/libvotequorum.la
> > +			    $(top_builddir)/lib/libvotequorum.la \
> > +			    $(top_builddir)/common_lib/libcorosync_common.la
> >
> >  corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS)
> >  corosync_notifyd_LDADD    = $(LIBQB_LIBS) $(DBUS_LIBS) $(SNMP_LIBS) \
>
> _______________________________________________
> discuss mailing list
> discuss@xxxxxxxxxxxx
> http://lists.corosync.org/mailman/listinfo/discuss
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss