diff options
author | Haibo Huang <hhb@google.com> | 2019-06-19 10:58:50 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 10:58:50 -0700 |
commit | fdec7c6c5971a78bb6eaf644d921ba6093d86495 (patch) | |
tree | 1d148d55162d1d29b1bc55ea05ff62c1793086d6 /Makefile.am | |
parent | 7b67f806735671bbf49cc4cd74c59c7c105ce8e2 (diff) | |
parent | c10dfda3bb3dc0b4b180247932dabe08c767f59c (diff) | |
download | libevent-fdec7c6c5971a78bb6eaf644d921ba6093d86495.tar.gz |
Upgrade libevent to release-2.1.10-stable am: b22796788b am: 0fa30d936b
am: c10dfda3bb
Change-Id: I888311fe6a2b38b33dfd9d5dcf0b85524425a0c4
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 51 |
1 files changed, 41 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index c8354c3..240d014 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ RELEASE = -release 2.1 # # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES # UNLESS YOU REALLY REALLY HAVE TO. -VERSION_INFO = 6:2:0 +VERSION_INFO = 6:4:0 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -71,7 +71,9 @@ VERSION_INFO = 6:2:0 # 2.1.5-beta -- 2.1 5:0:0 (ABI changed slightly) # 2.1.6-beta -- 2.1 6:0:0 (ABI changed slightly) # 2.1.7-beta -- 2.1 6:1:0 (ABI changed slightly) -# 2.1.8-stable-- 2.1 6:2:0 (ABI changed slightly) +# 2.1.8-stable-- 2.1 6:2:0 (No ABI change) +# 2.1.9-beta-- 2.1 6:3:0 (No ABI change) +# 2.1.10-stable-- 2.1 6:4:0 (No ABI change) # ABI version history for this package effectively restarts every time # we change RELEASE. Version 1.4.x had RELEASE of 1.4. @@ -104,6 +106,30 @@ PLATFORM_DEPENDENT_SRC = \ arc4random.c \ epoll_sub.c +CMAKE_FILES = \ + cmake/AddCompilerFlags.cmake \ + cmake/AddEventLibrary.cmake \ + cmake/CheckConstExists.cmake \ + cmake/CheckFileOffsetBits.c \ + cmake/CheckFileOffsetBits.cmake \ + cmake/CheckFunctionExistsEx.c \ + cmake/CheckFunctionExistsEx.cmake \ + cmake/CheckFunctionKeywords.cmake \ + cmake/CheckPrototypeDefinition.c.in \ + cmake/CheckPrototypeDefinition.cmake \ + cmake/CheckWorkingKqueue.cmake \ + cmake/CodeCoverage.cmake \ + cmake/COPYING-CMAKE-SCRIPTS \ + cmake/Copyright.txt \ + cmake/FindGit.cmake \ + cmake/LibeventConfigBuildTree.cmake.in \ + cmake/LibeventConfig.cmake.in \ + cmake/LibeventConfigVersion.cmake.in \ + cmake/VersionViaGit.cmake \ + event-config.h.cmake \ + evconfig-private.h.cmake \ + CMakeLists.txt + EXTRA_DIST = \ ChangeLog-1.4 \ ChangeLog-2.0 \ @@ -116,6 +142,7 @@ EXTRA_DIST = \ make-event-config.sed \ whatsnew-2.0.txt \ whatsnew-2.1.txt \ + $(CMAKE_FILES) \ $(PLATFORM_DEPENDENT_SRC) LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la @@ -228,7 +255,11 @@ NO_UNDEFINED = MAYBE_CORE = endif -GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) +AM_CFLAGS = $(LIBEVENT_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/compat -I./include -I$(srcdir)/include $(SYS_INCLUDES) $(LIBEVENT_CPPFLAGS) +AM_LDFLAGS = $(LIBEVENT_LDFLAGS) + +GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) $(AM_LDFLAGS) libevent_la_SOURCES = $(CORE_SRC) $(EXTRAS_SRC) libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) @@ -258,14 +289,16 @@ endif noinst_HEADERS += \ WIN32-Code/nmake/evconfig-private.h \ WIN32-Code/nmake/event2/event-config.h \ + WIN32-Code/getopt.h \ + WIN32-Code/getopt.c \ + WIN32-Code/getopt_long.c \ WIN32-Code/tree.h \ - bufferevent-internal.h \ - changelist-internal.h \ + bufferevent-internal.h \ + changelist-internal.h \ compat/sys/queue.h \ defer-internal.h \ - epolltable-internal.h \ + epolltable-internal.h \ evbuffer-internal.h \ - evconfig-private.h \ event-internal.h \ evmap-internal.h \ evrpc-internal.h \ @@ -283,7 +316,7 @@ noinst_HEADERS += \ ratelim-internal.h \ strlcpy-internal.h \ time-internal.h \ - util-internal.h \ + util-internal.h \ openssl-compat.h EVENT1_HDRS = \ @@ -299,8 +332,6 @@ else noinst_HEADERS += $(EVENT1_HDRS) endif -AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES) - verify: check doxygen: FORCE |