From eb8e3096a4fe24b446c3cda3505c0ecb18415b3a Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Fri, 4 May 2012 22:22:56 +0200 Subject: [PATCH] automake: libevent.la is not a convenience library Since libevent.la is not a convenience library, we cannot merge it into liblldpd.la. Therefore, we link it to lldpd directly (and don't try to build a convenience library from it). --- m4/libevent.m4 | 1 - src/Makefile.am | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/m4/libevent.m4 b/m4/libevent.m4 index e22a352b..f98a4a1e 100644 --- a/m4/libevent.m4 +++ b/m4/libevent.m4 @@ -12,7 +12,6 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [ # No appropriate version, let's use the shipped copy AC_MSG_NOTICE([using shipped libevent]) LIBEVENT_CFLAGS="-I\$(top_srcdir)/libevent/include -I\$(top_builddir)/libevent/include" - LIBEVENT_LIBS="\$(top_builddir)/libevent/libevent.la" LIBEVENT_LDFLAGS="\$(top_builddir)/libevent/libevent.la" ]) diff --git a/src/Makefile.am b/src/Makefile.am index febb0101..5107435a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,9 +32,7 @@ endif ## libevent if LIBEVENT_EMBEDDED -event.c: $(top_builddir)/libevent/include/event2-config.h $(top_builddir)/libevent/libevent.la -$(top_builddir)/libevent/include/event2-config.h: $(top_builddir)/libevent/config.h - (cd $(top_builddir)/libevent && $(MAKE) include/event2/event-config.h) +event.c: $(top_builddir)/libevent/libevent.la $(top_builddir)/libevent/libevent.la: $(top_srcdir)/libevent/*.c $(top_srcdir)/libevent/*.h - (cd $(top_builddir)/libevent && $(MAKE) libevent.la) + (cd $(top_builddir)/libevent && $(MAKE)) endif -- 2.39.5