From 1812f8e1905a21517b92f3dbe6bfe46ada3d167d Mon Sep 17 00:00:00 2001
From: Alexander Epaneshnikov <aarnaarn2@gmail.com>
Date: Thu, 17 Jun 2021 11:08:38 +0300
Subject: [PATCH] remove include dir

---
 meson.build                        | 5 ++---
 src/{include => }/espeakup.h       | 0
 src/include/meson.build            | 2 --
 src/meson.build                    | 3 +--
 src/{include => }/queue.h          | 0
 src/{include => }/stringhandling.h | 0
 src/{include => }/version.h.in     | 0
 7 files changed, 3 insertions(+), 7 deletions(-)
 rename src/{include => }/espeakup.h (100%)
 delete mode 100644 src/include/meson.build
 rename src/{include => }/queue.h (100%)
 rename src/{include => }/stringhandling.h (100%)
 rename src/{include => }/version.h.in (100%)

diff --git a/meson.build b/meson.build
index b3a044f..261df7e 100644
--- a/meson.build
+++ b/meson.build
@@ -10,13 +10,12 @@ espeak_dep = dependency('espeak-ng')
 alsa_dep = dependency('alsa')
 math_dep = cc.find_library('m', required : false)
 
-subdir('src')
 subdir('doc')
 subdir('services')
+subdir('src')
 
 executable('espeakup',
-           espeakup_sources,
            espeakup_version,
-           include_directories : espeakup_incdir,
+           espeakup_sources,
            dependencies : [thread_dep, espeak_dep, alsa_dep, math_dep],
            install : true)
diff --git a/src/include/espeakup.h b/src/espeakup.h
similarity index 100%
rename from src/include/espeakup.h
rename to src/espeakup.h
diff --git a/src/include/meson.build b/src/include/meson.build
deleted file mode 100644
index 3d65414..0000000
--- a/src/include/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-espeakup_version = vcs_tag(input : 'version.h.in',
-        output : 'version.h')
diff --git a/src/meson.build b/src/meson.build
index e90332e..f1c4610 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,5 @@
-espeakup_incdir = include_directories('include')
+espeakup_version = vcs_tag(input : 'version.h.in', output : 'version.h')
 
-subdir('include')
 
 espeakup_sources = files([
         'cli.c',
diff --git a/src/include/queue.h b/src/queue.h
similarity index 100%
rename from src/include/queue.h
rename to src/queue.h
diff --git a/src/include/stringhandling.h b/src/stringhandling.h
similarity index 100%
rename from src/include/stringhandling.h
rename to src/stringhandling.h
diff --git a/src/include/version.h.in b/src/version.h.in
similarity index 100%
rename from src/include/version.h.in
rename to src/version.h.in