speechd-discuss
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/8] clean up Makefile for c api


From: William Hubbs
Subject: [PATCH 1/8] clean up Makefile for c api
Date: Sun, 19 Sep 2010 00:50:18 -0500

- remove assignment of LOCALEDIR since it is assigned in configure.ac.
- remove use of localedir since it is not needed by the API.
- define the header to install correctly using include_HEADERS.
- separate AM_CFLAGS into libspeechd_la_CFLAGS and libspeechd_la_CPPFLAGS
- convert autoconf substitutions to make variables
- move thread library reference to libspeechd_la_libadd line
---
 src/api/c/Makefile.am |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)
 rewrite src/api/c/Makefile.am (78%)

diff --git a/src/api/c/Makefile.am b/src/api/c/Makefile.am
dissimilarity index 78%
index d763655..dfae91b 100644
--- a/src/api/c/Makefile.am
+++ b/src/api/c/Makefile.am
@@ -1,13 +1,11 @@
-
-localedir = $(datadir)/locale
-inc_local = "-I$(top_srcdir)/include/"
-
-AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE 
-I/usr/include/ $(inc_local) $(GLIB_CFLAGS) 
-DSPD_SPAWN_CMD=\""@prefix@/bin/speech-dispatcher"\"
-
-lib_LTLIBRARIES = libspeechd.la
-libspeechd_la_SOURCES = libspeechd.c
-libspeechd_la_HEADERS = libspeechd.h
-libspeechd_ladir = $(includedir)
-libspeechd_la_LDFLAGS = -version-info 
@LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@ -lpthread
-libspeechd_la_LIBADD = $(GLIB_LIBS)
-
+## Process this file with automake to produce Makefile.in
+
+include_HEADERS = libspeechd.h
+inc_local = "-I$(top_srcdir)/include/"
+
+lib_LTLIBRARIES = libspeechd.la
+libspeechd_la_SOURCES = libspeechd.c
+libspeechd_la_CFLAGS = $(ERROR_CFLAGS)
+libspeechd_la_CPPFLAGS = -D_GNU_SOURCE $(inc_local) $(GLIB_CFLAGS) 
-DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\"
+libspeechd_la_LDFLAGS = -version-info 
$(LIB_SPD_CURRENT):$(LIB_SPD_REVISION):$(LIB_SPD_AGE)
+libspeechd_la_LIBADD = $(GLIB_LIBS) -lpthread
-- 
1.7.2.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]