[PATCH 8/8] clean up Makefile for tests directory

[William Hubbs]

- remove definition and use of LOCALEDIR since this is not used anywhere
  in the tests
  - change AM_CFLAGS to AM_CPPFLAGS since these flags should really be
        CPPFLAGS
        - replace autoconf substitutions with make variables
---
 src/tests/Makefile.am |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 134cd17..73cafab 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,26 +1,27 @@
+## Process this file with automake to produce Makefile.in
 
-localedir = $(datadir)/locale
+inc_c_api = -I$(top_srcdir)/src/api/c
 inc_local = "-I$(top_srcdir)/include/"
 c_api = $(top_builddir)/src/api/c
 
-AM_CFLAGS = -I$(top_srcdir)/src/api/c -DLOCALEDIR=\"$(localedir)\" $(inc_local)
+AM_CPPFLAGS = $(inc_c_api) $(inc_local)
 
 bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery
 
 long_message_SOURCES = long_message.c
-long_message_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
+long_message_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
 
 clibrary_SOURCES = clibrary.c
-clibrary_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
+clibrary_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
 
 clibrary2_SOURCES = clibrary2.c
-clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
+clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
 
 connection_recovery_SOURCES = connection-recovery.c
-connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread 
@EXTRA_SOCKET_LIBS@
+connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread 
$(EXTRA_SOCKET_LIBS)
 
 run_test_SOURCES = run_test.c
-run_test_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
+run_test_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
 
 EXTRA_DIST= basic.test general.test keys.test priority_progress.test \
             pronunciation.test punctuation.test sound_icons.test spelling.test 
\
-- 
1.7.2.2