summaryrefslogtreecommitdiff
blob: 2ef2a6b59df653179ced9656ef4525b84f1204f3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
diff -Naur kismet-2011-03-R2/plugin-autowep/Makefile kismet-2011-03-R2-cflags/plugin-autowep/Makefile
--- kismet-2011-03-R2/plugin-autowep/Makefile	2012-07-23 12:58:09.961131948 -0400
+++ kismet-2011-03-R2-cflags/plugin-autowep/Makefile	2012-07-23 13:00:04.544135017 -0400
@@ -12,6 +12,7 @@
 PLUGINLDFLAGS += -shared -rdynamic
 LIBS	+= -lstdc++ 
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 PLUGOBJS = autowep-kismet.o
 PLUGOUT = autowep-kismet.so
@@ -34,9 +35,9 @@
 	@-rm -f *.so
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@ 
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
 
 .cc.o:
-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
 
 .SUFFIXES: .c .cc .o
diff -Naur kismet-2011-03-R2/plugin-btscan/Makefile kismet-2011-03-R2-cflags/plugin-btscan/Makefile
--- kismet-2011-03-R2/plugin-btscan/Makefile	2012-07-23 12:58:09.962131948 -0400
+++ kismet-2011-03-R2-cflags/plugin-btscan/Makefile	2012-07-23 13:02:33.016138993 -0400
@@ -12,6 +12,7 @@
 PLUGINLDFLAGS += -shared -rdynamic
 LIBS	+= -lstdc++ -lbluetooth -lpthread -lncurses -lpanel
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 SRVOBJS = packetsource_linuxbt.o tracker_btscan.o dumpfile_btscantxt.o kismet_btscan.o
 SRVOUT	= btscan.so
@@ -44,9 +45,9 @@
 	@-rm -f *.so
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@ 
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
 
 .cc.o:
-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
 
 .SUFFIXES: .c .cc .o
diff -Naur kismet-2011-03-R2/plugin-dot15d4/Makefile kismet-2011-03-R2-cflags/plugin-dot15d4/Makefile
--- kismet-2011-03-R2/plugin-dot15d4/Makefile	2012-07-23 12:58:09.962131948 -0400
+++ kismet-2011-03-R2-cflags/plugin-dot15d4/Makefile	2012-07-23 13:03:17.209140176 -0400
@@ -12,6 +12,7 @@
 PLUGINLDFLAGS += -shared -rdynamic
 LIBS	+= -lstdc++ -lusb -lpthread
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 SRVOBJS = packetsource_raven.o packetsource_serialdev.o \
 			packet_dot15d4.o packet_dot15d4_types.o \
@@ -39,9 +40,9 @@
 	@-rm -f *.so
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@ 
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
 
 .cc.o:
-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
 
 .SUFFIXES: .c .cc .o
diff -Naur kismet-2011-03-R2/plugin-ptw/Makefile kismet-2011-03-R2-cflags/plugin-ptw/Makefile
--- kismet-2011-03-R2/plugin-ptw/Makefile	2012-07-23 12:58:09.963131948 -0400
+++ kismet-2011-03-R2-cflags/plugin-ptw/Makefile	2012-07-23 13:04:25.764142014 -0400
@@ -12,6 +12,7 @@
 PLUGINLDFLAGS += -shared -rdynamic
 LIBS	+= -lstdc++ -lssl -lpthread -lcrypto
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o
 PLUGOUT = aircrack-kismet.so
@@ -34,9 +35,9 @@
 	@-rm -f *.so
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@ 
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
 
 .cc.o:
-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
 
 .SUFFIXES: .c .cc .o
diff -Naur kismet-2011-03-R2/plugin-spectools/Makefile kismet-2011-03-R2-cflags/plugin-spectools/Makefile
--- kismet-2011-03-R2/plugin-spectools/Makefile	2012-07-23 12:58:09.963131948 -0400
+++ kismet-2011-03-R2-cflags/plugin-spectools/Makefile	2012-07-23 13:05:12.121143257 -0400
@@ -12,6 +12,7 @@
 PLUGINLDFLAGS += -shared -rdynamic
 LIBS	+= -lstdc++ 
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 CLIOBJS = spectools_ui.o
 CLIOUT	= spectools_ui.so
@@ -44,9 +45,9 @@
 	@-rm -f *.so
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@ 
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
 
 .cc.o:
-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
 
 .SUFFIXES: .c .cc .o