Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/external/bsd/libevent/dist Pull up following revision(s) ...
details: https://anonhg.NetBSD.org/src/rev/4e1cb879cae8
branches: netbsd-7
changeset: 798932:4e1cb879cae8
user: bouyer <bouyer%NetBSD.org@localhost>
date: Tue Feb 03 08:23:39 2015 +0000
description:
Pull up following revision(s) via patch (requested by spz in ticket #478):
external/bsd/libevent/dist/ChangeLog up to 1.1.1.2
external/bsd/libevent/dist/Makefile.am up to 1.1.1.1
external/bsd/libevent/dist/Makefile.in up to 1.1.1.1
external/bsd/libevent/dist/aclocal.m4 up to 1.1.1.1
external/bsd/libevent/dist/arc4random.c up to 1.1.1.1
external/bsd/libevent/dist/buffer.c up to 1.2
external/bsd/libevent/dist/bufferevent.c up to 1.2
external/bsd/libevent/dist/bufferevent_pair.c up to 1.1.1.1
external/bsd/libevent/dist/bufferevent_sock.c up to 1.1.1.1
external/bsd/libevent/dist/compile up to 1.1.1.1
external/bsd/libevent/dist/config.guess up to 1.1.1.1
external/bsd/libevent/dist/config.h.in up to 1.1.1.1
external/bsd/libevent/dist/config.sub up to 1.1.1.1
external/bsd/libevent/dist/configure up to 1.1.1.1
external/bsd/libevent/dist/configure.ac up to 1.1.1.1
external/bsd/libevent/dist/m4/ac_backport_259_ssizet.m4 up to 1.1.1.1
external/bsd/libevent/dist/depcomp up to 1.1.1.1
external/bsd/libevent/dist/epoll_sub.c up to 1.1.1.1
external/bsd/libevent/dist/evbuffer-internal.h up to 1.2
external/bsd/libevent/dist/evdns.c up to 1.2
external/bsd/libevent/dist/event.c up to 1.2
external/bsd/libevent/dist/event_iocp.c up to 1.1.1.1
external/bsd/libevent/dist/event_tagging.c up to 1.2
external/bsd/libevent/dist/evrpc.c up to 1.2
external/bsd/libevent/dist/evthread_win32.c up to 1.1.1.1
external/bsd/libevent/dist/evutil.c up to 1.4
external/bsd/libevent/dist/evutil_rand.c up to 1.2
external/bsd/libevent/dist/http.c up to 1.2
external/bsd/libevent/dist/install-sh up to 1.1.1.1
external/bsd/libevent/dist/listener.c up to 1.1.1.1
external/bsd/libevent/dist/log-internal.h up to 1.3
external/bsd/libevent/dist/log.c up to 1.2
external/bsd/libevent/dist/ltmain.sh up to 1.1.1.1
external/bsd/libevent/dist/missing up to 1.1.1.1
external/bsd/libevent/dist/util-internal.h up to 1.2
external/bsd/libevent/dist/win32select.c up to 1.1.1.1
external/bsd/libevent/dist/WIN32-Code/event2/event-config.h up to 1.1.1.1
external/bsd/libevent/dist/include/Makefile.in up to 1.1.1.1
external/bsd/libevent/dist/include/event2/buffer.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/buffer_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/bufferevent.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/bufferevent_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/bufferevent_ssl.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/bufferevent_struct.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/dns.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/dns_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/dns_struct.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/event.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/event_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/event_struct.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/http.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/http_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/http_struct.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/keyvalq_struct.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/listener.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/rpc.h up to 1.2
external/bsd/libevent/dist/include/event2/rpc_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/rpc_struct.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/tag.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/tag_compat.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/thread.h up to 1.1.1.1
external/bsd/libevent/dist/include/event2/util.h up to 1.2
external/bsd/libevent/dist/sample/Makefile.in up to 1.1.1.1
external/bsd/libevent/dist/sample/http-server.c up to 1.1.1.1
external/bsd/libevent/dist/test/Makefile.am up to 1.1.1.1
external/bsd/libevent/dist/test/Makefile.in up to 1.1.1.1
external/bsd/libevent/dist/test/regress.c up to 1.7
external/bsd/libevent/dist/test/regress.h up to 1.3
external/bsd/libevent/dist/test/regress_buffer.c up to 1.3
external/bsd/libevent/dist/test/regress_http.c up to 1.3
Update libevent to 2.0.22-stable (5 Jan 2015)
SECURITY FIXES (evbuffers)
o Avoid integer overflow bugs in evbuffer_add() and related functions.
See CVE-2014-6272 advisory for more information.
(20d6d4458bee5d88bda1511c225c25b2d3198d6c)
BUGFIXES (evhttp)
o fix #73 and fix http_connection_fail_test to catch it (crash fix)
(b618204 Greg Hazel)
o Avoid racy bufferevent activation (5eb1788 Nate Rosenblum)
BUGFIXES (resource leaks/lock errors on error)
o Avoid leaking fds on evconnlistener with no callback set (69db261)
o Avoid double-close on getsockname error in evutil_ersatz_socketpair
(0a822a6)
o Fix a locking error in bufferevent_socket_get_dns_error. (0a5eb2e)
o libevent/win32_dealloc() : fix sizeof(pointer) vs sizeof(*pointer)
(b8f5980 Frank Denis)
BUGFIXES: (other stability)
o bufferevent_pair: don't call downcast(NULL) (f2428a2)
o Consistently check for failure from evbuffer_pullup() (60f8f72)
o Fix race caused by event_active (3c7d6fc vjpai)
BUGFIXES (miscellaneous)
o Avoid redundant invocations of init_extension_functions for IOCP (3b77d62)
o Typo fixes from Linus Nordberg (cec62cb, 8cd695b)
o Add a few files created by "make verify" to .gitignore.
(1a8295a Pierre Phaneuf)
o regress_buffer: fix 'memcmp' compare size (79800df Maks Naumov)
o Fix bufferevent setwatermark suspend_read (b34e4ac ufo2243)
o Fix evbuffer_peek() with len==-1 and start_at non-NULL. (fb7e76a)
BUFGIXES (evdns)
o Checking request nameserver for NULL, before using it.
(5c710c0 Belobrov Andrey)
o Fix SEGFAULT after evdns_base_resume if no nameservers installed.
(f8d7df8 Azat Khuzhin)
o Fix a crash in evdns related to shutting down evdns (9f39c88,e8fe749)
BUGFIXES (epoll)
o Check does arch have the epoll_create and __NR_epoll_wait syscalls.
(dfe1e52 Marcin Juszkiewicz)
BUGFIXES (evutil_secure_random)
o Avoid other RNG initialization FS reads when urandom file is specified
(9695e9c, bb52471)
o When we seed from /proc/sys/kernel/random/uuid, count it as success (e35b540)
o Document that arc4random is not a great cryptographic PRNG. (6e49696)
o Add evutil_secure_rng_set_urandom_device_file (2bbb5d7)
o Really remove RNG seeds from the stack (f5ced88)
diffstat:
external/bsd/libevent/dist/ChangeLog | 64 +
external/bsd/libevent/dist/Makefile.am | 3 +-
external/bsd/libevent/dist/Makefile.in | 173 +-
external/bsd/libevent/dist/WIN32-Code/event2/event-config.h | 6 +-
external/bsd/libevent/dist/aclocal.m4 | 360 ++--
external/bsd/libevent/dist/arc4random.c | 58 +-
external/bsd/libevent/dist/buffer.c | 90 +-
external/bsd/libevent/dist/bufferevent.c | 6 +-
external/bsd/libevent/dist/bufferevent_pair.c | 9 +-
external/bsd/libevent/dist/bufferevent_sock.c | 6 +-
external/bsd/libevent/dist/compile | 3 +-
external/bsd/libevent/dist/config.guess | 4 +-
external/bsd/libevent/dist/config.h.in | 5 +-
external/bsd/libevent/dist/config.sub | 11 +-
external/bsd/libevent/dist/configure | 510 +++--
external/bsd/libevent/dist/configure.ac | 821 ++++++++++
external/bsd/libevent/dist/depcomp | 3 +-
external/bsd/libevent/dist/epoll_sub.c | 15 +-
external/bsd/libevent/dist/evbuffer-internal.h | 16 +-
external/bsd/libevent/dist/evdns.c | 52 +-
external/bsd/libevent/dist/event.c | 26 +-
external/bsd/libevent/dist/event_iocp.c | 7 +-
external/bsd/libevent/dist/event_tagging.c | 10 +-
external/bsd/libevent/dist/evrpc.c | 44 +-
external/bsd/libevent/dist/evthread_win32.c | 6 +-
external/bsd/libevent/dist/evutil.c | 20 +-
external/bsd/libevent/dist/evutil_rand.c | 33 +-
external/bsd/libevent/dist/http.c | 15 +-
external/bsd/libevent/dist/include/Makefile.in | 32 +-
external/bsd/libevent/dist/include/event2/buffer.h | 5 +-
external/bsd/libevent/dist/include/event2/buffer_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/bufferevent.h | 9 +-
external/bsd/libevent/dist/include/event2/bufferevent_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/bufferevent_ssl.h | 3 +-
external/bsd/libevent/dist/include/event2/bufferevent_struct.h | 3 +-
external/bsd/libevent/dist/include/event2/dns.h | 5 +-
external/bsd/libevent/dist/include/event2/dns_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/dns_struct.h | 3 +-
external/bsd/libevent/dist/include/event2/event.h | 19 +-
external/bsd/libevent/dist/include/event2/event_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/event_struct.h | 3 +-
external/bsd/libevent/dist/include/event2/http.h | 3 +-
external/bsd/libevent/dist/include/event2/http_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/http_struct.h | 3 +-
external/bsd/libevent/dist/include/event2/keyvalq_struct.h | 3 +-
external/bsd/libevent/dist/include/event2/listener.h | 3 +-
external/bsd/libevent/dist/include/event2/rpc.h | 2 +-
external/bsd/libevent/dist/include/event2/rpc_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/rpc_struct.h | 3 +-
external/bsd/libevent/dist/include/event2/tag.h | 3 +-
external/bsd/libevent/dist/include/event2/tag_compat.h | 3 +-
external/bsd/libevent/dist/include/event2/thread.h | 3 +-
external/bsd/libevent/dist/include/event2/util.h | 50 +-
external/bsd/libevent/dist/install-sh | 14 +-
external/bsd/libevent/dist/listener.c | 5 +-
external/bsd/libevent/dist/log-internal.h | 6 +-
external/bsd/libevent/dist/log.c | 6 +-
external/bsd/libevent/dist/ltmain.sh | 2 +-
external/bsd/libevent/dist/m4/ac_backport_259_ssizet.m4 | 3 +
external/bsd/libevent/dist/missing | 99 +-
external/bsd/libevent/dist/sample/Makefile.in | 32 +-
external/bsd/libevent/dist/sample/http-server.c | 6 +-
external/bsd/libevent/dist/test/Makefile.am | 11 +-
external/bsd/libevent/dist/test/Makefile.in | 54 +-
external/bsd/libevent/dist/test/regress.c | 6 +-
external/bsd/libevent/dist/test/regress.h | 2 +-
external/bsd/libevent/dist/test/regress_buffer.c | 8 +-
external/bsd/libevent/dist/test/regress_http.c | 22 +-
external/bsd/libevent/dist/util-internal.h | 6 +-
external/bsd/libevent/dist/win32select.c | 6 +-
70 files changed, 2052 insertions(+), 788 deletions(-)
diffs (truncated from 5775 to 300 lines):
diff -r 2b6375591a29 -r 4e1cb879cae8 external/bsd/libevent/dist/ChangeLog
--- a/external/bsd/libevent/dist/ChangeLog Tue Feb 03 08:11:21 2015 +0000
+++ b/external/bsd/libevent/dist/ChangeLog Tue Feb 03 08:23:39 2015 +0000
@@ -1,3 +1,67 @@
+Changes in version 2.0.22-stable (5 Jan 2015)
+
+SECURITY FIXES (evbuffers)
+ o Avoid integer overflow bugs in evbuffer_add() and related functions. See CVE-2014-6272 advisory for more information. (20d6d4458bee5d88bda1511c225c25b2d3198d6c)
+
+BUGFIXES (evhttp)
+ o fix #73 and fix http_connection_fail_test to catch it (crash fix) (b618204 Greg Hazel)
+ o Avoid racy bufferevent activation (5eb1788 Nate Rosenblum)
+
+BUGFIXES (compilation and portability)
+ o Fix compilation with WIN32_HAVE_CONDITION_VARIABLES enabled (7e45739)
+ o Fix missing AC_PROG_SED on older Autoconfs (9ab2b3f Tay Ray Chuan)
+ o Backport libevent to vanilla Autoconf 2.59 (as used in RHEL5) (74d4c44 Kevin Bowling)
+ o Use AC_CONFIG_HEADERS in place of AM_CONFIG_HEADERS for autmake 1.13 compat (817ea36)
+ o Rename configure.in to configure.ac to appease newer autoconfs (0c79787)
+ o Avoid using top_srcdir in TESTS: new automakes do not like this (a55514e)
+ o Use windows vsnprintf fixup logic on all windows environments (e826f19)
+ o Fix a compiler warning when checking for arc4random_buf linker breakage. (5cb3865)
+ o Fix another arc4random_buf-related warning (e64a2b0)
+ o Add -Qunused-arguments for clang on macos (b56611d Trond Norbye)
+
+BUGFIXES (resource leaks/lock errors on error)
+ o Avoid leaking fds on evconnlistener with no callback set (69db261)
+ o Avoid double-close on getsockname error in evutil_ersatz_socketpair (0a822a6)
+ o Fix a locking error in bufferevent_socket_get_dns_error. (0a5eb2e)
+ o libevent/win32_dealloc() : fix sizeof(pointer) vs sizeof(*pointer) (b8f5980 Frank Denis)
+
+BUGFIXES: (other stability)
+ o bufferevent_pair: don't call downcast(NULL) (f2428a2)
+ o Consistently check for failure from evbuffer_pullup() (60f8f72)
+ o Fix race caused by event_active (3c7d6fc vjpai)
+
+BUGFIXES (miscellaneous)
+ o Avoid redundant invocations of init_extension_functions for IOCP (3b77d62)
+ o Typo fixes from Linus Nordberg (cec62cb, 8cd695b)
+ o Add a few files created by "make verify" to .gitignore. (1a8295a Pierre Phaneuf)
+ o regress_buffer: fix 'memcmp' compare size (79800df Maks Naumov)
+ o Fix bufferevent setwatermark suspend_read (b34e4ac ufo2243)
+ o Fix evbuffer_peek() with len==-1 and start_at non-NULL. (fb7e76a)
+
+BUFGIXES (evdns)
+ o Checking request nameserver for NULL, before using it. (5c710c0 Belobrov Andrey)
+ o Fix SEGFAULT after evdns_base_resume if no nameservers installed. (f8d7df8 Azat Khuzhin)
+ o Fix a crash in evdns related to shutting down evdns (9f39c88,e8fe749)
+
+BUGFIXES (epoll)
+ o Check does arch have the epoll_create and __NR_epoll_wait syscalls. (dfe1e52 Marcin Juszkiewicz)
+
+BUGFIXES (evutil_secure_random)
+ o Avoid other RNG initialization FS reads when urandom file is specified (9695e9c, bb52471)
+ o When we seed from /proc/sys/kernel/random/uuid, count it as success (e35b540)
+ o Document that arc4random is not a great cryptographic PRNG. (6e49696)
+ o Add evutil_secure_rng_set_urandom_device_file (2bbb5d7)
+ o Really remove RNG seeds from the stack (f5ced88)
+
+
+DOCUMENTATION FIXES
+ o Fix a mistake in evbuffer_remove() arguments in example http server code (c322c20 Gyepi Sam)
+ o Fix a typo in a comment in buffer.h. Spotted by Alt_F4 (773b0a5)
+ o Clarify event_base_loop exit conditions (031a803)
+ o Use FindClose for handle from FindFirstFile in http-server.c (6466e88)
+ o Fix a typo in a doxygen comment. Reported by 亦�. (be1aeff)
+
+
Changes in version 2.0.21-stable (18 Nov 2012)
BUGFIXES:
o ssl: Don't discard SSL read event when timeout and read come close together (576b29f)
diff -r 2b6375591a29 -r 4e1cb879cae8 external/bsd/libevent/dist/Makefile.am
--- a/external/bsd/libevent/dist/Makefile.am Tue Feb 03 08:11:21 2015 +0000
+++ b/external/bsd/libevent/dist/Makefile.am Tue Feb 03 08:23:39 2015 +0000
@@ -38,7 +38,7 @@
#
# Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES
# UNLESS YOU REALLY REALLY HAVE TO.
-VERSION_INFO = 6:9:1
+VERSION_INFO = 6:10:1
# History: RELEASE VERSION_INFO
# 2.0.1-alpha -- 2.0 1:0:0
@@ -62,6 +62,7 @@
# 2.0.19-stable-- 2.0 6:7:1 (No ABI change)
# 2.0.20-stable-- 2.0 6:8:1 (No ABI change)
# 2.0.21-stable-- 2.0 6:9:1 (No ABI change)
+# 2.0.22-stable-- 2.0 6:10:1 (No ABI change)
#
# For Libevent 2.1:
# 2.1.1-alpha -- 2.1 1:0:0
diff -r 2b6375591a29 -r 4e1cb879cae8 external/bsd/libevent/dist/Makefile.in
--- a/external/bsd/libevent/dist/Makefile.in Tue Feb 03 08:11:21 2015 +0000
+++ b/external/bsd/libevent/dist/Makefile.in Tue Feb 03 08:23:39 2015 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -82,10 +81,11 @@
ChangeLog compile config.guess config.sub depcomp epoll_sub.c \
install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_backport_259_ssizet.m4 \
+ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -261,9 +261,10 @@
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+ cscope distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -274,6 +275,7 @@
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -301,6 +303,7 @@
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -674,21 +677,25 @@
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(noinst_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
libevent.la: $(libevent_la_OBJECTS) $(libevent_la_DEPENDENCIES) $(EXTRA_libevent_la_DEPENDENCIES)
$(libevent_la_LINK) $(am_libevent_la_rpath) $(libevent_la_OBJECTS) $(libevent_la_LIBADD) $(LIBS)
libevent_core.la: $(libevent_core_la_OBJECTS) $(libevent_core_la_DEPENDENCIES) $(EXTRA_libevent_core_la_DEPENDENCIES)
@@ -848,12 +855,12 @@
dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -863,7 +870,11 @@
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -877,37 +888,6 @@
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -916,6 +896,10 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
+cscopelist-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -979,8 +963,32 @@
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+
+clean-cscope:
+ -rm -f cscope.files
+
+cscope.files: clean-cscope cscopelist-recursive cscopelist
+
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
Home |
Main Index |
Thread Index |
Old Index