- 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,55 +0,0 @@ |
1 |
-# Kamailio build system |
|
2 |
-# |
|
3 |
-# Radiusclient library detection comes here |
|
4 |
-# |
|
5 |
-# (To be included from Makefiles of radius related modules) |
|
6 |
-# |
|
7 |
-# The purpose of this makefile is to perform RADIUS client library |
|
8 |
-# selection (radiusclient-ng or freeradius-client) and setup |
|
9 |
-# library and include paths in DEFS and LIBS variables. |
|
10 |
-# |
|
11 |
-# In addition RADIUSCLIENT_NG_4 will be defined when |
|
12 |
-# libradiusclient-ng version 4 is detected. That means the module |
|
13 |
-# should include radiusclient.h, otherwise radiusclient-ng.h |
|
14 |
-# should be included. Variable RADIUSCLIENT_LIB contains the |
|
15 |
-# name of the shared library. |
|
16 |
-# |
|
17 |
- |
|
18 |
-# |
|
19 |
-# Radiusclient-ng is often installed from tarballs so we |
|
20 |
-# need to look int /usr/local/lib as well |
|
21 |
-# |
|
22 |
-INCLUDES+=-I$(LOCALBASE)/include |
|
23 |
- |
|
24 |
-ifeq ($(FREERADIUS),1) |
|
25 |
- |
|
26 |
-# - freeradius-client library |
|
27 |
-DEFS+= -DUSE_FREERADIUS |
|
28 |
-RADIUSCLIENT_LIB=freeradius-client |
|
29 |
- |
|
30 |
-else |
|
31 |
-ifeq ($(RADCLI),1) |
|
32 |
- |
|
33 |
-# - radcli library |
|
34 |
-DEFS+= -DUSE_RADCLI |
|
35 |
-RADIUSCLIENT_LIB=radcli |
|
36 |
- |
|
37 |
-else |
|
38 |
-# - radiusclient-ng v5 or v4 library |
|
39 |
-ifneq ($(radiusclient_ng), 4) |
|
40 |
- |
|
41 |
-# radiusclient-ng 5+ |
|
42 |
-# DEFS+=-DRADIUSCLIENT_NG_5P |
|
43 |
-RADIUSCLIENT_LIB=radiusclient-ng |
|
44 |
- |
|
45 |
-else |
|
46 |
- |
|
47 |
-DEFS+=-DRADIUSCLIENT_NG_4 |
|
48 |
-RADIUSCLIENT_LIB=radiusclient |
|
49 |
- |
|
50 |
-endif |
|
51 |
-endif |
|
52 |
- |
|
53 |
-endif |
|
54 |
- |
|
55 |
-LIBS=-L$(LOCALBASE)/lib -l$(RADIUSCLIENT_LIB) |
... | ... |
@@ -28,7 +28,13 @@ DEFS+= -DUSE_FREERADIUS |
28 | 28 |
RADIUSCLIENT_LIB=freeradius-client |
29 | 29 |
|
30 | 30 |
else |
31 |
+ifeq ($(RADCLI),1) |
|
31 | 32 |
|
33 |
+# - radcli library |
|
34 |
+DEFS+= -DUSE_RADCLI |
|
35 |
+RADIUSCLIENT_LIB=radcli |
|
36 |
+ |
|
37 |
+else |
|
32 | 38 |
# - radiusclient-ng v5 or v4 library |
33 | 39 |
ifneq ($(radiusclient_ng), 4) |
34 | 40 |
|
... | ... |
@@ -41,6 +47,7 @@ else |
41 | 47 |
DEFS+=-DRADIUSCLIENT_NG_4 |
42 | 48 |
RADIUSCLIENT_LIB=radiusclient |
43 | 49 |
|
50 |
+endif |
|
44 | 51 |
endif |
45 | 52 |
|
46 | 53 |
endif |
- using FREERADIUS=1 turns on usage of freeradius-client library instead
of radiusclient-ng
- kamailio radius modules have support for freeradius-client, library
which is included in opensuse instead of radiusclient-ng
... | ... |
@@ -6,9 +6,11 @@ |
6 | 6 |
# |
7 | 7 |
# (To be included from Makefiles of radius related modules) |
8 | 8 |
# |
9 |
-# The purpose of this makefile is to perform radiusclient library |
|
10 |
-# detection and setup library and include paths in DEFS and LIBS |
|
11 |
-# variables. In addition RADIUSCLIENT_NG_4 will be defined when |
|
9 |
+# The purpose of this makefile is to perform RADIUS client library |
|
10 |
+# selection (radiusclient-ng or freeradius-client) and setup |
|
11 |
+# library and include paths in DEFS and LIBS variables. |
|
12 |
+# |
|
13 |
+# In addition RADIUSCLIENT_NG_4 will be defined when |
|
12 | 14 |
# libradiusclient-ng version 4 is detected. That means the module |
13 | 15 |
# should include radiusclient.h, otherwise radiusclient-ng.h |
14 | 16 |
# should be included. Variable RADIUSCLIENT_LIB contains the |
... | ... |
@@ -21,6 +23,15 @@ |
21 | 23 |
# |
22 | 24 |
INCLUDES+=-I$(LOCALBASE)/include |
23 | 25 |
|
26 |
+ifeq ($(FREERADIUS),1) |
|
27 |
+ |
|
28 |
+# - freeradius-client library |
|
29 |
+DEFS+= -DUSE_FREERADIUS |
|
30 |
+RADIUSCLIENT_LIB=freeradius-client |
|
31 |
+ |
|
32 |
+else |
|
33 |
+ |
|
34 |
+# - radiusclient-ng v5 or v4 library |
|
24 | 35 |
ifneq ($(radiusclient_ng), 4) |
25 | 36 |
|
26 | 37 |
# radiusclient-ng 5+ |
... | ... |
@@ -34,4 +45,6 @@ RADIUSCLIENT_LIB=radiusclient |
34 | 45 |
|
35 | 46 |
endif |
36 | 47 |
|
48 |
+endif |
|
49 |
+ |
|
37 | 50 |
LIBS=-L$(LOCALBASE)/lib -l$(RADIUSCLIENT_LIB) |
- ignore module DEFS when deciding whether or not to recompile a
library: DEFS split into C_DEFS (for common DEFS which are taken
into account when deciding whether or not to recompile a lib)
and DEFS, which are now visible only inside the module or lib
that uses them. Same for INCLUDES and C_INCLUDES.
... | ... |
@@ -20,7 +20,6 @@ |
20 | 20 |
# need to look int /usr/local/lib as well |
21 | 21 |
# |
22 | 22 |
DEFS+=-I$(LOCALBASE)/include |
23 |
-LIBS+=-L$(LOCALBASE)/lib |
|
24 | 23 |
|
25 | 24 |
ifneq ($(radiusclient_ng), 4) |
26 | 25 |
|
... | ... |
@@ -34,3 +33,5 @@ DEFS+=-DRADIUSCLIENT_NG_4 |
34 | 33 |
RADIUSCLIENT_LIB=radiusclient |
35 | 34 |
|
36 | 35 |
endif |
36 |
+ |
|
37 |
+LIBS=-L$(LOCALBASE)/lib -l$(RADIUSCLIENT_LIB) |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,36 @@ |
1 |
+# |
|
2 |
+# $Id$ |
|
3 |
+# |
|
4 |
+# |
|
5 |
+# Radiusclient library detection comes here |
|
6 |
+# |
|
7 |
+# (To be included from Makefiles of radius related modules) |
|
8 |
+# |
|
9 |
+# The purpose of this makefile is to perform radiusclient library |
|
10 |
+# detection and setup library and include paths in DEFS and LIBS |
|
11 |
+# variables. In addition RADIUSCLIENT_NG_4 will be defined when |
|
12 |
+# libradiusclient-ng version 4 is detected. That means the module |
|
13 |
+# should include radiusclient.h, otherwise radiusclient-ng.h |
|
14 |
+# should be included. Variable RADIUSCLIENT_LIB contains the |
|
15 |
+# name of the shared library. |
|
16 |
+# |
|
17 |
+ |
|
18 |
+# |
|
19 |
+# Radiusclient-ng is often installed from tarballs so we |
|
20 |
+# need to look int /usr/local/lib as well |
|
21 |
+# |
|
22 |
+DEFS+=-I$(LOCALBASE)/include |
|
23 |
+LIBS+=-L$(LOCALBASE)/lib |
|
24 |
+ |
|
25 |
+ifneq ($(radiusclient_ng), 4) |
|
26 |
+ |
|
27 |
+# radiusclient-ng 5+ |
|
28 |
+# DEFS+=-DRADIUSCLIENT_NG_5P |
|
29 |
+RADIUSCLIENT_LIB=radiusclient-ng |
|
30 |
+ |
|
31 |
+else |
|
32 |
+ |
|
33 |
+DEFS+=-DRADIUSCLIENT_NG_4 |
|
34 |
+RADIUSCLIENT_LIB=radiusclient |
|
35 |
+ |
|
36 |
+endif |