osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

libctrl: autotools build system integration 

Now we actually build the recently-imported libctrl
This commit is contained in:
Harald Welte 2014-08-20 19:58:40 +02:00
parent 7fd0c830d9
commit 3ff81b1a6b
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -1,11 +1,11 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src src/vty src/codec src/gsm src/gb tests utils SUBDIRS = include src src/vty src/codec src/gsm src/gb src/ctrl tests utils
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \
libosmogb.pc libosmogb.pc libosmoctrl.pc
BUILT_SOURCES = $(top_srcdir)/.version BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version: $(top_srcdir)/.version:

2
configure.ac
View File

@ -186,12 +186,14 @@ AC_OUTPUT(
libosmovty.pc libosmovty.pc
libosmogsm.pc libosmogsm.pc
libosmogb.pc libosmogb.pc
libosmoctrl.pc
include/Makefile include/Makefile
src/Makefile src/Makefile
src/vty/Makefile src/vty/Makefile
src/codec/Makefile src/codec/Makefile
src/gsm/Makefile src/gsm/Makefile
src/gb/Makefile src/gb/Makefile
src/ctrl/Makefile
tests/Makefile tests/Makefile
utils/Makefile utils/Makefile
Doxyfile.core Doxyfile.core

2
include/Makefile.am
View File

@ -37,6 +37,8 @@ nobase_include_HEADERS = \
osmocom/core/write_queue.h \ osmocom/core/write_queue.h \
osmocom/crypt/auth.h \ osmocom/crypt/auth.h \
osmocom/crypt/gprs_cipher.h \ osmocom/crypt/gprs_cipher.h \
osmocom/ctrl/control_cmd.h \
osmocom/ctrl/control_if.h \
osmocom/gprs/gprs_bssgp.h \ osmocom/gprs/gprs_bssgp.h \
osmocom/gprs/gprs_bssgp_bss.h \ osmocom/gprs/gprs_bssgp_bss.h \
osmocom/gprs/gprs_msgb.h \ osmocom/gprs/gprs_msgb.h \

11
libosmoctrl.pc.in Normal file
View File

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: Osmocom Control Interface Library
Description: C Utility Library
Version: @VERSION@
Libs: -L${libdir} -losmoctrl
Cflags: -I${includedir}/

15
src/ctrl/Makefile.am
View File

@ -1,7 +1,12 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) # This is _NOT_ the library release version, it's an API version.
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS) $(COVERAGE_LDFLAGS) LIBVERSION=0:0:0
noinst_LIBRARIES = libctrl.a AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
libctrl_a_SOURCES = control_if.c control_cmd.c lib_LTLIBRARIES = libosmoctrl.la
libosmoctrl_la_SOURCES = control_cmd.c control_if.c
libosmoctrl_la_LDFLAGS = $(LTLDFLAGS_OSMOCTRL) -version-info $(LIBVERSION) -no-undefined
libosmoctrl_la_LIBADD = $(top_builddir)/src/libosmocore.la