From 72db232ec3ee3743b842ace4e16ba6254c6a0c02 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Mon, 4 Jan 2016 19:45:23 +0000 Subject: [PATCH] Move include/espeak{-ng => }/speak_lib.h. --- Makefile.am | 16 ++++++++++------ src/espeak-ng.c | 4 ++-- src/include/espeak-ng/espeak_ng.h | 2 +- src/include/{espeak-ng => espeak}/speak_lib.h | 0 src/libespeak-ng/compiledata.c | 4 ++-- src/libespeak-ng/compiledict.c | 4 ++-- src/libespeak-ng/compilembrola.c | 4 ++-- src/libespeak-ng/dictionary.c | 4 ++-- src/libespeak-ng/error.c | 2 +- src/libespeak-ng/espeak_api.c | 4 ++-- src/libespeak-ng/espeak_command.c | 2 +- src/libespeak-ng/espeak_command.h | 1 - src/libespeak-ng/event.c | 5 +++-- src/libespeak-ng/event.h | 2 -- src/libespeak-ng/fifo.c | 2 +- src/libespeak-ng/fifo.h | 1 - src/libespeak-ng/intonation.c | 4 ++-- src/libespeak-ng/klatt.c | 4 ++-- src/libespeak-ng/numbers.c | 4 ++-- src/libespeak-ng/phonemelist.c | 4 ++-- src/libespeak-ng/readclause.c | 4 ++-- src/libespeak-ng/setlengths.c | 4 ++-- src/libespeak-ng/spect.c | 4 ++-- src/libespeak-ng/speech.c | 4 ++-- src/libespeak-ng/synth_mbrola.c | 4 ++-- src/libespeak-ng/synthdata.c | 4 ++-- src/libespeak-ng/synthesize.c | 4 ++-- src/libespeak-ng/tr_languages.c | 4 ++-- src/libespeak-ng/translate.c | 4 ++-- src/libespeak-ng/voices.c | 4 ++-- src/libespeak-ng/wavegen.c | 4 ++-- src/speak-ng.c | 4 ++-- 32 files changed, 61 insertions(+), 60 deletions(-) rename src/include/{espeak-ng => espeak}/speak_lib.h (100%) diff --git a/Makefile.am b/Makefile.am index 0bea26d1..ba0b7fba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,14 +84,18 @@ docs: docs/index.html \ ##### build targets: -libespeak_ng_includedir = $(includedir)/espeak-ng -libespeak_ng_include_HEADERS = \ - src/include/espeak-ng/speak_lib.h +espeak_includedir = $(includedir)/espeak +espeak_include_HEADERS = \ + src/include/espeak/speak_lib.h + +espeak_ng_includedir = $(includedir)/espeak-ng +espeak_ng_include_HEADERS = \ + src/include/espeak-ng/espeak_ng.h lib_LTLIBRARIES += src/libespeak-ng.la src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lpthread -lm -src_libespeak_ng_la_CFLAGS = -Isrc/include/espeak-ng \ +src_libespeak_ng_la_CFLAGS = -Isrc/include \ -fPIC -fvisibility=hidden -D _BSD_SOURCE -D _POSIX_C_SOURCE=200112L \ -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\" src_libespeak_ng_la_SOURCES = \ @@ -170,7 +174,7 @@ endif src_speak_ng_LDADD = src/libespeak-ng.la src_speak_ng_LDFLAGS = -static -src_speak_ng_CFLAGS = -Isrc/libespeak-ng -Isrc/include/espeak-ng -D _POSIX_C_SOURCE=200112L +src_speak_ng_CFLAGS = -Isrc/libespeak-ng -Isrc/include -D _POSIX_C_SOURCE=200112L src_speak_ng_SOURCES = src/speak-ng.c bin_PROGRAMS += src/espeak-ng @@ -180,7 +184,7 @@ man1_MANS += src/espeak-ng.1 endif src_espeak_ng_LDADD = src/libespeak-ng.la -src_espeak_ng_CFLAGS = -Isrc/include/espeak-ng +src_espeak_ng_CFLAGS = -Isrc/include src_espeak_ng_SOURCES = src/espeak-ng.c ##### phoneme data: diff --git a/src/espeak-ng.c b/src/espeak-ng.c index ef27493a..f67356a4 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -28,8 +28,8 @@ #include #include -#include "speak_lib.h" -#include "espeak_ng.h" +#include +#include extern void strncpy0(char *to, const char *from, int size); extern int utf8_in(int *c, const char *buf); diff --git a/src/include/espeak-ng/espeak_ng.h b/src/include/espeak-ng/espeak_ng.h index e270fcb2..149001ac 100644 --- a/src/include/espeak-ng/espeak_ng.h +++ b/src/include/espeak-ng/espeak_ng.h @@ -19,7 +19,7 @@ #ifndef ESPEAK_NG_H #define ESPEAK_NG_H -#include "speak_lib.h" +#include #ifdef __cplusplus extern "C" diff --git a/src/include/espeak-ng/speak_lib.h b/src/include/espeak/speak_lib.h similarity index 100% rename from src/include/espeak-ng/speak_lib.h rename to src/include/espeak/speak_lib.h diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index dac100d6..7fe31089 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -30,8 +30,8 @@ #include #endif -#include "speak_lib.h" -#include "espeak_ng.h" +#include +#include #include "error.h" #include "speech.h" diff --git a/src/libespeak-ng/compiledict.c b/src/libespeak-ng/compiledict.c index 237af92d..3de555d2 100644 --- a/src/libespeak-ng/compiledict.c +++ b/src/libespeak-ng/compiledict.c @@ -30,8 +30,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "error.h" #include "speech.h" diff --git a/src/libespeak-ng/compilembrola.c b/src/libespeak-ng/compilembrola.c index 24a93643..bac34120 100644 --- a/src/libespeak-ng/compilembrola.c +++ b/src/libespeak-ng/compilembrola.c @@ -27,8 +27,8 @@ #include #endif -#include "speak_lib.h" -#include "espeak_ng.h" +#include +#include #include "error.h" #include "phoneme.h" diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c index 1a03c17e..1784eb7e 100644 --- a/src/libespeak-ng/dictionary.c +++ b/src/libespeak-ng/dictionary.c @@ -30,8 +30,8 @@ #include #include -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/error.c b/src/libespeak-ng/error.c index 662c85e7..467cbac0 100644 --- a/src/libespeak-ng/error.c +++ b/src/libespeak-ng/error.c @@ -26,7 +26,7 @@ #include #include -#include "espeak_ng.h" +#include #include "error.h" #include "speech.h" diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c index c6ce7b39..50b3704b 100644 --- a/src/libespeak-ng/espeak_api.c +++ b/src/libespeak-ng/espeak_api.c @@ -20,8 +20,8 @@ #include "config.h" -#include "speak_lib.h" -#include "espeak_ng.h" +#include +#include #include #if HAVE_STDINT_H diff --git a/src/libespeak-ng/espeak_command.c b/src/libespeak-ng/espeak_command.c index 90d7b965..67355a95 100644 --- a/src/libespeak-ng/espeak_command.c +++ b/src/libespeak-ng/espeak_command.c @@ -18,7 +18,7 @@ #include "config.h" -#include "espeak_ng.h" +#include #include "speech.h" #include "espeak_command.h" diff --git a/src/libespeak-ng/espeak_command.h b/src/libespeak-ng/espeak_command.h index f8cd94ca..aa710672 100644 --- a/src/libespeak-ng/espeak_command.h +++ b/src/libespeak-ng/espeak_command.h @@ -22,7 +22,6 @@ #ifndef PLATFORM_WINDOWS #include #endif -#include "speak_lib.h" #ifdef __cplusplus extern "C" diff --git a/src/libespeak-ng/event.c b/src/libespeak-ng/event.c index 15a960a4..18d30dd8 100644 --- a/src/libespeak-ng/event.c +++ b/src/libespeak-ng/event.c @@ -32,9 +32,10 @@ #include #include +#include +#include + #include "speech.h" -#include "espeak_ng.h" -#include "speak_lib.h" #include "event.h" #include "wave.h" diff --git a/src/libespeak-ng/event.h b/src/libespeak-ng/event.h index c80ecf5c..0cf43a67 100644 --- a/src/libespeak-ng/event.h +++ b/src/libespeak-ng/event.h @@ -39,8 +39,6 @@ */ -#include "speak_lib.h" - #ifdef __cplusplus extern "C" { diff --git a/src/libespeak-ng/fifo.c b/src/libespeak-ng/fifo.c index a01104c6..4f48c37d 100644 --- a/src/libespeak-ng/fifo.c +++ b/src/libespeak-ng/fifo.c @@ -33,7 +33,7 @@ #include #include -#include "espeak_ng.h" +#include #include "speech.h" #include "fifo.h" diff --git a/src/libespeak-ng/fifo.h b/src/libespeak-ng/fifo.h index 7fcab180..a1e5937c 100644 --- a/src/libespeak-ng/fifo.h +++ b/src/libespeak-ng/fifo.h @@ -23,7 +23,6 @@ // and run them asynchronously. #include "espeak_command.h" -#include "speak_lib.h" #ifdef __cplusplus extern "C" diff --git a/src/libespeak-ng/intonation.c b/src/libespeak-ng/intonation.c index 8b4d99ec..1fcc9b47 100644 --- a/src/libespeak-ng/intonation.c +++ b/src/libespeak-ng/intonation.c @@ -27,8 +27,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/klatt.c b/src/libespeak-ng/klatt.c index 87656923..0799f7da 100644 --- a/src/libespeak-ng/klatt.c +++ b/src/libespeak-ng/klatt.c @@ -33,8 +33,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "klatt.h" diff --git a/src/libespeak-ng/numbers.c b/src/libespeak-ng/numbers.c index dfa0447a..2a3029cd 100644 --- a/src/libespeak-ng/numbers.c +++ b/src/libespeak-ng/numbers.c @@ -31,8 +31,8 @@ #include #include -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/phonemelist.c b/src/libespeak-ng/phonemelist.c index f163fd91..97d107b5 100644 --- a/src/libespeak-ng/phonemelist.c +++ b/src/libespeak-ng/phonemelist.c @@ -26,8 +26,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/readclause.c b/src/libespeak-ng/readclause.c index 8e3288a3..0aab3188 100644 --- a/src/libespeak-ng/readclause.c +++ b/src/libespeak-ng/readclause.c @@ -30,8 +30,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/setlengths.c b/src/libespeak-ng/setlengths.c index 1f8b802e..7ba51e3b 100644 --- a/src/libespeak-ng/setlengths.c +++ b/src/libespeak-ng/setlengths.c @@ -27,8 +27,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/spect.c b/src/libespeak-ng/spect.c index 18172c70..183e668c 100644 --- a/src/libespeak-ng/spect.c +++ b/src/libespeak-ng/spect.c @@ -25,8 +25,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index e23544c0..a130d9a2 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -41,8 +41,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "phoneme.h" #include "synthesize.h" diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c index 6716757d..d6a39f83 100644 --- a/src/libespeak-ng/synth_mbrola.c +++ b/src/libespeak-ng/synth_mbrola.c @@ -30,8 +30,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c index 1ab8943f..e916fd20 100644 --- a/src/libespeak-ng/synthdata.c +++ b/src/libespeak-ng/synthdata.c @@ -30,8 +30,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "error.h" #include "speech.h" diff --git a/src/libespeak-ng/synthesize.c b/src/libespeak-ng/synthesize.c index 0692cca3..71418384 100644 --- a/src/libespeak-ng/synthesize.c +++ b/src/libespeak-ng/synthesize.c @@ -29,8 +29,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c index 59169c4c..adad2942 100644 --- a/src/libespeak-ng/tr_languages.c +++ b/src/libespeak-ng/tr_languages.c @@ -31,8 +31,8 @@ #include -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index 74a98c8c..7cf1b72f 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -30,8 +30,8 @@ #include #include -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 6cbd26ba..9340505b 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -36,8 +36,8 @@ #include "dirent.h" #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "phoneme.h" #include "synthesize.h" diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c index 6809f28e..73412748 100644 --- a/src/libespeak-ng/wavegen.c +++ b/src/libespeak-ng/wavegen.c @@ -30,8 +30,8 @@ #include #endif -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "speech.h" #include "phoneme.h" diff --git a/src/speak-ng.c b/src/speak-ng.c index c717f562..60f89de6 100644 --- a/src/speak-ng.c +++ b/src/speak-ng.c @@ -46,8 +46,8 @@ #include #include -#include "espeak_ng.h" -#include "speak_lib.h" +#include +#include #include "phoneme.h" #include "synthesize.h"