From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 May 2010 18:37:23 +0000 (-0400)
Subject: Only add libevent_core.la to LIBADD on mingw
X-Git-Tag: release-2.0.5-beta~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdc629736e1cedb7bb4ab201e49cb1638c69888e;p=libevent

Only add libevent_core.la to LIBADD on mingw

Chris Davis reports that this is also necessary to fix building with
shared libraries on OSX for him.  Should fix bug 2997775.

There is probably a better fix for the issues solved by commit
3cbca8661f, but for now, we're trying to get a beta out the door.
---

diff --git a/Makefile.am b/Makefile.am
index 5af821e3..f6452e6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,8 +130,10 @@ EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c
 
 if BUILD_WIN32
 NO_UNDEFINED = -no-undefined
+MAYBE_CORE = libevent_core.la
 else
 NO_UNDEFINED =
+MAYBE_CORE = libevent_core.la
 endif
 
 libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
@@ -147,12 +149,12 @@ libevent_pthreads_la_SOURCES = evthread_pthread.c
 endif
 
 libevent_extra_la_SOURCES = $(EXTRA_SRC)
-libevent_extra_la_LIBADD = libevent_core.la $(SYS_LIBS)
+libevent_extra_la_LIBADD = $(MAYBE_CORE) $(SYS_LIBS)
 libevent_extra_la_LDFLAGS = -version-info $(VERSION_INFO) $(NO_UNDEFINED)
 
 if OPENSSL
 libevent_openssl_la_SOURCES = bufferevent_openssl.c
-libevent_openssl_la_LIBADD = libevent_core.la -lcrypto -lssl
+libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lcrypto -lssl
 libevent_openssl_la_LDFLAGS = -version-info $(VERSION_INFO) $(NO_UNDEFINED)
 endif