split libevent into two extra libraries libevent_core and libevent_extra

svn:r469

diff --git a/ChangeLog b/ChangeLog
index 4a819f5f98db1057311bf14c8c43c1bd5ec8db93..380c504af42edfbb0149d7df3e1ec55fad5b875a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,3 +32,4 @@ Changes in current version:
  o support for hooks on rpc input and output; can be used to implement rpc independent processing such as compression or authentication.
  o use a min heap instead of a red-black tree for timeouts; as a result finding the min is a O(1) operation now; from Maxim Yegorushkin
  o associate an event base with an rpc pool
+ o added two additional libraries: libevent_core and libevent_extra in addition to the regular libevent.  libevent_core contains only the event core whereas libevent_extra contains dns, http and rpc support

diff --git a/Makefile.am b/Makefile.am
index 0ea1b780583074a4e42ae1c286994aef94f9863a..46c7f44a4c5f501c0769cc0474f969e1ce550ddf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-
 bin_SCRIPTS = event_rpcgen.py
 
 EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \
@@ -21,7 +20,7 @@ EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \
        WIN32-Prj/libevent.dsw WIN32-Prj/signal_test/signal_test.dsp \
        WIN32-Prj/time_test/time_test.dsp
 
-lib_LTLIBRARIES = libevent.la
+lib_LTLIBRARIES = libevent.la libevent_core.la libevent_extra.la
 
 if BUILD_WIN32
 
@@ -39,14 +38,23 @@ SYS_INCLUDES =
 
 endif
 
-libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \
-       http.c evhttp.h http-internal.h evdns.c evdns.h evrpc.c evutil.c \
-       strlcpy.c \
-       strlcpy-internal.h evrpc.h evrpc-internal.h strlcpy-internal.h \
-       $(SYS_SRC)
+CORE_SRC = event.c buffer.c evbuffer.c log.c evutil.c $(SYS_SRC)
+EXTRA_SRC = event_tagging.c http.c evhttp.h http-internal.h evdns.c \
+       evdns.h evrpc.c evrpc.h evrpc-internal.h \
+       strlcpy.c strlcpy-internal.h strlcpy-internal.h
+
+libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
 libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
 libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
 
+libevent_core_la_SOURCES = $(CORE_SRC)
+libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
+libevent_core_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
+
+libevent_extra_la_SOURCES = $(EXTRA_SRC)
+libevent_extra_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
+libevent_extra_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
+
 include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h
 
 INCLUDES = -I$(srcdir)/compat $(SYS_INCLUDES)

diff --git a/event.3 b/event.3
index cff472bdccd8e01895266675634e2c427e3fd14d..328f632a005246b5791017f1c71ee24f473253e2 100644 (file)
--- a/event.3
+++ b/event.3
@@ -182,7 +182,7 @@
 .Ft "char *"
 .Fn "evbuffer_readline" "struct evbuffer *buf"
 .Ft "struct evhttp *"
-.Fn "evhttp_new"
+.Fn "evhttp_new" "struct event_base *base"
 .Ft int
 .Fn "evhttp_bind_socket" "struct evhttp *http" "const char *address" "u_short port"
 .Ft "void"

diff --git a/test/Makefile.am b/test/Makefile.am
index ab9c68292a1ec967024684870ddc6e60239e023c..ceb856b9b9ba9ad9e466c265b72415fcb902600a 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-LDADD = ../libevent.la
 CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat
 
 EXTRA_DIST = regress.rpc
@@ -9,13 +8,19 @@ noinst_PROGRAMS = test-init test-eof test-weof test-time regress bench
 
 BUILT_SOURCES = regress.gen.c regress.gen.h
 test_init_SOURCES = test-init.c
+test_init_LDADD = ../libevent_core.la
 test_eof_SOURCES = test-eof.c
+test_eof_LDADD = ../libevent_core.la
 test_weof_SOURCES = test-weof.c
+test_weof_LDADD = ../libevent_core.la
 test_time_SOURCES = test-time.c
+test_time_LDADD = ../libevent_core.la
 regress_SOURCES = regress.c regress.h regress_http.c regress_dns.c \
        regress_rpc.c \
        regress.gen.c regress.gen.h
+regress_LDADD = ../libevent.la
 bench_SOURCES = bench.c
+bench_LDADD = ../libevent.la
 
 regress.gen.c regress.gen.h: regress.rpc
        $(top_srcdir)/event_rpcgen.py $(srcdir)/regress.rpc || echo "No Python installed"