X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=Makefile.am;h=d8ba3bfb835e4a9e367a812537aba49403c8517a;hp=66a0c82ebb0a5429ae3b17ad971a923ea701ecb9;hb=df0d71f05b79d7a2d800abdee8be26f6601d3ecd;hpb=911f737f2b92dd922a9dc9e0710207f9a0ae9130

diff --git a/Makefile.am b/Makefile.am
index 66a0c82..d8ba3bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,9 +74,13 @@ if ENABLE_GSM_MS
 
 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 ./libosmocore/build-host/src/.libs/libosmocore.a ./libosmocore/build-host/src/vty/.libs/libosmovty.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,19 +103,19 @@ 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) $(AST_CFLAGS) -D_GNU_SOURCE -fPIC -c chan_lcr.c -o chan_lcr.po
+	$(CC) $(INCLUDES) $(AST_CFLAGS) $(CPPFLAGS) $(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
+	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c bchannel.c -o bchannel.po
 
 callerid.po: callerid.c callerid.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE -fPIC -c callerid.c -o callerid.po
+	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c callerid.c -o callerid.po
 
 options.po: options.c options.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE -fPIC -c options.c -o options.po
+	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c options.c -o options.po
 
 select.po: select.c select.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE -fPIC -c select.c -o select.po
+	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c select.c -o select.po
 
 install-exec-hook:
 	mkdir -p $(astmoddir)