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

@@ -16,7 +16,6 @@ AC_CONFIG_FILES([
 	src/Makefile
 	libgsmhr/Makefile
 	include/Makefile
-	include/gapk/Makefile
 	include/gsmhr/Makefile
 ])
 

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

include/gapk/Makefile.am

@@ -1,6 +0,0 @@
-noinst_HEADERS =	benchmark.h	\
-			codecs.h	\
-			formats.h	\
-			get_cycles.h	\
-			procqueue.h	\
-			utils.h

include/osmocom/gapk/benchmark.h

@@ -20,8 +20,8 @@
  * (C) 2014 Harald Welte <laforge@gnumonks.org>
  */
 
-#include <gapk/get_cycles.h>
-#include <gapk/codecs.h>
+#include <osmocom/gapk/get_cycles.h>
+#include <osmocom/gapk/codecs.h>
 
 #define NUM_AVG	102400
 

include/osmocom/gapk/codecs.h

@@ -39,7 +39,7 @@ enum codec_type {
 	_CODEC_MAX,
 };
 
-#include <gapk/formats.h>	/* need to import here because or enum interdep */
+#include <osmocom/gapk/formats.h>	/* 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)

include/osmocom/gapk/formats.h

@@ -62,7 +62,7 @@ enum format_type {
 	_FMT_MAX,
 };
 
-#include <gapk/codecs.h>	/* need to import here because or enum interdep */
+#include <osmocom/gapk/codecs.h>	/* need to import here because or enum interdep */
 
 /*! call-back for actual format conversion function
  *  \param[out] dst caller-allocated buffer for output data

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];
 

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"
 

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"
 

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"
 

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"
 

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,

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;

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
 

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)

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

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 */

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

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)

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

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

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

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)
 

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
 

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;

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

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"
 

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

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 {

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

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__

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