diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-07-30 23:32:53 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-07-30 23:33:45 +0200 |
| commit | 3ff2cbc892ce2d6aa01a986963f8437b8070b085 (patch) | |
| tree | 84efdd2a7462daad3d2ea79bbeea647ad4f67ce9 /deps/uv/Makefile.am | |
| parent | 4cc57b4aca65ea86f4e42ddaeadfa796db239719 (diff) | |
| download | android-node-v8-3ff2cbc892ce2d6aa01a986963f8437b8070b085.tar.gz android-node-v8-3ff2cbc892ce2d6aa01a986963f8437b8070b085.tar.bz2 android-node-v8-3ff2cbc892ce2d6aa01a986963f8437b8070b085.zip | |
deps: upgrade libuv to joyent/libuv@4bdb7d8
Non-release upgrade so pending patches can land.
Diffstat (limited to 'deps/uv/Makefile.am')
| -rw-r--r-- | deps/uv/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/deps/uv/Makefile.am b/deps/uv/Makefile.am index d1884fe822..8101110d53 100644 --- a/deps/uv/Makefile.am +++ b/deps/uv/Makefile.am @@ -200,24 +200,26 @@ endif if DTRACE_NEEDS_OBJECTS libuv_la_SOURCES += src/unix/uv-dtrace.d libuv_la_DEPENDENCIES = src/unix/uv-dtrace.o -libuv_la_LIBADD = src/unix/uv-dtrace.lo +libuv_la_LIBADD = uv-dtrace.lo CLEANFILES += src/unix/uv-dtrace.o src/unix/uv-dtrace.lo endif SUFFIXES = .d include/uv-dtrace.h: src/unix/uv-dtrace.d - $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -h -xnolibs -s $< -o $@ + $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -h -xnolibs -s $< -o $(top_srcdir)/$@ src/unix/uv-dtrace.o: src/unix/uv-dtrace.d ${libuv_la_OBJECTS} +# It's ok to specify the output here, because we have 1 .d file, and we process +# every created .o, most projects don't need to include more than one .d .d.o: - $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -G -o $@ -s $< \ - `grep '^pic_object' ${top_builddir}/*.lo | cut -f 2 -d\'` + $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -G -o $(top_builddir)/uv-dtrace.o -s $< \ + `grep '^pic_object' $$(find ${top_builddir} -name "*.lo") | cut -f 2 -d\'` $(AM_V_GEN)printf %s\\n \ - '# $(patsubst %.o, %.lo, $@) - a libtool object file' \ + '# ${top_builddir}/uv-dtrace.lo - a libtool object file' \ '# Generated by libtool (GNU libtool) 2.4' \ '# libtool wants a .lo not a .o' \ "pic_object='uv-dtrace.o'" \ "non_pic_object='uv-dtrace.o'" \ - > $(patsubst %.o, %.lo, $@) + > ${top_builddir}/uv-dtrace.lo |