X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=Makefile.am;h=b1fab38489769dcd38e20aabd5f97f5343f0ea50;hp=e35f6f0df175a540c2c7c276a2659d5621c9705c;hb=cac70edab7fe9e3a0c7583de7023a3e877112020;hpb=77d91029549d9d526572966a0884c015acd2727e

diff --git a/Makefile.am b/Makefile.am
index e35f6f0..b1fab38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,8 @@ INSTALLATION_DEFINES = \
  -DLOG_DIR="\"$(LOGdir)\"" \
  -DEXTENSION_DATA="\"$(EXTENSIONdir)\""
 
+SUBDIRS = include
+
 if ENABLE_MISDN
 
 MISDN_INCLUDE = -DWITH_MISDN -DWITH_CRYPT
@@ -59,7 +61,7 @@ GSM_LIB =
 
 if ENABLE_GSM
 
-#if ENABLE_GSMHR
+#if ENABLE_GSMFR
 
 GSM_INCLUDE += -DWITH_GSMFR
 
@@ -69,6 +71,24 @@ SUBDIRS += libgsmfr
 
 #endif
 
+if ENABLE_GSMHR
+
+GSM_INCLUDE += -DWITH_GSMHR
+
+GSM_LIB += libgsmhr/libgsmhr.la
+
+SUBDIRS += libgsmhr
+
+endif
+
+if ENABLE_GSMAMR
+
+GSM_INCLUDE += -DWITH_GSMAMR
+
+GSM_LIB += -lopencore-amrnb
+
+endif
+
 GSM_SOURCE += gsm_audio.c gsm.cpp
 
 if ENABLE_GSM_BS
@@ -86,6 +106,7 @@ GSM_INCLUDE += -DWITH_GSM_MS
 GSM_SOURCE += gsm_ms.cpp
 
 endif
+
 endif
 
 
@@ -120,7 +141,7 @@ sbin_PROGRAMS = lcr genrc genextension
 if ENABLE_ASTERISK_CHANNEL_DRIVER
 noinst_PROGRAMS = chan_lcr.so
 chan_lcr_so_SOURCES =
-chan_lcr_so_LDFLAGS = -shared
+chan_lcr_so_LDFLAGS = --shared
 chan_lcr_so_LDADD = chan_lcr.po options.po callerid.po select.po
 
 # List chan_lcr specific sources for make dist
@@ -147,7 +168,7 @@ uninstall-hook:
 	cd '$(DESTDIR)$(astmoddir)' && rm -f chan_lcr.so
 endif
 
-INCLUDES = $(all_includes) $(MISDN_INCLUDE) $(GSM_INCLUDE) $(SS5_INCLUDE) $(SIP_INCLUDE) -Wall $(INSTALLATION_DEFINES)
+INCLUDES = $(all_includes) -I$(top_srcdir)/include $(MISDN_INCLUDE) $(GSM_INCLUDE) $(SS5_INCLUDE) $(SIP_INCLUDE) -Wall $(INSTALLATION_DEFINES)
 
 lcr_SOURCES = \
 	main.c select.c trace.c options.c tones.c alawulaw.c cause.c interface.c message.c callerid.c socket_server.c \