From: <ni...@us...> - 2007-08-20 14:44:18
|
Revision: 400 http://levent.svn.sourceforge.net/levent/?rev=400&view=rev Author: nickm Date: 2007-08-20 07:44:15 -0700 (Mon, 20 Aug 2007) Log Message: ----------- r14699@catbus: nickm | 2007-08-20 10:42:57 -0400 Use $top_srcdir and $srcdir variables to refer to source paths in Makefile.am. This makes it possible to build libevent from a separate directory. Patch from Kelly Anderson. Modified Paths: -------------- trunk/libevent/Makefile.am trunk/libevent/sample/Makefile.am trunk/libevent/test/Makefile.am Property Changed: ---------------- trunk/libevent/ Property changes on: trunk/libevent ___________________________________________________________________ Name: svk:merge - 8246c3cf-6607-4228-993b-4d95d33730f1:/libevent/trunk/libevent:14697 + 8246c3cf-6607-4228-993b-4d95d33730f1:/libevent/trunk/libevent:14699 Modified: trunk/libevent/Makefile.am =================================================================== --- trunk/libevent/Makefile.am 2007-08-19 17:26:02 UTC (rev 399) +++ trunk/libevent/Makefile.am 2007-08-20 14:44:15 UTC (rev 400) @@ -48,11 +48,11 @@ include_HEADERS = event.h evhttp.h evdns.h evrpc.h -INCLUDES = -Icompat $(SYS_INCLUDES) +INCLUDES = -I$(srcdir)/compat $(SYS_INCLUDES) man_MANS = event.3 evdns.3 verify: libevent.la - cd $(srcdir)/test && make verify + cd test && make verify DISTCLEANFILES = *~ Modified: trunk/libevent/sample/Makefile.am =================================================================== --- trunk/libevent/sample/Makefile.am 2007-08-19 17:26:02 UTC (rev 399) +++ trunk/libevent/sample/Makefile.am 2007-08-20 14:44:15 UTC (rev 400) @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies LDADD = ../libevent.la -AM_CFLAGS = -I../compat +AM_CFLAGS = -I$(top_srcdir)/compat noinst_PROGRAMS = event-test time-test signal-test Modified: trunk/libevent/test/Makefile.am =================================================================== --- trunk/libevent/test/Makefile.am 2007-08-19 17:26:02 UTC (rev 399) +++ trunk/libevent/test/Makefile.am 2007-08-20 14:44:15 UTC (rev 400) @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies LDADD = ../libevent.la -CPPFLAGS = -I.. -I../compat +CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat EXTRA_DIST = regress.rpc @@ -18,7 +18,7 @@ bench_SOURCES = bench.c regress.gen.c regress.gen.h: regress.rpc - ../event_rpcgen.py regress.rpc || echo "No Python installed" + $(top_srcdir)/event_rpcgen.py regress.rpc || echo "No Python installed" DISTCLEANFILES = *~ CLEANFILES = regress.gen.h regress.gen.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |