From e1eae8d1c2578f476c51cc2ebf332fb4c5d10bba Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Sat, 2 Nov 2013 22:14:50 -0400 Subject: [PATCH] Properly rebuild libssh and msgpack if needed --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index cf3105ab..965cd676 100644 --- a/Makefile.am +++ b/Makefile.am @@ -254,9 +254,11 @@ tmate_slave_LDADD = \ *.c: $(tmate_slave_LDADD) libssh/build/src/libssh.a: - cd libssh/build && cmake .. -DWITH_SFTP=OFF -DWITH_SERVER=ON -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON -DWITH_GSSAPI=OFF + cd libssh/build; ([ -f Makefile ] || cmake .. -DWITH_SFTP=OFF -DWITH_SERVER=ON -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON -DWITH_GSSAPI=OFF) +make -C libssh/build ssh_static msgpack/src/.libs/libmsgpackc.a: - cd msgpack && ./bootstrap && ./configure + cd msgpack; ([ -f Makefile ] || (./bootstrap && ./configure)) +make -C msgpack/src libmsgpackc.la + +.PHONY: libssh/build/src/libssh.a msgpack/src/.libs/libmsgpackc.a