Browse code

utils: Makefile comment updated to reference main Makefile

Daniel-Constantin Mierla authored on 02/11/2020 10:16:48
Showing 1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # utils module makefile
3 3
 #
4 4
 #
5
-# WARNING: do not run this directly, it should be run by the master Makefile
5
+# WARNING: do not run this directly, it should be run by the main Makefile
6 6
 
7 7
 include ../../Makefile.defs
8 8
 auto_gen=
Browse code

utils: Makefile - try to use pkg-config if xml2-config is not found

Daniel-Constantin Mierla authored on 12/02/2020 20:30:09
Showing 1 changed files
... ...
@@ -10,6 +10,12 @@ NAME=utils.so
10 10
 
11 11
 ifeq ($(CROSS_COMPILE),)
12 12
 XML2CFG=$(shell which xml2-config)
13
+ifeq ($(XML2CFG),)
14
+XML2CFG=$(shell \
15
+	if pkg-config --exists libxml-2.0; then \
16
+		echo 'pkg-config libxml-2.0'; \
17
+	fi)
18
+endif
13 19
 endif
14 20
 
15 21
 ifneq ($(XML2CFG),)
Browse code

utils: updated to the new mod interface

Daniel-Constantin Mierla authored on 27/09/2018 21:13:36 • Victor Seva committed on 28/09/2018 11:03:26
Showing 1 changed files
... ...
@@ -21,8 +21,6 @@ else
21 21
 	LIBS+=-L$(LOCALBASE)/lib -lxml2
22 22
 endif
23 23
 
24
-DEFS+=-DKAMAILIO_MOD_INTERFACE
25
-
26 24
 SERLIBPATH=../../lib
27 25
 SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
28 26
 include ../../Makefile.modules
Browse code

utils Remove http_query function that now is replaced by the http_client module

Olle E. Johansson authored on 14/01/2017 20:02:05
Showing 1 changed files
... ...
@@ -10,12 +10,6 @@ NAME=utils.so
10 10
 
11 11
 ifeq ($(CROSS_COMPILE),)
12 12
 XML2CFG=$(shell which xml2-config)
13
-CURL_BUILDER=$(shell \
14
-	if pkg-config --exists libcurl; then \
15
-		echo 'pkg-config libcurl'; \
16
-	else \
17
-		which curl-config; \
18
-	fi)
19 13
 endif
20 14
 
21 15
 ifneq ($(XML2CFG),)
... ...
@@ -27,14 +21,6 @@ else
27 21
 	LIBS+=-L$(LOCALBASE)/lib -lxml2
28 22
 endif
29 23
 
30
-ifneq ($(CURL_BUILDER),)
31
-	DEFS += $(shell $(CURL_BUILDER) --cflags )
32
-	LIBS += $(shell $(CURL_BUILDER) --libs)
33
-else
34
-	DEFS+=-I$(LOCALBASE)/include
35
-	LIBS+=-L$(LOCALBASE)/lib -lcurl
36
-endif
37
-
38 24
 DEFS+=-DKAMAILIO_MOD_INTERFACE
39 25
 
40 26
 SERLIBPATH=../../lib
Browse code

utils: mi commands disabled

Daniel-Constantin Mierla authored on 04/01/2017 14:18:38
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 #
2 2
 # utils module makefile
3 3
 #
4
-# 
4
+#
5 5
 # WARNING: do not run this directly, it should be run by the master Makefile
6 6
 
7 7
 include ../../Makefile.defs
... ...
@@ -39,5 +39,4 @@ DEFS+=-DKAMAILIO_MOD_INTERFACE
39 39
 
40 40
 SERLIBPATH=../../lib
41 41
 SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
42
-SER_LIBS+=$(SERLIBPATH)/kmi/kmi
43 42
 include ../../Makefile.modules
Browse code

core, lib, modules: restructured source code tree

- new folder src/ to hold the source code for main project applications
- main.c is in src/
- all core files are subfolder are in src/core/
- modules are in src/modules/
- libs are in src/lib/
- application Makefiles are in src/
- application binary is built in src/ (src/kamailio)

Daniel-Constantin Mierla authored on 07/12/2016 11:03:51
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,43 @@
1
+#
2
+# utils module makefile
3
+#
4
+# 
5
+# WARNING: do not run this directly, it should be run by the master Makefile
6
+
7
+include ../../Makefile.defs
8
+auto_gen=
9
+NAME=utils.so
10
+
11
+ifeq ($(CROSS_COMPILE),)
12
+XML2CFG=$(shell which xml2-config)
13
+CURL_BUILDER=$(shell \
14
+	if pkg-config --exists libcurl; then \
15
+		echo 'pkg-config libcurl'; \
16
+	else \
17
+		which curl-config; \
18
+	fi)
19
+endif
20
+
21
+ifneq ($(XML2CFG),)
22
+	DEFS += $(shell $(XML2CFG) --cflags )
23
+	LIBS += $(shell $(XML2CFG) --libs)
24
+else
25
+	DEFS+=-I$(LOCALBASE)/include/libxml2 \
26
+      -I$(LOCALBASE)/include
27
+	LIBS+=-L$(LOCALBASE)/lib -lxml2
28
+endif
29
+
30
+ifneq ($(CURL_BUILDER),)
31
+	DEFS += $(shell $(CURL_BUILDER) --cflags )
32
+	LIBS += $(shell $(CURL_BUILDER) --libs)
33
+else
34
+	DEFS+=-I$(LOCALBASE)/include
35
+	LIBS+=-L$(LOCALBASE)/lib -lcurl
36
+endif
37
+
38
+DEFS+=-DKAMAILIO_MOD_INTERFACE
39
+
40
+SERLIBPATH=../../lib
41
+SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
42
+SER_LIBS+=$(SERLIBPATH)/kmi/kmi
43
+include ../../Makefile.modules