| author | Ben Chang <Benjamin.Chang@Oracle.COM> |
| Mon, 02 Jul 2012 11:36:03 -0700 | |
| branch | s11-sru |
| changeset 2304 | ed2401b5b89c |
| parent 209 | 2961eca161ad |
| permissions | -rw-r--r-- |
|
209
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
--- libevent-1.3e/Makefile.in.orig Wed Apr 27 11:58:08 2011 |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
+++ libevent-1.3e/Makefile.in Wed Apr 27 11:58:30 2011 |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
@@ -63,12 +63,11 @@ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
am__DEPENDENCIES_1 = |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
libevent_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
am__libevent_la_SOURCES_DIST = event.c buffer.c evbuffer.c log.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
- event_tagging.c http.c evhttp.h http-internal.h evdns.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
- evdns.h strlcpy.c strlcpy-internal.h WIN32-Code/misc.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
+ event_tagging.c strlcpy.c strlcpy-internal.h WIN32-Code/misc.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
WIN32-Code/win32.c |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
@BUILD_WIN32_TRUE@am__objects_1 = misc.lo win32.lo |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
am_libevent_la_OBJECTS = event.lo buffer.lo evbuffer.lo log.lo \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
- event_tagging.lo http.lo evdns.lo strlcpy.lo $(am__objects_1) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
+ event_tagging.lo strlcpy.lo $(am__objects_1) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
libevent_la_OBJECTS = $(am_libevent_la_OBJECTS) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
libevent_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -105,7 +104,7 @@ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
distclean-recursive maintainer-clean-recursive |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
ETAGS = etags |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
CTAGS = ctags |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
-DIST_SUBDIRS = . sample test |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
+DIST_SUBDIRS = . |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
25 |
distdir = $(PACKAGE)-$(VERSION) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
26 |
top_distdir = $(distdir) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
27 |
@@ -230,11 +229,6 @@ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
28 |
event.3 \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
29 |
kqueue.c epoll_sub.c epoll.c select.c rtsig.c poll.c signal.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
30 |
evport.c devpoll.c event_rpcgen.py \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
31 |
- sample/Makefile.am sample/Makefile.in sample/event-test.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
32 |
- sample/signal-test.c sample/time-test.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
33 |
- test/Makefile.am test/Makefile.in test/bench.c test/regress.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
34 |
- test/test-eof.c test/test-weof.c test/test-time.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
35 |
- test/test-init.c test/test.sh \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
36 |
compat/sys/queue.h compat/sys/tree.h compat/sys/_time.h \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
37 |
WIN32-Code/config.h WIN32-Code/misc.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
38 |
WIN32-Code/win32.c WIN32-Code/misc.h \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
39 |
@@ -244,8 +238,8 @@ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
40 |
WIN32-Prj/time_test/time_test.dsp |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
41 |
|
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
42 |
lib_LTLIBRARIES = libevent.la |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
43 |
-@BUILD_WIN32_FALSE@SUBDIRS = . sample test |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
44 |
-@BUILD_WIN32_TRUE@SUBDIRS = . sample |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
45 |
+@BUILD_WIN32_FALSE@SUBDIRS = . |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
46 |
+@BUILD_WIN32_TRUE@SUBDIRS = . |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
47 |
@BUILD_WIN32_FALSE@SYS_LIBS = |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
48 |
@BUILD_WIN32_TRUE@SYS_LIBS = -lws2_32 |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
49 |
@BUILD_WIN32_FALSE@SYS_SRC = |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
50 |
@@ -253,13 +247,12 @@ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
51 |
@BUILD_WIN32_FALSE@SYS_INCLUDES = |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
52 |
@BUILD_WIN32_TRUE@SYS_INCLUDES = -IWIN32-Code |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
53 |
libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
54 |
- http.c evhttp.h http-internal.h evdns.c evdns.h strlcpy.c \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
55 |
- strlcpy-internal.h strlcpy-internal.h \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
56 |
+ strlcpy.c strlcpy-internal.h strlcpy-internal.h \ |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
57 |
$(SYS_SRC) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
58 |
|
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
59 |
libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
60 |
libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0 |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
61 |
-include_HEADERS = event.h evhttp.h evdns.h |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
62 |
+include_HEADERS = event.h |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
63 |
INCLUDES = -Icompat $(SYS_INCLUDES) |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
64 |
man_MANS = event.3 evdns.3 |
|
2961eca161ad
7040066 move libevent to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
65 |
DISTCLEANFILES = *~ |