Fix dependencies so that make -j works

Also bump ready for a 2.6 tag.
facebook · Jun 9, 2013 · d335591 · d335591
1 parent 57e83b2
commit d335591
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -4,7 +4,7 @@ doc_DATA = README.markdown
 docdir = ${prefix}/share/doc/watchman-$(VERSION)
 
 THIRDPARTY_CPPFLAGS = -I$(top_srcdir)/thirdparty/jansson -I$(top_builddir)/thirdparty/jansson
-JSON_LIB = -L. -lwmanjson
+JSON_LIB = -L. libwmanjson.a
 
 watchman_CPPFLAGS = $(THIRDPARTY_CPPFLAGS) @IRONMANCFLAGS@
 watchman_LDADD = $(JSON_LIB)
@@ -72,7 +72,7 @@ libwmanjson_a_SOURCES = \
 # bundled testing library
 libtap_a_CPPFLAGS = $(THIRDPARTY_CPPFLAGS)
 libtap_a_SOURCES = thirdparty/tap.c
-TAP_LIB = -ltap
+TAP_LIB = libtap.a
 
 # unit tests
 TESTS = tests/argv.t tests/log.t tests/bser.t

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([watchman], [2.5], [], [watchman])
+AC_INIT([watchman], [2.6], [], [watchman])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])