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).

diff --git a/m4/libevent.m4 b/m4/libevent.m4
index e22a352b24b4a2aeb20a8da0cbf7deb50ff84540..f98a4a1e7a6480ec118cd9e715550067c3c08c76 100644 (file)
--- 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 febb010149b21919a2b28d6bc4487f7d126c444f..5107435adebde38796ed9731fccdcde3aa3d9506 100644 (file)
--- 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