cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-11 13:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only add libevent_core.la to LIBADD on mingw

Browse Source 
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.
This commit is contained in:
Nick Mathewson 2010-05-06 14:37:23 -04:00
parent 25433b96dc
commit fdc629736e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -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