Update Makefiles.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 399a069..1ba71f5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,4 @@
AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion
-#AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion -D_DEBUG
lib_LTLIBRARIES = libmarisa.la
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 575690d..ee6edea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion -D_DEBUG -I${top_srcdir}/lib
+AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion -D_DEBUG -I$(top_srcdir)/lib
TESTS = \
base-test \
@@ -12,16 +12,16 @@
noinst_HEADERS = marisa-assert.h
base_test_SOURCES = base-test.cc
-base_test_LDADD = ../lib/libmarisa.la
+base_test_LDADD = $(top_srcdir)/lib/libmarisa.la
io_test_SOURCES = io-test.cc
-io_test_LDADD = ../lib/libmarisa.la
+io_test_LDADD = $(top_srcdir)/lib/libmarisa.la
vector_test_SOURCES = vector-test.cc
-vector_test_LDADD = ../lib/libmarisa.la
+vector_test_LDADD = $(top_srcdir)/lib/libmarisa.la
trie_test_SOURCES = trie-test.cc
-trie_test_LDADD = ../lib/libmarisa.la
+trie_test_LDADD = $(top_srcdir)/lib/libmarisa.la
marisa_test_SOURCES = marisa-test.cc
-marisa_test_LDADD = ../lib/libmarisa.la
+marisa_test_LDADD = $(top_srcdir)/lib/libmarisa.la
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4d38356..ff6abb6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,4 @@
-AM_CFLAGS = -Wall -Wextra -Wconversion
-AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion -I${top_srcdir}/lib
-#AM_CXXFLAGS = -Wall -Weffc++ -Wextra -D_DEBUG -I${top_srcdir}/lib
+AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion -I$(top_srcdir)/lib
noinst_LTLIBRARIES = libcmdopt.la
@@ -18,22 +16,22 @@
marisa-benchmark
marisa_build_SOURCES = marisa-build.cc
-marisa_build_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_build_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
marisa_lookup_SOURCES = marisa-lookup.cc
-marisa_lookup_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_lookup_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
marisa_reverse_lookup_SOURCES = marisa-reverse-lookup.cc
-marisa_reverse_lookup_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_reverse_lookup_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
marisa_common_prefix_search_SOURCES = marisa-common-prefix-search.cc
-marisa_common_prefix_search_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_common_prefix_search_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
marisa_predictive_search_SOURCES = marisa-predictive-search.cc
-marisa_predictive_search_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_predictive_search_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
marisa_dump_SOURCES = marisa-dump.cc
-marisa_dump_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_dump_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
marisa_benchmark_SOURCES = marisa-benchmark.cc
-marisa_benchmark_LDADD = ../lib/libmarisa.la libcmdopt.la
+marisa_benchmark_LDADD = $(top_srcdir)/lib/libmarisa.la libcmdopt.la
