Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove the deprecated libevent.so library.

Also, update libevent.pc to link against libevent_core and libevent_extra.
  • Loading branch information...
commit a19368f7f22f23306ff8a05898e2fc9033c5704d 1 parent 981aa0e
@rosslagerwall authored
View
6 Makefile.am
@@ -108,7 +108,7 @@ EXTRA_DIST = \
whatsnew-2.1.txt \
$(PLATFORM_DEPENDENT_SRC)
-LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la
+LIBEVENT_LIBS_LA = libevent_core.la libevent_extra.la
if PTHREADS
LIBEVENT_LIBS_LA += libevent_pthreads.la
LIBEVENT_PKGCONFIG += libevent_pthreads.pc
@@ -205,10 +205,6 @@ endif
GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED)
-libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
-libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-libevent_la_LDFLAGS = $(GENERIC_LDFLAGS)
-
libevent_core_la_SOURCES = $(CORE_SRC)
libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
libevent_core_la_LDFLAGS = $(GENERIC_LDFLAGS)
View
2  libevent.pc.in
@@ -10,7 +10,7 @@ Description: libevent is an asynchronous notification event loop library
Version: @VERSION@
Requires:
Conflicts:
-Libs: -L${libdir} -levent
+Libs: -L${libdir} -levent_core -levent_extra
Libs.private: @LIBS@
Cflags: -I${includedir}
View
2  sample/Makefile.am
@@ -6,7 +6,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies
-LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la
+LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la ../libevent_extra.la
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include
noinst_PROGRAMS = \
View
10 test/Makefile.am
@@ -99,7 +99,7 @@ if BUILD_WIN32
regress_SOURCES += regress_iocp.c
endif
-regress_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
+regress_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la ../libevent_extra.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
regress_LDFLAGS = $(PTHREAD_CFLAGS)
@@ -109,11 +109,11 @@ regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
endif
bench_SOURCES = bench.c
-bench_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la
+bench_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la
bench_cascade_SOURCES = bench_cascade.c
-bench_cascade_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la
+bench_cascade_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la
bench_http_SOURCES = bench_http.c
-bench_http_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la
+bench_http_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la ../libevent_extra.la
bench_httpclient_SOURCES = bench_httpclient.c
bench_httpclient_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la
@@ -136,4 +136,4 @@ DISTCLEANFILES = *~
verify: check
bench test-init test-eof test-weof test-time test-changelist \
- test-fdleak: ../libevent.la
+ test-fdleak: ../libevent_core.la ../libevent_extra.la
Please sign in to comment.
Something went wrong with that request. Please try again.