Move include/espeak{-ng => }/speak_lib.h.

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:

src/espeak-ng.c

@@ -28,8 +28,8 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "speak_lib.h"
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 extern void strncpy0(char *to, const char *from, int size);
 extern int utf8_in(int *c, const char *buf);

src/include/espeak-ng/espeak_ng.h

@@ -19,7 +19,7 @@
 #ifndef ESPEAK_NG_H
 #define ESPEAK_NG_H
 
-#include "speak_lib.h"
+#include <espeak/speak_lib.h>
 
 #ifdef __cplusplus
 extern "C"

src/libespeak-ng/compiledata.c

@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#include "speak_lib.h"
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "error.h"
 #include "speech.h"

src/libespeak-ng/compiledict.c

@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "error.h"
 #include "speech.h"

src/libespeak-ng/compilembrola.c

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #endif
 
-#include "speak_lib.h"
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "error.h"
 #include "phoneme.h"

src/libespeak-ng/dictionary.c

@@ -30,8 +30,8 @@
 #include <wctype.h>
 #include <wchar.h>
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/error.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
 
 #include "error.h"
 #include "speech.h"

src/libespeak-ng/espeak_api.c

@@ -20,8 +20,8 @@
 
 #include "config.h"
 
-#include "speak_lib.h"
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include <stdlib.h>
 #if HAVE_STDINT_H

src/libespeak-ng/espeak_command.c

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
 
 #include "speech.h"
 #include "espeak_command.h"

src/libespeak-ng/espeak_command.h

@@ -22,7 +22,6 @@
 #ifndef PLATFORM_WINDOWS
 #include <unistd.h>
 #endif
-#include "speak_lib.h"
 
 #ifdef __cplusplus
 extern "C"

src/libespeak-ng/event.c

@@ -32,9 +32,10 @@
 #include <errno.h>
 #include <stdbool.h>
 
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
+
 #include "speech.h"
-#include "espeak_ng.h"
-#include "speak_lib.h"
 #include "event.h"
 #include "wave.h"
 

src/libespeak-ng/event.h

@@ -39,8 +39,6 @@
 
  */
 
-#include "speak_lib.h"
-
 #ifdef __cplusplus
 extern "C"
 {

src/libespeak-ng/fifo.c

@@ -33,7 +33,7 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "espeak_ng.h"
+#include <espeak-ng/espeak_ng.h>
 
 #include "speech.h"
 #include "fifo.h"

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"

src/libespeak-ng/intonation.c

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/klatt.c

@@ -33,8 +33,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "klatt.h"

src/libespeak-ng/numbers.c

@@ -31,8 +31,8 @@
 #include <wctype.h>
 #include <wchar.h>
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/phonemelist.c

@@ -26,8 +26,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/readclause.c

@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/setlengths.c

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/spect.c

@@ -25,8 +25,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/speech.c

@@ -41,8 +41,8 @@
 #include <unistd.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "phoneme.h"
 #include "synthesize.h"

src/libespeak-ng/synth_mbrola.c

@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/synthdata.c

@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "error.h"
 #include "speech.h"

src/libespeak-ng/synthesize.c

@@ -29,8 +29,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/tr_languages.c

@@ -31,8 +31,8 @@
 
 #include <wctype.h>
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/translate.c

@@ -30,8 +30,8 @@
 #include <wctype.h>
 #include <wchar.h>
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/libespeak-ng/voices.c

@@ -36,8 +36,8 @@
 #include "dirent.h"
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "phoneme.h"
 #include "synthesize.h"

src/libespeak-ng/wavegen.c

@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "speech.h"
 #include "phoneme.h"

src/speak-ng.c

@@ -46,8 +46,8 @@
 #include <locale.h>
 #include <sys/stat.h>
 
-#include "espeak_ng.h"
-#include "speak_lib.h"
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
 
 #include "phoneme.h"
 #include "synthesize.h"