summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorAndreas Eversberg2011-07-14 14:25:42 +0200
committerAndreas Eversberg2011-07-14 14:25:42 +0200
commitda91d7d85fe092122e35ece52695f98345738359 (patch)
treea06ffff8291b8f61441ef75b28a4184824806af5 /Makefile.am
parent[GSM_BS] Added DTMF support. (diff)
parent[GSM] Replaced strcpy by required macro name. (diff)
downloadlcr-da91d7d85fe092122e35ece52695f98345738359.tar.gz
lcr-da91d7d85fe092122e35ece52695f98345738359.tar.xz
lcr-da91d7d85fe092122e35ece52695f98345738359.zip
Merge branch 'develop'
Conflicts: Makefile.in README chan_lcr.c configure gsm_bs.cpp gsm_ms.cpp interface.c route.c
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index d8ba3bf..f047c56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ if ENABLE_GSM
GSM_INCLUDE +=
-GSM_SOURCE += gsm_audio.c gsm.cpp gsm_conf.c
+GSM_SOURCE += gsm_audio.c gsm.cpp
GSM_LIB += /usr/lib/libgsm.a
@@ -64,9 +64,7 @@ if ENABLE_GSM_BS
GSM_INCLUDE += -DWITH_GSM_BS -I./openbsc/include -I./libosmocore/include -I./openbsc
-GSM_SOURCE += gsm_bs.cpp openbsc/src/bsc_init.c openbsc/src/bsc_vty.c openbsc/src/vty_interface_layer3.c openbsc/src/bsc_api.c openbsc/src/bsc_version.c
-
-GSM_LIB += ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -losmovty -losmocore -ldbi -lcrypt
+GSM_SOURCE += gsm_bs.cpp
endif
@@ -125,8 +123,8 @@ endif
INCLUDES = $(all_includes) $(GSM_INCLUDE) $(SS5_INCLUDE) -Wall $(INSTALLATION_DEFINES)
-lcr_SOURCES = $(GSM_SOURCE) $(SS5_SOURCE) select.c action.cpp mISDN.cpp tones.c \
- action_efi.cpp crypt.cpp mail.c trace.c \
+lcr_SOURCES = $(GSM_SOURCE) $(SS5_SOURCE) select.c action.cpp mISDN.cpp \
+ tones.c loop.c remote.c action_efi.cpp crypt.cpp mail.c trace.c \
action_vbox.cpp dss1.cpp main.c \
vbox.cpp alawulaw.c endpoint.cpp interface.c message.c \
apppbx.cpp endpointapp.cpp join.cpp options.c \