From 7a2026ab4414d6f291ef744c988d1ec615c84de0 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 12 Nov 2011 17:52:23 +0100
Subject: [PATCH] GSM: Slit libGSM.la and libGSML1.la

The purpose of this exercise is to make sure the L1 can be used
independent of the higher layers.
---
 public-trunk/GSM/Makefile.am            | 14 ++++++++------
 public-trunk/Makefile.common            |  1 +
 public-trunk/Transceiver52M/Makefile.am |  2 ++
 public-trunk/apps/Makefile.am           |  1 +
 public-trunk/smqueue/Makefile.am        |  1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/public-trunk/GSM/Makefile.am b/public-trunk/GSM/Makefile.am
index 9014ac4..544a903 100644
--- a/public-trunk/GSM/Makefile.am
+++ b/public-trunk/GSM/Makefile.am
@@ -23,14 +23,19 @@ include $(top_srcdir)/Makefile.common
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
 AM_CXXFLAGS = -O2 -g
 
-noinst_LTLIBRARIES = libGSM.la
+noinst_LTLIBRARIES = libGSML1.la libGSM.la
 
-libGSM_la_SOURCES = \
+libGSML1_la_SOURCES = \
 	GSM610Tables.cpp \
 	GSMCommon.cpp \
-	GSMConfig.cpp \
 	GSMConfigL1.cpp \
 	GSML1FEC.cpp \
+	GSMTDMA.cpp \
+	GSMTransfer.cpp \
+	GSMTAPDump.cpp
+
+libGSM_la_SOURCES = \
+	GSMConfig.cpp \
 	GSML2LAPDm.cpp \
 	GSML3CCElements.cpp \
 	GSML3CCMessages.cpp \
@@ -45,9 +50,6 @@ libGSM_la_SOURCES = \
 	GSML3RRMessages.cpp \
 	GSMLogicalChannel.cpp \
 	GSMSAPMux.cpp \
-	GSMTDMA.cpp \
-	GSMTransfer.cpp \
-	GSMTAPDump.cpp \
 	PowerManager.cpp
 
 noinst_HEADERS = \
diff --git a/public-trunk/Makefile.common b/public-trunk/Makefile.common
index b555209..f4c5a4d 100644
--- a/public-trunk/Makefile.common
+++ b/public-trunk/Makefile.common
@@ -43,6 +43,7 @@ STD_DEFINES_AND_INCLUDES = \
 
 COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
 GSM_LA = $(top_builddir)/GSM/libGSM.la
+GSML1_LA = $(top_builddir)/GSM/libGSML1.la
 SIP_LA = $(top_builddir)/SIP/libSIP.la
 SMS_LA = $(top_builddir)/SMS/libSMS.la
 TRX_LA = $(top_builddir)/TRXManager/libtrxmanager.la
diff --git a/public-trunk/Transceiver52M/Makefile.am b/public-trunk/Transceiver52M/Makefile.am
index 188c550..a504e26 100644
--- a/public-trunk/Transceiver52M/Makefile.am
+++ b/public-trunk/Transceiver52M/Makefile.am
@@ -82,12 +82,14 @@ transceiver_SOURCES = runTransceiver.cpp
 transceiver_LDADD = \
 	libtransceiver.la \
 	$(GSM_LA) \
+	$(GSML1_LA) \
 	$(COMMON_LA)
 
 sigProcLibTest_SOURCES = sigProcLibTest.cpp
 sigProcLibTest_LDADD = \
 	libtransceiver.la \
 	$(GSM_LA) \
+	$(GSML1_LA) \
 	$(COMMON_LA)
 
 if UHD
diff --git a/public-trunk/apps/Makefile.am b/public-trunk/apps/Makefile.am
index 0b67cba..16c3bcc 100644
--- a/public-trunk/apps/Makefile.am
+++ b/public-trunk/apps/Makefile.am
@@ -34,6 +34,7 @@ OpenBTS_LDADD = \
 	$(HLR_LA) \
 	$(SIP_LA) \
 	$(GSM_LA) \
+	$(GSML1_LA) \
 	$(TRX_LA) \
 	$(CONTROL_LA) \
 	$(SMS_LA) \
diff --git a/public-trunk/smqueue/Makefile.am b/public-trunk/smqueue/Makefile.am
index bf09162..6411e63 100644
--- a/public-trunk/smqueue/Makefile.am
+++ b/public-trunk/smqueue/Makefile.am
@@ -47,6 +47,7 @@ smqueue_LDADD = \
 	$(GLOBALS_LA) \
 	$(SMS_LA) \
 	$(GSM_LA) \
+	$(GSML1_LA) \
 	$(COMMON_LA) \
 	$(HLR_LA) \
 	$(SIP_LA) \