diff options
| author | Haibo Huang <hhb@google.com> | 2020-07-14 18:31:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 18:31:56 +0000 |
| commit | 884d7a39094e590c9dc58f865b068f40694c6a49 (patch) | |
| tree | 53915fc3eafdda183ab94c84e85ad7d7107afc6a /Makefile.am | |
| parent | c4d7c4bdab4c5587b42073d60fb6aca6e335d76e (diff) | |
| parent | 023ea039b9fada42e0cbbefcd75858a855a6130a (diff) | |
| download | platform_external_libevent-master.tar.gz platform_external_libevent-master.tar.bz2 platform_external_libevent-master.zip | |
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1360893
Change-Id: Iee716ec96a55737a04463c7b84c929c2e6418c54
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index dd90502..2181500 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,8 @@ # See LICENSE for copying information. # 'foreign' means that we're not enforcing GNU package rules strictly. -# '1.11.2' means that we need automake 1.11.2 or later (and we do). -AUTOMAKE_OPTIONS = foreign 1.11.2 subdir-objects +# '1.13' means that we need automake 1.13 or later (and we do). +AUTOMAKE_OPTIONS = foreign 1.13 subdir-objects ACLOCAL_AMFLAGS = -I m4 @@ -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 = 7:0:0 +VERSION_INFO = 7:1:0 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -75,6 +75,7 @@ VERSION_INFO = 7:0:0 # 2.1.9-beta-- 2.1 6:3:0 (No ABI change) # 2.1.10-stable-- 2.1 6:4:0 (No ABI change, WRONG) # 2.1.11-stable-- 2.1 7:0:0 (ABI changed) +# 2.1.12-stable-- 2.1 7:1: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. @@ -113,8 +114,6 @@ CMAKE_FILES = \ 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 \ @@ -122,10 +121,11 @@ CMAKE_FILES = \ 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/Macros.cmake \ + cmake/Uninstall.cmake.in \ + cmake/UseDoxygen.cmake \ cmake/VersionViaGit.cmake \ event-config.h.cmake \ evconfig-private.h.cmake \ @@ -177,6 +177,7 @@ include test/include.am if BUILD_WIN32 +SYS_CORE_LIBS = -liphlpapi SYS_LIBS = -lws2_32 -lshell32 -ladvapi32 SYS_SRC = win32select.c buffer_iocp.c event_iocp.c \ bufferevent_async.c @@ -188,6 +189,7 @@ endif else +SYS_CORE_LIBS = SYS_LIBS = SYS_SRC = SYS_INCLUDES = @@ -264,11 +266,11 @@ 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) +libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) $(SYS_CORE_LIBS) libevent_la_LDFLAGS = $(GENERIC_LDFLAGS) libevent_core_la_SOURCES = $(CORE_SRC) -libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) +libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) $(SYS_CORE_LIBS) libevent_core_la_LDFLAGS = $(GENERIC_LDFLAGS) if PTHREADS @@ -336,9 +338,7 @@ endif verify: check -doxygen: FORCE - doxygen $(srcdir)/Doxyfile -FORCE: +include doxygen.am DISTCLEANFILES += *~ libevent.pc libevent_core.pc libevent_extra.pc ./include/event2/event-config.h |