From 30209cedddb3b6ece5614b40f65f6a04e84388b4 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 30 Aug 2017 20:26:02 +0700 Subject: [PATCH] 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. --- configure.ac | 1 - include/Makefile.am | 14 ++++++++++++-- include/gapk/Makefile.am | 6 ------ include/{ => osmocom}/gapk/benchmark.h | 4 ++-- include/{ => osmocom}/gapk/codecs.h | 2 +- include/{ => osmocom}/gapk/formats.h | 2 +- include/{ => osmocom}/gapk/get_cycles.h | 0 include/{ => osmocom}/gapk/procqueue.h | 0 include/{ => osmocom}/gapk/utils.h | 0 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 +- 35 files changed, 79 insertions(+), 76 deletions(-) delete mode 100644 include/gapk/Makefile.am rename include/{ => osmocom}/gapk/benchmark.h (95%) rename include/{ => osmocom}/gapk/codecs.h (96%) rename include/{ => osmocom}/gapk/formats.h (96%) rename include/{ => osmocom}/gapk/get_cycles.h (100%) rename include/{ => osmocom}/gapk/procqueue.h (100%) rename include/{ => osmocom}/gapk/utils.h (100%) diff --git a/configure.ac b/configure.ac index c24e8f0..85d722d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,6 @@ AC_CONFIG_FILES([ src/Makefile libgsmhr/Makefile include/Makefile - include/gapk/Makefile include/gsmhr/Makefile ]) diff --git a/include/Makefile.am b/include/Makefile.am index ddb25df..f64faeb 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,15 @@ -SUBDIRS = gapk +noinst_HEADERS = \ + osmocom/gapk/utils.h \ + $(NULL) + +nobase_include_HEADERS = \ + osmocom/gapk/get_cycles.h \ + osmocom/gapk/benchmark.h \ + osmocom/gapk/procqueue.h \ + osmocom/gapk/formats.h \ + osmocom/gapk/codecs.h \ + $(NULL) if ENABLE_GSMHR -SUBDIRS += gsmhr +SUBDIRS = gsmhr endif diff --git a/include/gapk/Makefile.am b/include/gapk/Makefile.am deleted file mode 100644 index 5fcc3b9..0000000 --- a/include/gapk/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_HEADERS = benchmark.h \ - codecs.h \ - formats.h \ - get_cycles.h \ - procqueue.h \ - utils.h diff --git a/include/gapk/benchmark.h b/include/osmocom/gapk/benchmark.h similarity index 95% rename from include/gapk/benchmark.h rename to include/osmocom/gapk/benchmark.h index 49c2c36..b67af6f 100644 --- a/include/gapk/benchmark.h +++ b/include/osmocom/gapk/benchmark.h @@ -20,8 +20,8 @@ * (C) 2014 Harald Welte */ -#include -#include +#include +#include #define NUM_AVG 102400 diff --git a/include/gapk/codecs.h b/include/osmocom/gapk/codecs.h similarity index 96% rename from include/gapk/codecs.h rename to include/osmocom/gapk/codecs.h index aa1c829..1ad4e73 100644 --- a/include/gapk/codecs.h +++ b/include/osmocom/gapk/codecs.h @@ -39,7 +39,7 @@ enum codec_type { _CODEC_MAX, }; -#include /* need to import here because or enum interdep */ +#include /* need to import here because or enum interdep */ /*! call-back for actual codec conversion function * \param[in] state opaque state pointer (returned by codec->init) diff --git a/include/gapk/formats.h b/include/osmocom/gapk/formats.h similarity index 96% rename from include/gapk/formats.h rename to include/osmocom/gapk/formats.h index 81670b8..7847782 100644 --- a/include/gapk/formats.h +++ b/include/osmocom/gapk/formats.h @@ -62,7 +62,7 @@ enum format_type { _FMT_MAX, }; -#include /* need to import here because or enum interdep */ +#include /* need to import here because or enum interdep */ /*! call-back for actual format conversion function * \param[out] dst caller-allocated buffer for output data diff --git a/include/gapk/get_cycles.h b/include/osmocom/gapk/get_cycles.h similarity index 100% rename from include/gapk/get_cycles.h rename to include/osmocom/gapk/get_cycles.h diff --git a/include/gapk/procqueue.h b/include/osmocom/gapk/procqueue.h similarity index 100% rename from include/gapk/procqueue.h rename to include/osmocom/gapk/procqueue.h diff --git a/include/gapk/utils.h b/include/osmocom/gapk/utils.h similarity index 100% rename from include/gapk/utils.h rename to include/osmocom/gapk/utils.h 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 -#include +#include 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 . */ -#include -#include +#include +#include #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 . */ -#include -#include +#include +#include #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 -#include -#include +#include +#include #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 -#include -#include +#include +#include #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 . */ -#include +#include 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 /* for NULL */ -#include +#include /* 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 -#include -#include -#include +#include +#include +#include #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 #include -#include -#include -#include +#include +#include +#include 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 -#include -#include +#include +#include #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 -#include -#include -#include +#include +#include +#include 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 -#include -#include -#include +#include +#include +#include #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 -#include -#include +#include +#include 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 -#include -#include -#include +#include +#include +#include /* 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 -#include -#include -#include +#include +#include +#include #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 #include -#include -#include -#include +#include +#include +#include /* 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 #include -#include -#include -#include +#include +#include +#include #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 -#include -#include -#include +#include +#include +#include #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 /* for NULL */ #include -#include +#include /* 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 -#include -#include -#include -#include +#include +#include +#include +#include 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 #include -#include -#include -#include +#include +#include +#include #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 #include -#include -#include -#include +#include +#include +#include /*! 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 #include -#include -#include -#include +#include +#include +#include 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 #include -#include -#include -#include +#include +#include +#include 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 -#include -#include -#include +#include +#include +#include #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 #include -#include +#include #define VAR_BUF_SIZE 320 #define MAX_PQ_ITEMS 8