[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/1] do not use the INCLUDES automake variable
From: |
William Hubbs |
Subject: |
[PATCH 1/1] do not use the INCLUDES automake variable |
Date: |
Sun, 19 Sep 2010 13:31:44 -0500 |
According to the automake documentation, this variable is deprecated and
should not be used.
---
src/api/c/Makefile.am | 4 ++--
src/audio/Makefile.am | 4 ++--
src/clients/say/Makefile.am | 4 ++--
src/modules/Makefile.am | 4 ++--
src/server/Makefile.am | 4 ++--
src/tests/Makefile.am | 3 ++-
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/api/c/Makefile.am b/src/api/c/Makefile.am
index cbb132d..0b135f1 100644
--- a/src/api/c/Makefile.am
+++ b/src/api/c/Makefile.am
@@ -1,11 +1,11 @@
## Process this file with automake to produce Makefile.in
include_HEADERS = libspeechd.h
-INCLUDES = -I$(top_srcdir)/include/
+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 $(GLIB_CFLAGS)
-DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\"
+libspeechd_la_CPPFLAGS = $(inc_local) -D_GNU_SOURCE $(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
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 5a4032c..c7f706d 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -1,11 +1,11 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I$(top_srcdir)/include/
+inc_local = -I$(top_srcdir)/include/
include_HEADERS = spd_audio_plugin.h
spdlib_LTLIBRARIES = libsdaudio.la
-libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS)
+libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local)
libsdaudio_la_LDFLAGS = -version-info
$(LIB_SDAUDIO_CURRENT):$(LIB_SDAUDIO_REVISION):$(LIB_SDAUDIO_AGE)
libsdaudio_la_LIBADD = $(GLIB_LIBS) -lpthread $(SPD_AUDIO_LIBS)
libsdaudio_la_SOURCES = spd_audio.c spd_audio.h spd_audio_plugin.h
static_plugins.c
diff --git a/src/clients/say/Makefile.am b/src/clients/say/Makefile.am
index 3a476ea..e32ebbf 100644
--- a/src/clients/say/Makefile.am
+++ b/src/clients/say/Makefile.am
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I$(top_srcdir)/src/api/c
+inc_local = -I$(top_srcdir)/src/api/c
c_api = $(top_builddir)/src/api/c
bin_PROGRAMS = spd-say
-spd_say_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
+spd_say_CPPFLAGS = $(inc_local) -DLOCALEDIR=\"$(localedir)\"
spd_say_SOURCES = say.c options.c options.h
spd_say_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 2970f6e..d0bbe22 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/audio
+inc_local = -I$(top_srcdir)/include -I$(top_srcdir)/src/audio
lib_audio = -L$(top_builddir)/src/audio
AM_CFLAGS = $(ERROR_CFLAGS)
-AM_CPPFLAGS = -DDATADIR=\"$(snddatadir)\" $(DOTCONF_CFLAGS) $(GLIB_CFLAGS)
$(GTHREAD_CFLAGS) $(ibmtts_include) $(SNDFILE_CFLAGS) -D_GNU_SOURCE
+AM_CPPFLAGS = $(inc_local) -DDATADIR=\"$(snddatadir)\" $(DOTCONF_CFLAGS)
$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(ibmtts_include) $(SNDFILE_CFLAGS)
-D_GNU_SOURCE
modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index ea939c8..6da0d56 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,11 +1,11 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I$(top_srcdir)/include/
+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_CFLAGS = $(ERROR_CFLAGS)
-speech_dispatcher_CPPFLAGS = $(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_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)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 8402482..c92b3f4 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,8 +1,9 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I$(top_srcdir)/src/api/c
c_api = $(top_builddir)/src/api/c
+AM_CPPFLAGS = -I$(top_srcdir)/src/api/c
+
bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery
long_message_SOURCES = long_message.c
--
1.7.2.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH 1/1] do not use the INCLUDES automake variable,
William Hubbs <=