From 30209cedddb3b6ece5614b40f65f6a04e84388b4 Mon Sep 17 00:00:00 2001
From: Vadim Yanitskiy <axilirator@gmail.com>
Date: Wed, 30 Aug 2017 20:26:02 +0700
Subject: Install GAPK headers to '${includedir}/osmocom/gapk/'

To be able to use the library, external applications need to know,
which symbols are exposed. This information is provided by header
files, which are being installed to a system's ${includedir}
since this change.
---
 src/benchmark.c        | 2 +-
 src/codec_amr.c        | 4 ++--
 src/codec_efr.c        | 4 ++--
 src/codec_fr.c         | 4 ++--
 src/codec_hr.c         | 4 ++--
 src/codec_pcm.c        | 2 +-
 src/codecs.c           | 2 +-
 src/fmt_amr.c          | 6 +++---
 src/fmt_amr_opencore.c | 6 +++---
 src/fmt_gsm.c          | 4 ++--
 src/fmt_hr_ref.c       | 6 +++---
 src/fmt_racal.c        | 6 +++---
 src/fmt_rawpcm.c       | 4 ++--
 src/fmt_rtp_amr.c      | 6 +++---
 src/fmt_rtp_efr.c      | 6 +++---
 src/fmt_rtp_hr_etsi.c  | 6 +++---
 src/fmt_rtp_hr_ietf.c  | 6 +++---
 src/fmt_ti.c           | 6 +++---
 src/formats.c          | 2 +-
 src/main.c             | 8 ++++----
 src/pq_alsa.c          | 6 +++---
 src/pq_codec.c         | 6 +++---
 src/pq_file.c          | 6 +++---
 src/pq_format.c        | 6 +++---
 src/pq_rtp.c           | 6 +++---
 src/procqueue.c        | 2 +-
 26 files changed, 63 insertions(+), 63 deletions(-)

(limited to 'src')

diff --git a/src/benchmark.c b/src/benchmark.c
index 91e2ce5..6dfc33b 100644
--- a/src/benchmark.c
+++ b/src/benchmark.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include <gapk/benchmark.h>
+#include <osmocom/gapk/benchmark.h>
 
 struct benchmark_cycles codec_cycles[_CODEC_MAX];
 
diff --git a/src/codec_amr.c b/src/codec_amr.c
index 4aae733..4c4b3e6 100644
--- a/src/codec_amr.c
+++ b/src/codec_amr.c
@@ -18,8 +18,8 @@
  * along with gapk.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gapk/codecs.h>
-#include <gapk/benchmark.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/benchmark.h>
 
 #include "config.h"
 
diff --git a/src/codec_efr.c b/src/codec_efr.c
index 339172a..84e5fc5 100644
--- a/src/codec_efr.c
+++ b/src/codec_efr.c
@@ -17,8 +17,8 @@
  * along with gapk.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gapk/codecs.h>
-#include <gapk/benchmark.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/benchmark.h>
 
 #include "config.h"
 
diff --git a/src/codec_fr.c b/src/codec_fr.c
index 2ce44b4..0cda1f4 100644
--- a/src/codec_fr.c
+++ b/src/codec_fr.c
@@ -19,8 +19,8 @@
 
 #include <assert.h>
 
-#include <gapk/codecs.h>
-#include <gapk/benchmark.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/benchmark.h>
 
 #include "config.h"
 
diff --git a/src/codec_hr.c b/src/codec_hr.c
index b3247e0..6e5948a 100644
--- a/src/codec_hr.c
+++ b/src/codec_hr.c
@@ -19,8 +19,8 @@
 
 #include <assert.h>
 
-#include <gapk/codecs.h>
-#include <gapk/benchmark.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/benchmark.h>
 
 #include "config.h"
 
diff --git a/src/codec_pcm.c b/src/codec_pcm.c
index 9fa8c1b..95e83ca 100644
--- a/src/codec_pcm.c
+++ b/src/codec_pcm.c
@@ -17,7 +17,7 @@
  * along with gapk.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gapk/codecs.h>
+#include <osmocom/gapk/codecs.h>
 
 const struct codec_desc codec_pcm_desc = {
 	.type = CODEC_PCM,
diff --git a/src/codecs.c b/src/codecs.c
index 623e80c..f7f86bd 100644
--- a/src/codecs.c
+++ b/src/codecs.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>	/* for NULL */
 
-#include <gapk/codecs.h>
+#include <osmocom/gapk/codecs.h>
 
 /* Extern codec descriptors */
 extern const struct codec_desc codec_pcm_desc;
diff --git a/src/fmt_amr.c b/src/fmt_amr.c
index e28024c..06f4158 100644
--- a/src/fmt_amr.c
+++ b/src/fmt_amr.c
@@ -22,9 +22,9 @@
 
 #include <osmocom/codec/codec.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 #define EFR_LEN		32
 
diff --git a/src/fmt_amr_opencore.c b/src/fmt_amr_opencore.c
index 3fa547b..07281fd 100644
--- a/src/fmt_amr_opencore.c
+++ b/src/fmt_amr_opencore.c
@@ -21,9 +21,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 static int
 amr_opencore_from_canon(uint8_t *dst, const uint8_t *src, unsigned int src_len)
diff --git a/src/fmt_gsm.c b/src/fmt_gsm.c
index 27701f0..1963692 100644
--- a/src/fmt_gsm.c
+++ b/src/fmt_gsm.c
@@ -18,8 +18,8 @@
  */
 
 #include <assert.h>
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
 
 #define GSM_LEN	  33
 #define GSM_MAGIC 0xd
diff --git a/src/fmt_hr_ref.c b/src/fmt_hr_ref.c
index d64918b..fb5b008 100644
--- a/src/fmt_hr_ref.c
+++ b/src/fmt_hr_ref.c
@@ -22,9 +22,9 @@
 
 #include <assert.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 static const int params_unvoiced[] = {
 	5,	/* R0 */
diff --git a/src/fmt_racal.c b/src/fmt_racal.c
index 1dbc61d..add202b 100644
--- a/src/fmt_racal.c
+++ b/src/fmt_racal.c
@@ -22,9 +22,9 @@
 
 #include <osmocom/codec/codec.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 #define RACAL_HR_LEN	14
 #define RACAL_FR_LEN	33
diff --git a/src/fmt_rawpcm.c b/src/fmt_rawpcm.c
index 207708c..c0c83c1 100644
--- a/src/fmt_rawpcm.c
+++ b/src/fmt_rawpcm.c
@@ -19,8 +19,8 @@
 
 #include <assert.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
 
 static int
 rawpcm_s16le_from_canon(uint8_t *dst, const uint8_t *src, unsigned int src_len)
diff --git a/src/fmt_rtp_amr.c b/src/fmt_rtp_amr.c
index 1d5357d..79dd37c 100644
--- a/src/fmt_rtp_amr.c
+++ b/src/fmt_rtp_amr.c
@@ -23,9 +23,9 @@
 
 #include <osmocom/codec/codec.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 /* conversion function: RTP payload -> canonical format */
 static int
diff --git a/src/fmt_rtp_efr.c b/src/fmt_rtp_efr.c
index 0132e32..f900f75 100644
--- a/src/fmt_rtp_efr.c
+++ b/src/fmt_rtp_efr.c
@@ -23,9 +23,9 @@
 
 #include <osmocom/codec/codec.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 #define EFR_LEN	  31
 #define EFR_MAGIC 0xc
diff --git a/src/fmt_rtp_hr_etsi.c b/src/fmt_rtp_hr_etsi.c
index fe6728a..475f156 100644
--- a/src/fmt_rtp_hr_etsi.c
+++ b/src/fmt_rtp_hr_etsi.c
@@ -22,9 +22,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 /* conversion function: RTP payload -> canonical format */
 static int
diff --git a/src/fmt_rtp_hr_ietf.c b/src/fmt_rtp_hr_ietf.c
index 3e8e6a3..cedf461 100644
--- a/src/fmt_rtp_hr_ietf.c
+++ b/src/fmt_rtp_hr_ietf.c
@@ -22,9 +22,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 #define HR_LEN	(HR_CANON_LEN+1)
 
diff --git a/src/fmt_ti.c b/src/fmt_ti.c
index 582bff4..5f2da9f 100644
--- a/src/fmt_ti.c
+++ b/src/fmt_ti.c
@@ -30,9 +30,9 @@
 
 #include <osmocom/codec/codec.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/utils.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/utils.h>
 
 #define TI_LEN	33
 
diff --git a/src/formats.c b/src/formats.c
index 60182fe..8544186 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -20,7 +20,7 @@
 #include <stdio.h>	/* for NULL */
 #include <string.h>
 
-#include <gapk/formats.h>
+#include <osmocom/gapk/formats.h>
 
 /* Extern format descriptors */
 extern const struct format_desc fmt_amr_efr;
diff --git a/src/main.c b/src/main.c
index 58e23c1..9b56e58 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,10 +33,10 @@
 
 #include <osmocom/core/socket.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/procqueue.h>
-#include <gapk/benchmark.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/procqueue.h>
+#include <osmocom/gapk/benchmark.h>
 
 
 struct gapk_options
diff --git a/src/pq_alsa.c b/src/pq_alsa.c
index cad76ca..1902d7b 100644
--- a/src/pq_alsa.c
+++ b/src/pq_alsa.c
@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/procqueue.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/procqueue.h>
 
 #include "config.h"
 
diff --git a/src/pq_codec.c b/src/pq_codec.c
index f1884fb..4b41e1d 100644
--- a/src/pq_codec.c
+++ b/src/pq_codec.c
@@ -20,9 +20,9 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/procqueue.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/procqueue.h>
 
 
 /*! Add a codecl to the processing queue
diff --git a/src/pq_file.c b/src/pq_file.c
index 96f7b3f..e20b52b 100644
--- a/src/pq_file.c
+++ b/src/pq_file.c
@@ -22,9 +22,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/procqueue.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/procqueue.h>
 
 
 struct pq_state_file {
diff --git a/src/pq_format.c b/src/pq_format.c
index d6bc8af..ae98483 100644
--- a/src/pq_format.c
+++ b/src/pq_format.c
@@ -20,9 +20,9 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/procqueue.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/procqueue.h>
 
 
 static int
diff --git a/src/pq_rtp.c b/src/pq_rtp.c
index f5603de..d7d924e 100644
--- a/src/pq_rtp.c
+++ b/src/pq_rtp.c
@@ -27,9 +27,9 @@
 
 #include <arpa/inet.h>
 
-#include <gapk/codecs.h>
-#include <gapk/formats.h>
-#include <gapk/procqueue.h>
+#include <osmocom/gapk/codecs.h>
+#include <osmocom/gapk/formats.h>
+#include <osmocom/gapk/procqueue.h>
 
 #ifndef __BYTE_ORDER
 # ifdef __APPLE__
diff --git a/src/procqueue.c b/src/procqueue.c
index 01ad581..f54da40 100644
--- a/src/procqueue.c
+++ b/src/procqueue.c
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <gapk/procqueue.h>
+#include <osmocom/gapk/procqueue.h>
 
 #define VAR_BUF_SIZE	320
 #define MAX_PQ_ITEMS	8
-- 
cgit v1.2.3