fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/28555 )
Change subject: trxcon: separate the scheduler into libl1sched.la
......................................................................
trxcon: separate the scheduler into libl1sched.la
Change-Id: I001fb7bc2663eea308b5a8882746ed9863f2c2f8
Related: OS#5599, OS#3761
---
M src/host/trxcon/.gitignore
M src/host/trxcon/Makefile.am
M src/host/trxcon/configure.ac
A src/host/trxcon/m4/.gitkeep
M src/host/trxcon/src/Makefile.am
5 files changed, 31 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/host/trxcon/.gitignore b/src/host/trxcon/.gitignore
index 1cc7ffb..b5c3a99 100644
--- a/src/host/trxcon/.gitignore
+++ b/src/host/trxcon/.gitignore
@@ -9,6 +9,11 @@
missing
compile
+# libtool by-products
+ltmain.sh
+libtool
+m4/*.m4
+
# configure by-products
.deps/
Makefile
@@ -18,7 +23,9 @@
# build by-products
*.o
+*.lo
*.a
+*.la
/src/trxcon
diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am
index 276eb06..5b1002c 100644
--- a/src/host/trxcon/Makefile.am
+++ b/src/host/trxcon/Makefile.am
@@ -5,6 +5,8 @@
src \
$(NULL)
+ACLOCAL_AMFLAGS = -I m4
+
BUILT_SOURCES = \
$(top_srcdir)/.version \
$(NULL)
diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac
index 68bb3bd..9e0a198 100644
--- a/src/host/trxcon/configure.ac
+++ b/src/host/trxcon/configure.ac
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script
AC_INIT([trxcon], [0.0.0])
AM_INIT_AUTOMAKE
+LT_INIT
dnl kernel style compile messages
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -31,6 +32,7 @@
dnl Checks for typedefs, structures and compiler characteristics
+AC_CONFIG_MACRO_DIRS([m4])
AC_CONFIG_FILES([include/Makefile
include/osmocom/Makefile
include/osmocom/bb/Makefile
diff --git a/src/host/trxcon/m4/.gitkeep b/src/host/trxcon/m4/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/host/trxcon/m4/.gitkeep
diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am
index bc2aa91..c97265b 100644
--- a/src/host/trxcon/src/Makefile.am
+++ b/src/host/trxcon/src/Makefile.am
@@ -10,18 +10,10 @@
$(LIBOSMOGSM_CFLAGS) \
$(NULL)
-bin_PROGRAMS = trxcon
-trxcon_SOURCES = \
- l1ctl_link.c \
- l1ctl.c \
- trx_if.c \
- logging.c \
- trxcon.c \
- $(NULL)
+noinst_LTLIBRARIES = libl1sched.la
-# Scheduler
-trxcon_SOURCES += \
+libl1sched_la_SOURCES = \
sched_lchan_common.c \
sched_lchan_pdtch.c \
sched_lchan_desc.c \
@@ -36,8 +28,25 @@
sched_trx.c \
$(NULL)
-trxcon_LDADD = \
+libl1sched_la_LIBADD = \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOCODING_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(NULL)
+
+
+bin_PROGRAMS = trxcon
+
+trxcon_SOURCES = \
+ l1ctl_link.c \
+ l1ctl.c \
+ trx_if.c \
+ logging.c \
+ trxcon.c \
+ $(NULL)
+
+trxcon_LDADD = \
+ libl1sched.la \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(NULL)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28555
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I001fb7bc2663eea308b5a8882746ed9863f2c2f8
Gerrit-Change-Number: 28555
Gerrit-PatchSet: 7
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
