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.

svn:r400

diff --git a/Makefile.am b/Makefile.am
index f88f8a10378cf5cfc11e0464f5af385fb98970a0..659074a3a28ff4a0d9edfc77f1f3ad27bb449abc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,11 +48,11 @@ libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
 
 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 = *~

diff --git a/sample/Makefile.am b/sample/Makefile.am
index d4a113ce9ef0275bce9171a96fbae0855053daba..1de7e724fd127d65e08dd85cdad8ecc9879e706e 100644 (file)
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -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
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 39849fca6e0c47056ee54edac0a62a5c3e0433ae..ed07483677b310542e275c095f57097cd2825007 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -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 @@ regress_SOURCES = regress.c regress.h regress_http.c regress_dns.c \
 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