Browse code

logging: APP_NAME used instead of "sems" when writing into syslog

Václav Kubart authored on 15/10/2013 13:44:32
Showing 1 changed files
... ...
@@ -29,7 +29,8 @@ CPPFLAGS += -D_DEBUG \
29 29
 	  -D_THREAD_SAFE -D_REENTRANT \
30 30
 	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
31 31
 	  -DOS='"$(OS)"' 	\
32
-	  -DSYSTEM_SAMPLECLOCK_RATE=32000LL
32
+	  -DSYSTEM_SAMPLECLOCK_RATE=32000LL \
33
+          -DSEMS_APP_NAME='"$(APP_NAME)"'
33 34
 #         -DMAX_RTP_SESSIONS=8192 \
34 35
 #	  -DSUPPORT_IPV6 \
35 36
 #	  -DNO_THREADID_LOG \
... ...
@@ -159,7 +160,7 @@ CXX = g++
159 160
 CC = gcc
160 161
 LD = $(CC)
161 162
 
162
-CXXFLAGS += -Wall -Wno-reorder -Wno-unused -fPIC -g $(EXTRA_CXXFLAGS)
163
+CXXFLAGS += -Wall -Wno-reorder -Wno-unused -fPIC -g $(EXTRA_CXXFLAGS) 
163 164
 CFLAGS   += -Wall -fPIC -g $(EXTRA_CFLAGS)
164 165
 
165 166
 # only optimize if releasing, as it slows down the build process
Browse code

sip stack: propagate unparsed reply headers made conditional

has to be enabled explicitly during compilation (PROPAGATE_UNPARSED_REPLY_HEADERS=yes)

Václav Kubart authored on 22/08/2013 13:43:55
Showing 1 changed files
... ...
@@ -93,6 +93,11 @@ LONG_DEBUG_MESSAGE=yes
93 93
 # Is this a debug build or not?
94 94
 debug=no
95 95
 
96
+# Propagate all unparsed SIP headers into AmSipReply. Disabled by default
97
+# because only special applications might need this and it brings higher memory
98
+# demands and affects performance.
99
+#PROPAGATE_UNPARSED_REPLY_HEADERS=no
100
+
96 101
 
97 102
 ################### end of configuration section #######################
98 103
 
... ...
@@ -121,6 +126,9 @@ ifndef LONG_DEBUG_MESSAGE
121 126
 CPPFLAGS += -DLOG_BUFFER_LEN=2048
122 127
 endif
123 128
 
129
+ifeq ($(PROPAGATE_UNPARSED_REPLY_HEADERS),yes)
130
+CPPFLAGS += -DPROPAGATE_UNPARSED_REPLY_HEADERS
131
+endif
124 132
 
125 133
 # Additions for Solaris support.
126 134
 ifeq ($(OS),solaris)
Browse code

makefile b/f: configurable binary name and paths via preset variable

Václav Kubart authored on 22/08/2013 14:24:52
Showing 1 changed files
... ...
@@ -23,7 +23,7 @@ REL_VERSION := $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
23 23
 RELEASE := $(REL_VERSION)$(EXTRAVERSION)
24 24
 endif
25 25
 
26
-APP_NAME=sems
26
+APP_NAME ?= sems
27 27
 
28 28
 CPPFLAGS += -D_DEBUG \
29 29
 	  -D_THREAD_SAFE -D_REENTRANT \
Browse code

b/f: use reduced log message size only if LONG_DEBUG_MESSAGE has NOT been set.

Raphael Coeffic authored on 29/04/2013 17:26:32
Showing 1 changed files
... ...
@@ -117,7 +117,7 @@ ifdef USE_MONITORING
117 117
 CPPFLAGS += -DUSE_MONITORING
118 118
 endif
119 119
 
120
-ifdef LONG_DEBUG_MESSAGE
120
+ifndef LONG_DEBUG_MESSAGE
121 121
 CPPFLAGS += -DLOG_BUFFER_LEN=2048
122 122
 endif
123 123
 
Browse code

c/f: suppress some new warnings (>gcc 4.6)

Raphael Coeffic authored on 03/04/2013 12:53:45
Showing 1 changed files
... ...
@@ -151,7 +151,7 @@ CXX = g++
151 151
 CC = gcc
152 152
 LD = $(CC)
153 153
 
154
-CXXFLAGS += -Wall -Wno-reorder -fPIC -g $(EXTRA_CXXFLAGS)
154
+CXXFLAGS += -Wall -Wno-reorder -Wno-unused -fPIC -g $(EXTRA_CXXFLAGS)
155 155
 CFLAGS   += -Wall -fPIC -g $(EXTRA_CFLAGS)
156 156
 
157 157
 # only optimize if releasing, as it slows down the build process
Browse code

make name of sems binary and install dirs configurable

... to allow coexistence of different sems versions on one machine

Conflicts:
core/Makefile

Václav Kubart authored on 23/01/2013 18:41:10 • Raphael Coeffic committed on 28/02/2013 12:11:27
Showing 1 changed files
... ...
@@ -23,6 +23,8 @@ REL_VERSION := $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
23 23
 RELEASE := $(REL_VERSION)$(EXTRAVERSION)
24 24
 endif
25 25
 
26
+APP_NAME=sems
27
+
26 28
 CPPFLAGS += -D_DEBUG \
27 29
 	  -D_THREAD_SAFE -D_REENTRANT \
28 30
 	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
... ...
@@ -261,30 +263,30 @@ audio-prefix = $(basedir)$(prefix)
261 263
 lib-prefix = $(basedir)$(prefix)
262 264
 
263 265
 # dirs
264
-cfg-dir = etc/sems/
266
+cfg-dir = etc/$(APP_NAME)/
265 267
 
266 268
 bin-dir = sbin/
267
-modules-dir = lib/sems/plug-in/
268
-audio-dir = lib/sems/audio/
269
-lib-dir = lib/sems/
269
+modules-dir = lib/$(APP_NAME)/plug-in/
270
+audio-dir = lib/$(APP_NAME)/audio/
271
+lib-dir = lib/$(APP_NAME)/
270 272
 
271 273
 ifeq ($(OS), linux)
272
-	doc-dir = share/doc/sems/
274
+	doc-dir = share/doc/$(APP_NAME)/
273 275
 	man-dir = share/man/
274 276
 else
275 277
 ifeq ($(OS), freebsd)
276
-	doc-dir = share/doc/sems/
278
+	doc-dir = share/doc/$(APP_NAME)/
277 279
 	man-dir = man/
278 280
 else
279 281
 ifeq ($(OS), openbsd)
280
-	doc-dir = share/doc/sems/
282
+	doc-dir = share/doc/$(APP_NAME)/
281 283
 	man-dir = man/
282 284
 else
283 285
 ifeq ($(OS), netbsd)
284
-	doc-dir = share/doc/sems
286
+	doc-dir = share/doc/$(APP_NAME)
285 287
 	man-dir = man/
286 288
 else
287
-	doc-dir = doc/sems/
289
+	doc-dir = doc/$(APP_NAME)/
288 290
 	man-dir = man/
289 291
 endif
290 292
 endif
... ...
@@ -326,6 +328,7 @@ export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix lib-prefix
326 328
 export cfg-dir bin-dir modules-dir audio-dir lib-dir doc-dir man-dir
327 329
 export bin-target cfg-target app-cfg-target modules-target audio-target lib-target
328 330
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
331
+export APP_NAME
329 332
 
330 333
 export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR 
331 334
 export USE_LIBSAMPLERATE USE_INTERNAL_RESAMPLER
Browse code

core: propagate coredump settings in daemon mode

it seems that coredump settings needs to be propagated explicitly in daemon mode (see man prctl, linux only)

Václav Kubart authored on 23/01/2013 14:19:24 • Raphael Coeffic committed on 30/01/2013 13:58:18
Showing 1 changed files
... ...
@@ -182,6 +182,7 @@ endif
182 182
 
183 183
 ifeq ($(OS), linux)
184 184
 	LDFLAGS +=  -ldl $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
185
+	CPPFLAGS += -DPROPAGATE_COREDUMP_SETTINGS
185 186
 else
186 187
 ifeq ($(OS), freebsd)
187 188
 	LDFLAGS += $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
Browse code

updated static version number to 1.6.0

Raphael Coeffic authored on 06/07/2012 11:38:52
Showing 1 changed files
... ...
@@ -13,7 +13,7 @@ endif
13 13
 
14 14
 #version number
15 15
 VERSION = 1
16
-PATCHLEVEL = 5
16
+PATCHLEVEL = 6
17 17
 SUBLEVEL = 0
18 18
 
19 19
 ifneq ($(SCM_REV),)
Browse code

remove unused linking parameters for clang.

Raphael Coeffic authored on 03/07/2012 10:57:21
Showing 1 changed files
... ...
@@ -172,20 +172,28 @@ endif
172 172
 TARGET=
173 173
 LIB_LDFLAGS = -shared
174 174
 
175
+ifeq ($(LD), clang)
176
+LDFLAG_DYN=
177
+LDFLAG_PTHREAD=
178
+else
179
+LDFLAG_DYN = -rdynamic
180
+LDFLAG_PTHREAD = -lpthread
181
+endif
182
+
175 183
 ifeq ($(OS), linux)
176
-	LDFLAGS +=  -ldl -rdynamic -lpthread
184
+	LDFLAGS +=  -ldl $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
177 185
 else
178 186
 ifeq ($(OS), freebsd)
179
-	LDFLAGS += -rdynamic -pthread
187
+	LDFLAGS += $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
180 188
 else
181 189
 ifeq ($(OS), openbsd)
182
-	LDFLAGS += -rdynamic -pthread
190
+	LDFLAGS += $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
183 191
 else
184 192
 ifeq ($(OS), netbsd)
185
-	LDFLAGS += -rdynamic -pthread
193
+	LDFLAGS += $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
186 194
 else
187 195
 ifeq ($(OS), macosx)
188
-	LDFLAGS += -rdynamic -pthread
196
+	LDFLAGS += $(LDFLAG_DYN) $(LDFLAG_PTHREAD)
189 197
 	LIB_LDFLAGS = -flat_namespace -undefined suppress -bundle
190 198
 	CXXFLAGS += -fno-common
191 199
 	CFLAGS += -fno-common
... ...
@@ -202,7 +210,7 @@ ifeq ($(OS), macosx)
202 210
 	endif	      
203 211
 else
204 212
 ifeq ($(OS), solaris)
205
-       	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
213
+       	LDFLAGS+= -fPIC -ldl -lsocket -lnsl $(LDFLAG_PTHREAD)
206 214
 	TARGET=solaris
207 215
 	# These don't build on Solaris because of missing Python, invalid make args, or other.
208 216
 	exclude_app_modules += py_sems py_comp pin_collect mailbox ivr diameter_client conf_auth mp3 cc_acc_xmlrpc xmlrpc2di
Browse code

by default don't compile silk codec module (depends on SILK codec lib)

Stefan Sayer authored on 13/03/2012 22:24:57
Showing 1 changed files
... ...
@@ -75,7 +75,7 @@ USE_INTERNAL_RESAMPLER = yes
75 75
 # exclude some modules from compilation?
76 76
 # e.g. python modules:
77 77
 
78
-exclude_core_modules = g729
78
+exclude_core_modules = g729 silk
79 79
 #exclude_apps_modules = py_sems ivr mailbox pin_collect conf_auth mp3 examples
80 80
 
81 81
 # build in support for monitoring?
Browse code

wideband: several fixes related to timestamp overflows at different sample rates.

Raphael Coeffic authored on 09/03/2012 13:02:12
Showing 1 changed files
... ...
@@ -27,7 +27,7 @@ CPPFLAGS += -D_DEBUG \
27 27
 	  -D_THREAD_SAFE -D_REENTRANT \
28 28
 	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
29 29
 	  -DOS='"$(OS)"' 	\
30
-	  -DSYSTEM_SAMPLECLOCK_RATE=32000
30
+	  -DSYSTEM_SAMPLECLOCK_RATE=32000LL
31 31
 #         -DMAX_RTP_SESSIONS=8192 \
32 32
 #	  -DSUPPORT_IPV6 \
33 33
 #	  -DNO_THREADID_LOG \
Browse code

adds support for wideband audio

Raphael Coeffic authored on 21/02/2012 17:26:22
Showing 1 changed files
... ...
@@ -27,6 +27,7 @@ CPPFLAGS += -D_DEBUG \
27 27
 	  -D_THREAD_SAFE -D_REENTRANT \
28 28
 	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
29 29
 	  -DOS='"$(OS)"' 	\
30
+	  -DSYSTEM_SAMPLECLOCK_RATE=32000
30 31
 #         -DMAX_RTP_SESSIONS=8192 \
31 32
 #	  -DSUPPORT_IPV6 \
32 33
 #	  -DNO_THREADID_LOG \
Browse code

added resample library from Stefan Keller

Thanks to Stefan <skeller@zahlenfresser.de> for this great contribution!

Raphael Coeffic authored on 21/02/2012 17:22:05
Showing 1 changed files
... ...
@@ -61,6 +61,11 @@ CPPFLAGS += -D_DEBUG \
61 61
 #
62 62
 #USE_LIBSAMPLERATE = yes
63 63
 
64
+# compile with internal resampler?
65
+#
66
+#
67
+USE_INTERNAL_RESAMPLER = yes
68
+
64 69
 #
65 70
 # ZRTP support? (see zfoneproject.com)
66 71
 #WITH_ZRTP = yes
... ...
@@ -105,7 +110,6 @@ ifndef USE_SPANDSP
105 110
 exclude_core_modules += g722
106 111
 endif
107 112
 
108
-
109 113
 ifdef USE_MONITORING
110 114
 CPPFLAGS += -DUSE_MONITORING
111 115
 endif
... ...
@@ -215,7 +219,6 @@ ifeq ($(ARCH),iphone)
215 219
 LDFLAGS += -lgcc_eh
216 220
 endif
217 221
 
218
-
219 222
 ifdef WITH_ZRTP
220 223
 LDFLAGS +=-lzrtp -lbn
221 224
 endif
... ...
@@ -315,7 +318,7 @@ export bin-target cfg-target app-cfg-target modules-target audio-target lib-targ
315 318
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
316 319
 
317 320
 export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR 
318
-export USE_LIBSAMPLERATE
321
+export USE_LIBSAMPLERATE USE_INTERNAL_RESAMPLER
319 322
 export WITH_ZRTP
320 323
 export USE_MONITORING
321 324
 export exclude_core_modules exclude_app_modules
Browse code

makefile improvements

- make use of simultaneous complication and dependency generation.
- flatten make process a bit.

Raphael Coeffic authored on 01/03/2012 14:08:45
Showing 1 changed files
... ...
@@ -3,10 +3,10 @@ else
3 3
 makefile_defs="1"
4 4
 export makefile_defs
5 5
 
6
-GIT = $(shell which git)
6
+GIT := $(shell which git)
7 7
 
8 8
 ifneq ($(GIT),)
9
-   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
9
+   SCM_REV := $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
10 10
         then git describe --always --dirty 2>/dev/null; \
11 11
         else git describe --always 2>/dev/null; fi)
12 12
 endif
... ...
@@ -17,10 +17,10 @@ PATCHLEVEL = 5
17 17
 SUBLEVEL = 0
18 18
 
19 19
 ifneq ($(SCM_REV),)
20
-RELEASE = $(SCM_REV)
20
+RELEASE := $(SCM_REV)
21 21
 else
22
-REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
23
-RELEASE=$(REL_VERSION)$(EXTRAVERSION)
22
+REL_VERSION := $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
23
+RELEASE := $(REL_VERSION)$(EXTRAVERSION)
24 24
 endif
25 25
 
26 26
 CPPFLAGS += -D_DEBUG \
... ...
@@ -101,23 +101,10 @@ ifdef USE_THREADPOOL
101 101
 CPPFLAGS += -DSESSION_THREADPOOL
102 102
 endif
103 103
 
104
-ifdef USE_SPANDSP
105
-ifneq ($(spandsp_defs), 1)
106
-spandsp_defs=1
107
-export spandsp_defs
108
-CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
109
-endif
110
-else
104
+ifndef USE_SPANDSP
111 105
 exclude_core_modules += g722
112 106
 endif
113 107
 
114
-ifdef USE_LIBSAMPLERATE
115
-ifneq ($(libsrc_defs), 1)
116
-libsrc_defs=1
117
-export libsrc_defs
118
-CPPFLAGS += -DUSE_LIBSAMPLERATE
119
-endif
120
-endif
121 108
 
122 109
 ifdef USE_MONITORING
123 110
 CPPFLAGS += -DUSE_MONITORING
... ...
@@ -228,17 +215,6 @@ ifeq ($(ARCH),iphone)
228 215
 LDFLAGS += -lgcc_eh
229 216
 endif
230 217
 
231
-ifdef USE_SPANDSP
232
-ifdef LIBSPANDSP_STATIC
233
-LDFLAGS += $(LIBSPANDSP_LDIR)libspandsp.a
234
-else
235
-LDFLAGS += -lspandsp
236
-endif
237
-endif
238
-
239
-ifdef USE_LIBSAMPLERATE
240
-LDFLAGS +=-lsamplerate
241
-endif
242 218
 
243 219
 ifdef WITH_ZRTP
244 220
 LDFLAGS +=-lzrtp -lbn
Browse code

fixing makefile_defs setting for strict make

Stefan Sayer authored on 24/11/2011 15:27:38
Showing 1 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 ifeq ($(makefile_defs),"1")
2 2
 else
3
-makefile_defs=1
3
+makefile_defs="1"
4 4
 export makefile_defs
5 5
 
6 6
 GIT = $(shell which git)
Browse code

fixing make file inclusion for some make versions

fix by Alekzander Spiridonov

Stefan Sayer authored on 21/10/2011 14:23:21
Showing 1 changed files
... ...
@@ -1,4 +1,4 @@
1
-ifeq ($(makefile_defs),1)
1
+ifeq ($(makefile_defs),"1")
2 2
 else
3 3
 makefile_defs=1
4 4
 export makefile_defs
Browse code

adds libsems1-dev package, to build modules out-of-tree

based on a patch by Michael Prokop mprokop at sipwise dot com

Stefan Sayer authored on 20/10/2011 23:16:41
Showing 1 changed files
... ...
@@ -93,8 +93,9 @@ LDFLAGS += -lm
93 93
 GETOS=$(COREPATH)/compat/getos
94 94
 GETARCH=$(COREPATH)/compat/getarch
95 95
 
96
-OS   := $(shell $(CC) $(EXTRA_CFLAGS) -o $(GETOS) $(GETOS).c && $(GETOS))
97
-ARCH := $(shell $(CC) $(EXTRA_CFLAGS) -o $(GETARCH) $(GETARCH).c && $(GETARCH))
96
+
97
+OS   := $(shell if [ -f $(GETOS) ] ; then $(GETOS); else  $(CC) $(EXTRA_CFLAGS) -o $(GETOS) $(GETOS).c && $(GETOS); fi)
98
+ARCH := $(shell if [ -f $(GETARCH) ] ; then $(GETARCH); else $(CC) $(EXTRA_CFLAGS) -o $(GETARCH) $(GETARCH).c && $(GETARCH); fi)
98 99
 
99 100
 ifdef USE_THREADPOOL
100 101
 CPPFLAGS += -DSESSION_THREADPOOL
Browse code

Merge branch 'master' of ssh://git.sip-router.org/sems into offer_answer

Raphael Coeffic authored on 21/04/2011 09:49:40
Showing 0 changed files
Browse code

dropped support for svn version numbers.

Raphael Coeffic authored on 21/04/2011 08:19:04
Showing 1 changed files
... ...
@@ -4,7 +4,6 @@ makefile_defs=1
4 4
 export makefile_defs
5 5
 
6 6
 GIT = $(shell which git)
7
-SVNVERSION = $(shell which svnversion)
8 7
 
9 8
 ifneq ($(GIT),)
10 9
    SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
... ...
@@ -12,12 +11,6 @@ ifneq ($(GIT),)
12 11
         else git describe --always 2>/dev/null; fi)
13 12
 endif
14 13
 
15
-ifeq ($(SCM_REV),)
16
-ifneq ($(SVNVERSION),)
17
-   SCM_REV = r$(shell svnversion -n .)
18
-endif
19
-endif
20
-
21 14
 #version number
22 15
 VERSION = 1
23 16
 PATCHLEVEL = 5
Browse code

shortens dev build version

additionally, allows for release build without modifying Makefile.defs:
make all GIT= SVNVERSION= EXTRAVERSION=-deb-xy

Raphael Coeffic authored on 21/04/2011 08:18:42
Showing 1 changed files
... ...
@@ -24,11 +24,11 @@ PATCHLEVEL = 5
24 24
 SUBLEVEL = 0
25 25
 
26 26
 ifneq ($(SCM_REV),)
27
-EXTRAVERSION = -dev-$(SCM_REV)
28
-endif
29
-
27
+RELEASE = $(SCM_REV)
28
+else
30 29
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
31 30
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
31
+endif
32 32
 
33 33
 CPPFLAGS += -D_DEBUG \
34 34
 	  -D_THREAD_SAFE -D_REENTRANT \
Browse code

Merge branch 'master' into offer_answer

Raphael Coeffic authored on 15/04/2011 10:27:13
Showing 0 changed files
Browse code

Revert "session thread pool enabled by default"

This reverts commit ef85d6eae880f6771f20a3407248099d7752d6ce.

Raphael Coeffic authored on 10/04/2011 17:39:51
Showing 1 changed files
... ...
@@ -50,7 +50,7 @@ CPPFLAGS += -D_DEBUG \
50 50
 #      if compiled without thread pool support, every
51 51
 #      session will have its own thread.
52 52
 #
53
-USE_THREADPOOL = yes
53
+#USE_THREADPOOL = yes
54 54
 
55 55
 # compile with spandsp DTMF detection? see soft-switch.org
56 56
 #   this needs a fairly new version of spandsp - tested with 0.0.4pre11
Browse code

Merge branch 'master' into offer_answer

Raphael Coeffic authored on 05/04/2011 12:09:31
Showing 0 changed files
Browse code

session thread pool enabled by default

Raphael Coeffic authored on 16/03/2011 13:23:50
Showing 1 changed files
... ...
@@ -50,7 +50,7 @@ CPPFLAGS += -D_DEBUG \
50 50
 #      if compiled without thread pool support, every
51 51
 #      session will have its own thread.
52 52
 #
53
-#USE_THREADPOOL = yes
53
+USE_THREADPOOL = yes
54 54
 
55 55
 # compile with spandsp DTMF detection? see soft-switch.org
56 56
 #   this needs a fairly new version of spandsp - tested with 0.0.4pre11
Browse code

set 1.5-dev version

Stefan Sayer authored on 15/03/2011 10:51:34
Showing 1 changed files
... ...
@@ -3,29 +3,29 @@ else
3 3
 makefile_defs=1
4 4
 export makefile_defs
5 5
 
6
-#GIT = $(shell which git)
7
-#SVNVERSION = $(shell which svnversion)
8
-#
9
-#ifneq ($(GIT),)
10
-#   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
-#        then git describe --always --dirty 2>/dev/null; \
12
-#        else git describe --always 2>/dev/null; fi)
13
-#endif
14
-#
15
-#ifeq ($(SCM_REV),)
16
-#ifneq ($(SVNVERSION),)
17
-#   SCM_REV = r$(shell svnversion -n .)
18
-#endif
19
-#endif
6
+GIT = $(shell which git)
7
+SVNVERSION = $(shell which svnversion)
8
+
9
+ifneq ($(GIT),)
10
+   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
+        then git describe --always --dirty 2>/dev/null; \
12
+        else git describe --always 2>/dev/null; fi)
13
+endif
14
+
15
+ifeq ($(SCM_REV),)
16
+ifneq ($(SVNVERSION),)
17
+   SCM_REV = r$(shell svnversion -n .)
18
+endif
19
+endif
20 20
 
21 21
 #version number
22 22
 VERSION = 1
23
-PATCHLEVEL = 4
23
+PATCHLEVEL = 5
24 24
 SUBLEVEL = 0
25 25
 
26
-#ifneq ($(SCM_REV),)
27
-#EXTRAVERSION = -dev-$(SCM_REV)
28
-#endif
26
+ifneq ($(SCM_REV),)
27
+EXTRAVERSION = -dev-$(SCM_REV)
28
+endif
29 29
 
30 30
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
31 31
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
Browse code

set 1.4.0 release version

Stefan Sayer authored on 15/03/2011 10:12:34
Showing 1 changed files
... ...
@@ -3,29 +3,29 @@ else
3 3
 makefile_defs=1
4 4
 export makefile_defs
5 5
 
6
-GIT = $(shell which git)
7
-SVNVERSION = $(shell which svnversion)
8
-
9
-ifneq ($(GIT),)
10
-   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
-        then git describe --always --dirty 2>/dev/null; \
12
-        else git describe --always 2>/dev/null; fi)
13
-endif
14
-
15
-ifeq ($(SCM_REV),)
16
-ifneq ($(SVNVERSION),)
17
-   SCM_REV = r$(shell svnversion -n .)
18
-endif
19
-endif
6
+#GIT = $(shell which git)
7
+#SVNVERSION = $(shell which svnversion)
8
+#
9
+#ifneq ($(GIT),)
10
+#   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
+#        then git describe --always --dirty 2>/dev/null; \
12
+#        else git describe --always 2>/dev/null; fi)
13
+#endif
14
+#
15
+#ifeq ($(SCM_REV),)
16
+#ifneq ($(SVNVERSION),)
17
+#   SCM_REV = r$(shell svnversion -n .)
18
+#endif
19
+#endif
20 20
 
21 21
 #version number
22 22
 VERSION = 1
23 23
 PATCHLEVEL = 4
24 24
 SUBLEVEL = 0
25 25
 
26
-ifneq ($(SCM_REV),)
27
-EXTRAVERSION = -dev-$(SCM_REV)
28
-endif
26
+#ifneq ($(SCM_REV),)
27
+#EXTRAVERSION = -dev-$(SCM_REV)
28
+#endif
29 29
 
30 30
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
31 31
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
Browse code

Merge branch 'master' into offer_answer

Raphael Coeffic authored on 18/02/2011 11:36:25
Showing 1 changed files
... ...
@@ -86,7 +86,8 @@ USE_MONITORING=yes
86 86
 
87 87
 # Support for long debug messages? (useful for debugging SIP messages' contents)
88 88
 #
89
-#LONG_DEBUG_MESSAGE=yes
89
+# disable for slight performance gain
90
+LONG_DEBUG_MESSAGE=yes
90 91
 
91 92
 # Is this a debug build or not?
92 93
 debug=no
Browse code

LONG_DEBUG_MESSAGE enabled by default

Stefan Sayer authored on 11/02/2011 12:16:15
Showing 1 changed files
... ...
@@ -86,7 +86,8 @@ USE_MONITORING=yes
86 86
 
87 87
 # Support for long debug messages? (useful for debugging SIP messages' contents)
88 88
 #
89
-#LONG_DEBUG_MESSAGE=yes
89
+# disable for slight performance gain
90
+LONG_DEBUG_MESSAGE=yes
90 91
 
91 92
 # Is this a debug build or not?
92 93
 debug=no
Browse code

removed sipctrl.

Raphael Coeffic authored on 24/01/2011 15:11:34
Showing 1 changed files
... ...
@@ -76,7 +76,7 @@ CPPFLAGS += -D_DEBUG \
76 76
 # exclude some modules from compilation?
77 77
 # e.g. python modules:
78 78
 
79
-exclude_core_modules = sipctrl g729
79
+exclude_core_modules = g729
80 80
 #exclude_apps_modules = py_sems ivr mailbox pin_collect conf_auth mp3 examples
81 81
 
82 82
 # build in support for monitoring?
Browse code

set 1.4-dev version for master

Stefan Sayer authored on 26/09/2010 23:49:01
Showing 1 changed files
... ...
@@ -20,7 +20,7 @@ endif
20 20
 
21 21
 #version number
22 22
 VERSION = 1
23
-PATCHLEVEL = 3
23
+PATCHLEVEL = 4
24 24
 SUBLEVEL = 0
25 25
 
26 26
 ifneq ($(SCM_REV),)
Browse code

enable passing of cfg-target to Makefiles

debian authored on 26/09/2010 00:22:56
Showing 1 changed files
... ...
@@ -260,7 +260,7 @@ LIB_LDFLAGS += $(LDFLAGS)
260 260
 
261 261
 DESTDIR ?= 
262 262
 PREFIX ?= /usr/local
263
-prefix = $(PREFIX)
263
+prefix ?= $(PREFIX)
264 264
 BASEDIR ?=
265 265
 basedir = $(BASEDIR)
266 266
 
... ...
@@ -309,8 +309,8 @@ endif
309 309
 
310 310
 # target dirs for various stuff
311 311
 bin-target = $(prefix)/$(bin-dir)
312
-cfg-target = $(prefix)/$(cfg-dir)
313
-app-cfg-target = $(prefix)/$(cfg-dir)etc/
312
+cfg-target ?= $(prefix)/$(cfg-dir)
313
+app-cfg-target = $(cfg-target)etc/
314 314
 modules-target = $(prefix)/$(modules-dir)
315 315
 audio-target = $(prefix)/$(audio-dir)
316 316
 lib-target = $(prefix)/$(lib-dir)
Browse code

G.729 codec module (wrapper for Intel IPP 0.6)

Stefan Sayer authored on 23/09/2010 00:12:45
Showing 1 changed files
... ...
@@ -76,7 +76,7 @@ CPPFLAGS += -D_DEBUG \
76 76
 # exclude some modules from compilation?
77 77
 # e.g. python modules:
78 78
 
79
-exclude_core_modules = sipctrl
79
+exclude_core_modules = sipctrl g729
80 80
 #exclude_apps_modules = py_sems ivr mailbox pin_collect conf_auth mp3 examples
81 81
 
82 82
 # build in support for monitoring?
Browse code

reverted app config dir to /etc/sems/etc

For users upgrading from earlier versions, changing the path without
any advantage would just create confusion. Also, /etc/sems is cluttered
with lots of files if all app configurations are saved there.

Stefan Sayer authored on 22/09/2010 12:25:19
Showing 1 changed files
... ...
@@ -310,6 +310,7 @@ endif
310 310
 # target dirs for various stuff
311 311
 bin-target = $(prefix)/$(bin-dir)
312 312
 cfg-target = $(prefix)/$(cfg-dir)
313
+app-cfg-target = $(prefix)/$(cfg-dir)etc/
313 314
 modules-target = $(prefix)/$(modules-dir)
314 315
 audio-target = $(prefix)/$(audio-dir)
315 316
 lib-target = $(prefix)/$(lib-dir)
... ...
@@ -339,7 +340,7 @@ export DESTDIR PREFIX prefix basedir ser-prefix
339 340
 export start-script
340 341
 export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix lib-prefix
341 342
 export cfg-dir bin-dir modules-dir audio-dir lib-dir doc-dir man-dir
342
-export bin-target cfg-target modules-target audio-target lib-target
343
+export bin-target cfg-target app-cfg-target modules-target audio-target lib-target
343 344
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
344 345
 
345 346
 export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR 
... ...
@@ -350,6 +351,7 @@ export exclude_core_modules exclude_app_modules
350 351
 endif  # ifeq ($(makefile_defs, 1)
351 352
 
352 353
 mk-install-dirs: $(DESTDIR)$(cfg-target) \
354
+		 $(DESTDIR)$(app-cfg-target) \
353 355
 		 $(DESTDIR)$(bin-prefix)/$(bin-dir) \
354 356
 		 $(DESTDIR)$(modules-prefix)/$(modules-dir) \
355 357
 		 $(DESTDIR)$(audio-prefix)/$(audio-dir) \
... ...
@@ -358,6 +360,9 @@ mk-install-dirs: $(DESTDIR)$(cfg-target) \
358 360
 $(DESTDIR)$(cfg-target): 
359 361
 	mkdir -p $(DESTDIR)$(cfg-target)
360 362
 
363
+$(DESTDIR)$(app-cfg-target): 
364
+	mkdir -p $(DESTDIR)$(app-cfg-target)
365
+
361 366
 $(DESTDIR)$(bin-prefix)/$(bin-dir):
362 367
 	mkdir -p $(DESTDIR)$(bin-prefix)/$(bin-dir)
363 368
 
Browse code

b/f:makefile_defs comparison for really picky make

Stefan Sayer authored on 22/09/2010 11:39:07
Showing 1 changed files
... ...
@@ -1,4 +1,4 @@
1
-ifeq ($(makefile_defs), 1)
1
+ifeq ($(makefile_defs),1)
2 2
 else
3 3
 makefile_defs=1
4 4
 export makefile_defs
Browse code

Merge branch 'master' into bpintea/prack

Resolved conflicts:

core/AmSessionEventHandler.h
core/plug-in/uac_auth/UACAuth.cpp

b/f: missing 'old_dlg_status' param in some onReply's:

apps/auth_b2b/AuthB2B.cpp
apps/registrar_client/SIPRegistrarClient.cpp
apps/sst_b2b/SSTB2B.cpp

bpintea authored on 01/08/2010 14:44:27
Showing 0 changed files
Browse code

quiet git if .git is not there

Stefan Sayer authored on 11/07/2010 09:56:51
Showing 1 changed files
... ...
@@ -7,7 +7,9 @@ GIT = $(shell which git)
7 7
 SVNVERSION = $(shell which svnversion)
8 8
 
9 9
 ifneq ($(GIT),)
10
-   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; then git describe --always --dirty; else git describe --always ; fi)
10
+   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
11
+        then git describe --always --dirty 2>/dev/null; \
12
+        else git describe --always 2>/dev/null; fi)
11 13
 endif
12 14
 
13 15
 ifeq ($(SCM_REV),)
Browse code

removed that trailing space in version

Stefan Sayer authored on 11/07/2010 09:53:41
Showing 1 changed files
... ...
@@ -7,7 +7,7 @@ GIT = $(shell which git)
7 7
 SVNVERSION = $(shell which svnversion)
8 8
 
9 9
 ifneq ($(GIT),)
10
-   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; then git describe --always --dirty; else git describe --always ; fi) 
10
+   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; then git describe --always --dirty; else git describe --always ; fi)
11 11
 endif
12 12
 
13 13
 ifeq ($(SCM_REV),)
Browse code

small fixes

- add a build debugging mode (to just exclude, for now, the -O2 - makes g++
much slower)
- onNoPrack's signature updated in registrar client
- log errors when unable to send a message (besides a bunch of debugs, some of
which should be warnings, actually)

bpi authored on 01/07/2010 18:57:52
Showing 1 changed files
... ...
@@ -86,6 +86,9 @@ USE_MONITORING=yes
86 86
 #
87 87
 #LONG_DEBUG_MESSAGE=yes
88 88
 
89
+# Is this a debug build or not?
90
+debug=no
91
+
89 92
 
90 93
 ################### end of configuration section #######################
91 94
 
... ...
@@ -157,11 +160,14 @@ CXX = g++
157 160
 CC = gcc
158 161
 LD = $(CC)
159 162
 
163
+CXXFLAGS += -Wall -Wno-reorder -fPIC -g $(EXTRA_CXXFLAGS)
164
+CFLAGS   += -Wall -fPIC -g $(EXTRA_CFLAGS)
160 165
 
161
-CXXFLAGS += -Wall -Wno-reorder -fPIC -g \
162
-	    -O2 $(EXTRA_CXXFLAGS)
163
-         
164
-CFLAGS += -Wall -fPIC -g -O2 $(EXTRA_CFLAGS)
166
+# only optimize if releasing, as it slows down the build process
167
+ifneq ($(debug),yes)
168
+	CXXFLAGS += -O2
169
+	CFLAGS += -O2
170
+endif
165 171
 
166 172
 ifeq ($(DEBUG_PLAYOUT), yes)
167 173
 CPPFLAGS +=  -DDEBUG_PLAYOUTBUF
Browse code

support git without --dirty

older (? current on ubuntu 9.10) git doesn't support --dirty option

Stefan Sayer authored on 19/06/2010 15:46:28
Showing 1 changed files
... ...
@@ -7,7 +7,7 @@ GIT = $(shell which git)
7 7
 SVNVERSION = $(shell which svnversion)
8 8
 
9 9
 ifneq ($(GIT),)
10
-   SCM_REV = $(shell git describe --always --dirty)
10
+   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; then git describe --always --dirty; else git describe --always ; fi) 
11 11
 endif
12 12
 
13 13
 ifeq ($(SCM_REV),)
Browse code

generate EXTRAVERSION out of 'git describe ...'

Raphael Coeffic authored on 02/06/2010 09:49:52
Showing 1 changed files
... ...
@@ -3,13 +3,27 @@ else
3 3
 makefile_defs=1
4 4
 export makefile_defs
5 5
 
6
-SVN_REV?=r$(shell svnversion -n .)
6
+GIT = $(shell which git)
7
+SVNVERSION = $(shell which svnversion)
8
+
9
+ifneq ($(GIT),)
10
+   SCM_REV = $(shell git describe --always --dirty)
11
+endif
12
+
13
+ifeq ($(SCM_REV),)
14
+ifneq ($(SVNVERSION),)
15
+   SCM_REV = r$(shell svnversion -n .)
16
+endif
17
+endif
7 18
 
8 19
 #version number
9 20
 VERSION = 1
10 21
 PATCHLEVEL = 3
11 22
 SUBLEVEL = 0
12
-EXTRAVERSION ?= -dev-$(SVN_REV)
23
+
24
+ifneq ($(SCM_REV),)
25
+EXTRAVERSION = -dev-$(SCM_REV)
26
+endif
13 27
 
14 28
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
15 29
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
Browse code

don't break compilation if buffer length is not defined

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1902 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Stefan Sayer authored on 18/05/2010 11:20:30
Showing 1 changed files
... ...
@@ -111,8 +111,6 @@ endif
111 111
 
112 112
 ifdef LONG_DEBUG_MESSAGE
113 113
 CPPFLAGS += -DLOG_BUFFER_LEN=2048
114
-else
115
-CPPFLAGS += -DLOG_BUFFER_LEN=512
116 114
 endif
117 115
 
118 116
 
Browse code

make short/truncated debug messages default (performance)

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1901 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Stefan Sayer authored on 18/05/2010 11:16:16
Showing 1 changed files
... ...
@@ -70,7 +70,7 @@ USE_MONITORING=yes
70 70
 
71 71
 # Support for long debug messages? (useful for debugging SIP messages' contents)
72 72
 #
73
-LONG_DEBUG_MESSAGE=yes
73
+#LONG_DEBUG_MESSAGE=yes
74 74
 
75 75
 
76 76
 ################### end of configuration section #######################
Browse code

optionally compile with long debug messages. don't print messages twice when sending

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1900 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Stefan Sayer authored on 18/05/2010 11:13:39
Showing 1 changed files
... ...
@@ -68,6 +68,13 @@ exclude_core_modules = sipctrl
68 68
 #
69 69
 USE_MONITORING=yes
70 70
 
71
+# Support for long debug messages? (useful for debugging SIP messages' contents)
72
+#
73
+LONG_DEBUG_MESSAGE=yes
74
+
75
+
76
+################### end of configuration section #######################
77
+
71 78
 LDFLAGS += -lm
72 79
 
73 80
 GETOS=$(COREPATH)/compat/getos
... ...
@@ -99,9 +106,16 @@ endif
99 106
 endif
100 107
 
101 108
 ifdef USE_MONITORING
102
-CPPFLAGS += -DUSE_MONITORING      
109
+CPPFLAGS += -DUSE_MONITORING
103 110
 endif
104 111
 
112
+ifdef LONG_DEBUG_MESSAGE
113
+CPPFLAGS += -DLOG_BUFFER_LEN=2048
114
+else
115
+CPPFLAGS += -DLOG_BUFFER_LEN=512
116
+endif
117
+
118
+
105 119
 # Additions for Solaris support.
106 120
 ifeq ($(OS),solaris)
107 121
 	CPPFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
Browse code

per default, put 1. not the complete function signature in the log 2. the location (PID/TID/file/line...) at the beginning

see 1 -DLOG_PRETTY_FUNCTION and 2 -DLOG_LOC_DATA_ATEND in Makefile.defs


git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1879 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Stefan Sayer authored on 01/05/2010 15:06:11
Showing 1 changed files
... ...
@@ -21,6 +21,8 @@ CPPFLAGS += -D_DEBUG \
21 21
 #         -DMAX_RTP_SESSIONS=8192 \
22 22
 #	  -DSUPPORT_IPV6 \
23 23
 #	  -DNO_THREADID_LOG \
24
+#         -DLOG_PRETTY_FUNCTION \
25
+#         -DLOG_LOC_DATA_ATEND
24 26
 
25 27
 
26 28
 # compile with session thread pool support?
Browse code

removed some more obsolete ser-sems stuff

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1844 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Stefan Sayer authored on 27/04/2010 11:39:49
Showing 1 changed files
... ...
@@ -248,8 +248,6 @@ modules-dir = lib/sems/plug-in/
248 248
 audio-dir = lib/sems/audio/
249 249
 lib-dir = lib/sems/
250 250
 
251
-ser-cfg-dir = etc/ser/
252
-
253 251
 ifeq ($(OS), linux)
254 252
 	doc-dir = share/doc/sems/
255 253
 	man-dir = share/man/
... ...
@@ -278,7 +276,6 @@ bin-target = $(prefix)/$(bin-dir)
278 276
 cfg-target = $(prefix)/$(cfg-dir)
279 277
 modules-target = $(prefix)/$(modules-dir)
280 278
 audio-target = $(prefix)/$(audio-dir)
281
-ser-cfg-target =$(ser-prefix)/$(ser-cfg-dir)
282 279
 lib-target = $(prefix)/$(lib-dir)
283 280
 
284 281
 ifeq ($(OS), solaris)
... ...
@@ -305,8 +302,8 @@ export CXX CC LD
305 302
 export DESTDIR PREFIX prefix basedir ser-prefix
306 303
 export start-script
307 304
 export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix lib-prefix
308
-export cfg-dir bin-dir modules-dir audio-dir lib-dir ser-cfg-dir doc-dir man-dir
309
-export bin-target cfg-target modules-target audio-target ser-cfg-target lib-target
305
+export cfg-dir bin-dir modules-dir audio-dir lib-dir doc-dir man-dir
306
+export bin-target cfg-target modules-target audio-target lib-target
310 307
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
311 308
 
312 309
 export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR 
Browse code

- some more small fixes. - added cseq checking. - added pending INVITE checking.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1841 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Raphael Coeffic authored on 27/04/2010 10:36:58
Showing 1 changed files
... ...
@@ -177,9 +177,6 @@ ifeq ($(OS), macosx)
177 177
 	      CPPFLAGS += -I /opt/local/include
178 178
 	      LDFLAGS += -L/opt/local/lib
179 179
 	endif	      
180
-
181
-	exclude_core_modules += binrpcctrl 
182
-	exclude_app_modules += ivr
183 180
 else
184 181
 ifeq ($(OS), solaris)
185 182
        	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
Browse code

Introduces optional (compile-time) threadpool for signaling support.

to use it, set USE_THREADPOOL in Makefile.defs and configure thread pool
size with session_processor_threads= parameter in sems.conf :

+# compile with session thread pool support?
+# use this for very high concurrent call count
+# applications (e.g. for signaling only)
+# if compiled with thread pool, there will be a
+# thread pool of configurable size processing the
+# signaling and application logic of the calls.
+# if compiled without thread pool support, every
+# session will have its own thread.
+#
+#USE_THREADPOOL = yes



git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1782 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Stefan Sayer authored on 15/04/2010 12:22:30
Showing 1 changed files
... ...
@@ -22,6 +22,18 @@ CPPFLAGS += -D_DEBUG \
22 22
 #	  -DSUPPORT_IPV6 \
23 23
 #	  -DNO_THREADID_LOG \
24 24
 
25
+
26
+# compile with session thread pool support?
27
+#      use this for very high concurrent call count 
28
+#      applications (e.g. for signaling only)
29
+#      if compiled with thread pool, there will be a 
30
+#      thread pool of configurable size processing the
31
+#      signaling and application logic of the calls.
32
+#      if compiled without thread pool support, every
33
+#      session will have its own thread.
34
+#
35
+#USE_THREADPOOL = yes
36
+
25 37
 # compile with spandsp DTMF detection? see soft-switch.org
26 38
 #   this needs a fairly new version of spandsp - tested with 0.0.4pre11
27 39
 #   will not work with spandsp 0.0.2 .
... ...
@@ -62,6 +74,10 @@ GETARCH=$(COREPATH)/compat/getarch
62 74
 OS   := $(shell $(CC) $(EXTRA_CFLAGS) -o $(GETOS) $(GETOS).c && $(GETOS))
63 75
 ARCH := $(shell $(CC) $(EXTRA_CFLAGS) -o $(GETARCH) $(GETARCH).c && $(GETARCH))
64 76
 
77
+ifdef USE_THREADPOOL
78
+CPPFLAGS += -DSESSION_THREADPOOL
79
+endif
80
+
65 81
 ifdef USE_SPANDSP
66 82
 ifneq ($(spandsp_defs), 1)
67 83
 spandsp_defs=1
Browse code

avoid building sipctrl.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1777 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Raphael Coeffic authored on 09/04/2010 10:26:56
Showing 1 changed files
... ...
@@ -46,7 +46,7 @@ CPPFLAGS += -D_DEBUG \
46 46
 # exclude some modules from compilation?
47 47
 # e.g. python modules:
48 48
 
49
-#exclude_core_modules = 
49
+exclude_core_modules = sipctrl
50 50
 #exclude_apps_modules = py_sems ivr mailbox pin_collect conf_auth mp3 examples
51 51
 
52 52
 # build in support for monitoring?
Browse code

- splits the exclude_modules in three variables (exclude_core_module, exclude_apps_modules,exclude_dsm_modules). - exclude_dsm_modules is set in apps/dsm/mods/Makefile, the two others are set in Makefile.defs.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1741 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Raphael Coeffic authored on 31/03/2010 15:04:45
Showing 1 changed files
... ...
@@ -45,7 +45,9 @@ CPPFLAGS += -D_DEBUG \
45 45
 #
46 46
 # exclude some modules from compilation?
47 47
 # e.g. python modules:
48
-#exclude_modules ?= py_sems ivr mailbox pin_collect conf_auth mp3 examples
48
+
49
+#exclude_core_modules = 
50
+#exclude_apps_modules = py_sems ivr mailbox pin_collect conf_auth mp3 examples
49 51
 
50 52
 # build in support for monitoring?
51 53
 #
... ...
@@ -54,8 +56,11 @@ USE_MONITORING=yes
54 56
 
55 57
 LDFLAGS += -lm
56 58
 
57
-OS   := $(shell $(CC) $(EXTRA_CFLAGS) -o $(COREPATH)/../getos $(COREPATH)/../getos.c && $(COREPATH)/../getos)
58
-ARCH := $(shell $(CC) $(EXTRA_CFLAGS) -o $(COREPATH)/../getarch $(COREPATH)/../getarch.c && $(COREPATH)/../getarch)
59
+GETOS=$(COREPATH)/compat/getos
60
+GETARCH=$(COREPATH)/compat/getarch
61
+
62
+OS   := $(shell $(CC) $(EXTRA_CFLAGS) -o $(GETOS) $(GETOS).c && $(GETOS))
63
+ARCH := $(shell $(CC) $(EXTRA_CFLAGS) -o $(GETARCH) $(GETARCH).c && $(GETARCH))
59 64
 
60 65
 ifdef USE_SPANDSP
61 66
 ifneq ($(spandsp_defs), 1)
... ...
@@ -64,7 +69,7 @@ export spandsp_defs
64 69
 CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
65 70
 endif
66 71
 else
67
-override exclude_modules += g722
72
+exclude_core_modules += g722
68 73
 endif
69 74
 
70 75
 ifdef USE_LIBSAMPLERATE
... ...
@@ -90,7 +95,7 @@ ifeq ($(OS),solaris)
90 95
 
91 96
 	# I don't have libspeex installed.
92 97
 	# binrpcctrl does some really weird header stuff that doesn't work.
93
-	exclude_modules += binrpcctrl ilbc speex
98
+	exclude_core_modules += binrpcctrl ilbc speex
94 99
 endif
95 100
 
96 101
 
... ...
@@ -125,7 +130,7 @@ CPPFLAGS += -DWITH_ZRTP \
125 130
 	    -I/usr/local/include/zrtp 
126 131