Browse code

db_cassandra: Makefile comment updated to reference main Makefile

Daniel-Constantin Mierla authored on 02/11/2020 10:16:34
Showing 1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # db_cassandra 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
 
Browse code

db_cassandra: updated to new module interface format

Charles Chance authored on 28/09/2018 09:01:56 • Victor Seva committed on 28/09/2018 11:03:26
Showing 1 changed files
... ...
@@ -13,7 +13,7 @@ NAME=db_cassandra.so
13 13
 
14 14
 INCLUDE_DIR = /usr/include/thrift
15 15
 LIB_DIR = /usr/lib
16
-DEFS += -I${INCLUDE_DIR} -DKAMAILIO_MOD_INTERFACE
16
+DEFS += -I${INCLUDE_DIR}
17 17
 LIBS += -L${LIB_DIR} dbcassa_base.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift
18 18
 
19 19
 CXXFLAGS=$(CFLAGS:-Wno-deprecated option=)
Browse code

db_cassandra: fix compilation, adapt Makefile for system wide thrift installation

- fix compilation after core restructuring (timer and mem includes)
- fix Makefile path, use system wide thrift installation (todo - should be probably autodetected)
- improve Makefile variable naming for include dir

Henning Westerholt authored on 06/03/2018 06:51:22
Showing 1 changed files
... ...
@@ -11,9 +11,9 @@ LD=g++
11 11
 auto_gen=
12 12
 NAME=db_cassandra.so
13 13
 
14
-THRIFT_DIR = /usr/local/include/thrift
15
-LIB_DIR = /usr/local/lib
16
-DEFS += -I${THRIFT_DIR} -DKAMAILIO_MOD_INTERFACE
14
+INCLUDE_DIR = /usr/include/thrift
15
+LIB_DIR = /usr/lib
16
+DEFS += -I${INCLUDE_DIR} -DKAMAILIO_MOD_INTERFACE
17 17
 LIBS += -L${LIB_DIR} dbcassa_base.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift
18 18
 
19 19
 CXXFLAGS=$(CFLAGS:-Wno-deprecated option=)
... ...
@@ -26,15 +26,15 @@ include ../../Makefile.modules
26 26
 
27 27
 cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h
28 28
 	@echo "Compiling $<"
29
-	$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@
29
+	$(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@
30 30
 
31 31
 cassandra_types.o: cassandra_types.cpp cassandra_types.h
32 32
 	@echo "Compiling $<"
33
-	$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@
33
+	$(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@
34 34
 
35 35
 Cassandra.o: Cassandra.cpp Cassandra.h
36 36
 	@echo "Compiling $<"
37
-	$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@
37
+	$(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@
38 38
 
39 39
 dbcassa_base.o: dbcassa_base.cpp dbcassa_base.h dbcassa_table.h
40 40
 	@echo "Compiling $<"
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
+# db_cassandra 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
+
9
+CXX=g++
10
+LD=g++
11
+auto_gen=
12
+NAME=db_cassandra.so
13
+
14
+THRIFT_DIR = /usr/local/include/thrift
15
+LIB_DIR = /usr/local/lib
16
+DEFS += -I${THRIFT_DIR} -DKAMAILIO_MOD_INTERFACE
17
+LIBS += -L${LIB_DIR} dbcassa_base.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift
18
+
19
+CXXFLAGS=$(CFLAGS:-Wno-deprecated option=)
20
+CXXFLAGS+= -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing
21
+
22
+SERLIBPATH=../../lib
23
+SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1
24
+
25
+include ../../Makefile.modules
26
+
27
+cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h
28
+	@echo "Compiling $<"
29
+	$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@
30
+
31
+cassandra_types.o: cassandra_types.cpp cassandra_types.h
32
+	@echo "Compiling $<"
33
+	$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@
34
+
35
+Cassandra.o: Cassandra.cpp Cassandra.h
36
+	@echo "Compiling $<"
37
+	$(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@
38
+
39
+dbcassa_base.o: dbcassa_base.cpp dbcassa_base.h dbcassa_table.h
40
+	@echo "Compiling $<"
41
+	$(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@
42
+
43
+db_cassandra.so: dbcassa_base.o cassandra_constants.o cassandra_types.o Cassandra.o