[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/8] clean up the Makefile for spd-say
From: |
William Hubbs |
Subject: |
[PATCH 3/8] clean up the Makefile for spd-say |
Date: |
Sun, 19 Sep 2010 00:50:20 -0500 |
- remove assignment for LOCALEDIR since it is assigned in configure.ac.
- move AM_CFLAGS to spd_say_CPPFLAGS.
- add assignment for inc_c_api and use it in spd_say_CPPFLAGS
- replace autoconf substitutions with make variables
---
src/clients/say/Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/clients/say/Makefile.am b/src/clients/say/Makefile.am
index c2fe616..7e5b9c0 100644
--- a/src/clients/say/Makefile.am
+++ b/src/clients/say/Makefile.am
@@ -1,10 +1,10 @@
+## 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 = -DLOCALEDIR=\"$(localedir)\" $(inc_local) -I$(top_srcdir)/src/api/c
-
bin_PROGRAMS = spd-say
+spd_say_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local) $(inc_c_api)
spd_say_SOURCES = say.c options.c options.h
-spd_say_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
+spd_say_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
--
1.7.2.2
- [PATCH 1/8] clean up Makefile for c api, William Hubbs, 2010/09/19
- [PATCH 2/8] clean up Makefile for audio directory, William Hubbs, 2010/09/19
- [PATCH 3/8] clean up the Makefile for spd-say,
William Hubbs <=
- [PATCH 4/8] clean up the Makefile for spdsend, William Hubbs, 2010/09/19
- [PATCH 5/8] clean up the Makefile for the common source directory, William Hubbs, 2010/09/19
- [PATCH 6/8] clean up the Makefile for the modules directory, William Hubbs, 2010/09/19
- [PATCH 7/8] clean up Makefile for server directory, William Hubbs, 2010/09/19
- [PATCH 8/8] clean up Makefile for tests directory, William Hubbs, 2010/09/19
- [PATCH 1/8] clean up Makefile for c api, Andrei Kholodnyi, 2010/09/19