[PATCH 7/8] clean up Makefile for server directory

[William Hubbs]

- add a variable that points to the common library and use it in the
  speech_dispatcher_LDADD line.
- remove definition of localedir since it is defined in configure.ac.
- replace autoconf substitutions with make variables.
- split AM_CFLAGS into speach_dispatcher_CFLAGS and
  speech_dispatcher_CPPFLAGS.
---
 src/server/Makefile.am |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 15dc622..6da0d56 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,10 +1,11 @@
+## Process this file with automake to produce Makefile.in
+
+inc_local = -I$(top_srcdir)/include/
+lib_common = $(top_builddir)/src/common/libcommon.la
 
 bin_PROGRAMS = speech-dispatcher
 speech_dispatcher_SOURCES = speechd.c speechd.h server.c server.h history.c 
history.h module.c module.h config.c config.h parse.c parse.h set.c set.h msg.h 
alloc.c alloc.h compare.c compare.h speaking.c speaking.h options.c options.h 
output.c output.h sem_functions.c sem_functions.h index_marking.c 
index_marking.h
-
-speech_dispatcher_LDADD = $(top_builddir)/src/common/libcommon.la 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread 
@EXTRA_SOCKET_LIBS@
-speech_dispatcher_LDFLAGS = @RDYNAMIC@
-
-inc_local = -I$(top_srcdir)/include/
-localedir = $(datadir)/locale
-AM_CFLAGS = @ERROR_CFLAGS@ $(inc_local) -I$(localedir) $(DOTCONF_CFLAGS) 
$(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(GTHREAD_CFLAGS) 
-DSYS_CONF=\"@address@hidden" -DSND_DATA=\"@address@hidden" 
-DMODULEBINDIR=\"@address@hidden" -DVERSION=\"@address@hidden" 
-DPACKAGE=\"@address@hidden" -D_GNU_SOURCE
+speech_dispatcher_CFLAGS = $(ERROR_CFLAGS)
+speech_dispatcher_CPPFLAGS = $(inc_local) $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) 
$(GMODULE_CFLAGS) $(GTHREAD_CFLAGS) -DSYS_CONF=\"$(spdconfdir)\" 
-DSND_DATA=\"$(snddatadir)\" -DMODULEBINDIR=\"$(modulebindir)\" 
-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" -D_GNU_SOURCE
+speech_dispatcher_LDFLAGS = $(RDYNAMIC)
+speech_dispatcher_LDADD = $(lib_common) $(DOTCONF_LIBS) $(GLIB_LIBS) 
$(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread $(EXTRA_SOCKET_LIBS)
-- 
1.7.2.2