X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=Makefile.am;h=ea96ae77d445672161110f964b704f8ab2edac3e;hp=f25280db6123c72a8cc6fc04c20f7dac896f158d;hb=b3a7f6b9e63e191497fa25ad05bf2120ca5bc28d;hpb=a12d7eee22a72f4c999535892763dde15212e89e

diff --git a/Makefile.am b/Makefile.am
index f25280d..ea96ae7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,11 +72,15 @@ endif
 
 if ENABLE_GSM_MS
 
-GSM_INCLUDE += -DWITH_GSM_MS -I./layer23/include -I./libosmocore/include
+GSM_INCLUDE += -DPACKAGE_VERSION=0 -DWITH_GSM_MS -I./layer23/include -I./libosmocore/include
 
-GSM_SOURCE += gsm_ms.cpp layer23/src/app_mobile.c
+GSM_SOURCE += gsm_ms.cpp layer23/src/mobile/app_mobile.c
 
-GSM_LIB += ./layer23/src/liblayer23.a ./layer23/src/libvty.a ./libosmocore/build-host/src/.libs/libosmocore.a
+GSM_LIB += ./layer23/src/mobile/libmobile.a \
+	./layer23/src/common/liblayer23.a \
+	./libosmocore/build-host/src/.libs/libosmocore.a \
+	./libosmocore/build-host/src/vty/.libs/libosmovty.a \
+	./libosmocore/build-host/src/codec/.libs/libosmocodec.a
 
 endif
 
@@ -99,7 +103,7 @@ chan_lcr_so_LDFLAGS = -shared
 chan_lcr_so_LDADD = chan_lcr.po bchannel.po options.po callerid.po select.po
 
 chan_lcr.po: chan_lcr.c chan_lcr.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE -fPIC -c chan_lcr.c -o chan_lcr.po
+	$(CC) $(INCLUDES) $(AST_CFLAGS) -D_GNU_SOURCE -fPIC -c chan_lcr.c -o chan_lcr.po
 
 bchannel.po: bchannel.c bchannel.h
 	$(CC) $(INCLUDES) -D_GNU_SOURCE -fPIC -c bchannel.c -o bchannel.po
@@ -121,8 +125,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       \