Patchwork [5/5] libctrl: autotools build system integration

login
register
mail settings
Submitter Harald Welte
Date Aug. 20, 2014, 6:15 p.m.
Message ID <1408558510-10364-5-git-send-email-laforge@gnumonks.org>
Download mbox | patch
Permalink /patch/381774/
State Accepted
Headers show

Comments

Harald Welte - Aug. 20, 2014, 6:15 p.m.
Now we actually build the recently-imported libctrl
---
 Makefile.am          |  2 +-
 configure.ac         |  1 +
 src/ctrl/Makefile.am | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

Patch

diff --git a/Makefile.am b/Makefile.am
index 717d3db..b7bad41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@ 
 ACLOCAL_AMFLAGS = -I m4
 
 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
 pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \
diff --git a/configure.ac b/configure.ac
index eaaab50..a902eb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@  AC_OUTPUT(
 	src/codec/Makefile
 	src/gsm/Makefile
 	src/gb/Makefile
+	src/ctrl/Makefile
 	tests/Makefile
 	utils/Makefile
 	Doxyfile.core
diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am
index 4f039c8..29a8ee2 100644
--- a/src/ctrl/Makefile.am
+++ b/src/ctrl/Makefile.am
@@ -1,7 +1,12 @@ 
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS) $(COVERAGE_LDFLAGS)
+# This is _NOT_ the library release version, it's an API version.
+# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
+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