This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h
Signed-off-by: Daniel Martí mvdan@mvdan.cc --- external/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/external/Makefile b/external/Makefile index bce8d83..7a9f637 100644 --- a/external/Makefile +++ b/external/Makefile @@ -116,6 +116,8 @@ openssl-clean: # libevent
libevent/Makefile: + sed -i 's@(SUBDIRS = . include) sample test@\1@' libevent/Makefile.am + sed -i 's@(AC_OUTPUT(Makefile include/Makefile) test/Makefile sample/Makefile)@\1)@' libevent/configure.in cd libevent && ./autogen.sh cp config.sub libevent cp config.guess libevent @@ -126,7 +128,7 @@ libevent/Makefile: --disable-shared
libevent-build-stamp: libevent/Makefile - $(MAKE) -C libevent all-am + $(MAKE) -C libevent ./include/event2/event-config.h all-am touch libevent-build-stamp
libevent: openssl libevent-build-stamp
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On 03/27/2014 12:30 PM, Daniel Martí wrote:
This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h
Thanks. Will review and integrate shortly.
On Thu, Mar 27, 2014 at 13:41:21 -0400, Nathan Freitas wrote:
On 03/27/2014 12:30 PM, Daniel Martí wrote:
This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h
Thanks. Will review and integrate shortly.
Great, thanks!
Make sure to clean and reset the submodules completely, since your chaning of the target 'all' for 'all-am' on libevent should have definitely broken your build. It didn't, so I'm thinking that your external/libevent/include/event2/event-config.h was kept there between test builds.
-
Daniel Martí -
Nathan Freitas