- 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)
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,27 +0,0 @@ |
1 |
-# Kamailio build system |
|
2 |
-# |
|
3 |
-# common Makefile variables |
|
4 |
-# (source files, objs, etc) |
|
5 |
- |
|
6 |
- |
|
7 |
-# |
|
8 |
-# expects: auto_gen defined |
|
9 |
-# |
|
10 |
-# defines: sources, objs, depends |
|
11 |
-# |
|
12 |
- |
|
13 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
|
14 |
- $(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
|
15 |
- $(wildcard parser/contact/*.c) $(wildcard db/*.c) \ |
|
16 |
- $(wildcard parser/sdp/*.c) \ |
|
17 |
- $(wildcard rand/*.c) $(wildcard rand/isaac/*.c) ) \ |
|
18 |
- $(wildcard cfg/*.c) $(auto_gen) |
|
19 |
-ifeq ($(CORE_TLS), 1) |
|
20 |
- sources+= $(wildcard tls/*.c) |
|
21 |
-endif |
|
22 |
-objs=$(sources:.c=.o) |
|
23 |
-extra_objs= |
|
24 |
-depends=$(sources:.c=.d) |
|
25 |
-cmodules= |
|
26 |
-static_modules= |
|
27 |
-static_modules_path= |
Multiple modules directories are now supported.
The list of the modules directories is in Makefile.dirs in
$(modules_dirs).
Name restrictions: the names must not match any makefile variable name
and they shouldn't contain any '-' char.
The modules and modules doc/READMEs will be installed in separate dirs
(e.g. for modules_dirs="modules modules_s modules_k" , the modules
will be installed in .../lib/ser/modules , ...lib/ser/modules_s
and ...lib/ser/modules_k).
The module man pages will all be installed in the same man dir
(but so far only some ser modules have man pages so we should be
safe).
New make targets:
every-module - make all the modules in all the module dirs
install-every-module - like above, but install
install-every-module-doc
install-every-module-man
Targets dependent on $(modules_dirs) content:
$(m), $(m)-doc, $(m)-readme, $(m)-man, install-$(m),
install-$(m)-doc, install-$(m)-man.
E.g.: for modules_dirs=modules modules_k modules_s
make modules - make all modules in the directory "modules".
make modules_k - make all the modules in the directory modules_k.
make every-module - make all the modules in the directories
modules, modules_k and modules_s.
make install-modules_s - install all the modules in the directory
modules_s.
... | ... |
@@ -14,6 +14,7 @@ |
14 | 14 |
sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
15 | 15 |
$(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
16 | 16 |
$(wildcard parser/contact/*.c) $(wildcard db/*.c) \ |
17 |
+ $(wildcard parser/sdp/*.c) \ |
|
17 | 18 |
$(wildcard rand/*.c) $(wildcard rand/isaac/*.c) ) \ |
18 | 19 |
$(wildcard cfg/*.c) $(auto_gen) |
19 | 20 |
ifeq ($(CORE_TLS), 1) |
... | ... |
@@ -14,7 +14,8 @@ |
14 | 14 |
sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
15 | 15 |
$(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
16 | 16 |
$(wildcard parser/contact/*.c) $(wildcard db/*.c) \ |
17 |
- $(wildcard rand/*.c) $(wildcard rand/isaac/*.c) ) $(auto_gen) |
|
17 |
+ $(wildcard rand/*.c) $(wildcard rand/isaac/*.c) ) \ |
|
18 |
+ $(wildcard cfg/*.c) $(auto_gen) |
|
18 | 19 |
ifeq ($(CORE_TLS), 1) |
19 | 20 |
sources+= $(wildcard tls/*.c) |
20 | 21 |
endif |
... | ... |
@@ -13,7 +13,8 @@ |
13 | 13 |
|
14 | 14 |
sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
15 | 15 |
$(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
16 |
- $(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
16 |
+ $(wildcard parser/contact/*.c) $(wildcard db/*.c) \ |
|
17 |
+ $(wildcard rand/*.c) $(wildcard rand/isaac/*.c) ) $(auto_gen) |
|
17 | 18 |
ifeq ($(CORE_TLS), 1) |
18 | 19 |
sources+= $(wildcard tls/*.c) |
19 | 20 |
endif |
... | ... |
@@ -14,7 +14,7 @@ |
14 | 14 |
sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
15 | 15 |
$(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
16 | 16 |
$(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen) |
17 |
-ifneq ($(TLS),) |
|
17 |
+ifeq ($(CORE_TLS), 1) |
|
18 | 18 |
sources+= $(wildcard tls/*.c) |
19 | 19 |
endif |
20 | 20 |
objs=$(sources:.c=.o) |
... | ... |
@@ -14,6 +14,9 @@ |
14 | 14 |
sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
15 | 15 |
$(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
16 | 16 |
$(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen) |
17 |
+ifneq ($(TLS),) |
|
18 |
+ sources+= $(wildcard tls/*.c) |
|
19 |
+endif |
|
17 | 20 |
objs=$(sources:.c=.o) |
18 | 21 |
extra_objs= |
19 | 22 |
depends=$(sources:.c=.d) |
... | ... |
@@ -11,7 +11,9 @@ |
11 | 11 |
# defines: sources, objs, depends |
12 | 12 |
# |
13 | 13 |
|
14 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) $(wildcard parser/digest/*.c) $(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ |
|
15 |
+ $(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ |
|
16 |
+ $(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
15 | 17 |
objs=$(sources:.c=.o) |
16 | 18 |
extra_objs= |
17 | 19 |
depends=$(sources:.c=.d) |
... | ... |
@@ -11,7 +11,7 @@ |
11 | 11 |
# defines: sources, objs, depends |
12 | 12 |
# |
13 | 13 |
|
14 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) $(wildcard parser/digest/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) $(wildcard parser/digest/*.c) $(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
15 | 15 |
objs=$(sources:.c=.o) |
16 | 16 |
extra_objs= |
17 | 17 |
depends=$(sources:.c=.d) |
... | ... |
@@ -11,7 +11,7 @@ |
11 | 11 |
# defines: sources, objs, depends |
12 | 12 |
# |
13 | 13 |
|
14 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) $(wildcard parser/digest/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
15 | 15 |
objs=$(sources:.c=.o) |
16 | 16 |
extra_objs= |
17 | 17 |
depends=$(sources:.c=.d) |
... | ... |
@@ -11,7 +11,7 @@ |
11 | 11 |
# defines: sources, objs, depends |
12 | 12 |
# |
13 | 13 |
|
14 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) ) $(auto_gen) |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) $(wildcard db/*.c) ) $(auto_gen) |
|
15 | 15 |
objs=$(sources:.c=.o) |
16 | 16 |
extra_objs= |
17 | 17 |
depends=$(sources:.c=.d) |
... | ... |
@@ -11,7 +11,7 @@ |
11 | 11 |
# defines: sources, objs, depends |
12 | 12 |
# |
13 | 13 |
|
14 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) ) $(auto_gen) |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) $(wildcard parser/*.c) ) $(auto_gen) |
|
15 | 15 |
objs=$(sources:.c=.o) |
16 | 16 |
extra_objs= |
17 | 17 |
depends=$(sources:.c=.d) |
... | ... |
@@ -11,7 +11,7 @@ |
11 | 11 |
# defines: sources, objs, depends |
12 | 12 |
# |
13 | 13 |
|
14 |
-sources=$(filter-out $(auto_gen), $(wildcard *.c)) $(auto_gen) |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) ) $(auto_gen) |
|
15 | 15 |
objs=$(sources:.c=.o) |
16 | 16 |
extra_objs= |
17 | 17 |
depends=$(sources:.c=.d) |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,17 @@ |
1 |
+# |
|
2 |
+# $Id$ |
|
3 |
+# |
|
4 |
+# common Makefile variables |
|
5 |
+# (source files, objs, etc) |
|
6 |
+ |
|
7 |
+ |
|
8 |
+# |
|
9 |
+# expects: auto_gen defined |
|
10 |
+# |
|
11 |
+# defines: sources, objs, depends |
|
12 |
+# |
|
13 |
+ |
|
14 |
+sources=$(filter-out $(auto_gen), $(wildcard *.c)) $(auto_gen) |
|
15 |
+objs=$(sources:.c=.o) |
|
16 |
+depends=$(sources:.c=.d) |
|
17 |
+modules= |