blob: 570a5def78827c9a5c98bb902de50beb1a268441 (
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
|
--- /var/tmp/portage/net-wireless/kismet-ubertooth-0.0_p534/work/ubertooth-r534/host/kismet/plugin-ubertooth-phyneutral/Makefile 2012-04-30 12:08:07.000000000 -0400
+++ host/kismet/plugin-ubertooth-phyneutral/Makefile 2012-07-23 12:50:07.883119040 -0400
@@ -11,13 +11,12 @@
PLUGINLDFLAGS ?= $(LDFLAGS)
PLUGINLDFLAGS += -shared -rdynamic
-LIBS += -lstdc++ -lusb-1.0 -lpthread -lbtbb
-CFLAGS ?= $(CFLAGS) $(CPPFLAGS)
+LIBS += -lstdc++ -lusb-1.0 -lpthread -lbtbb
CFLAGS += -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
+CXXFLAGS += -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
SRVOBJS = packetsource_ubertooth.o packet_btbb_types.o \
- phy_btbb.o kismet_ubertooth.o \
- $(RXTX_SRC_DIR)/ubertooth.o
+ phy_btbb.o kismet_ubertooth.o
SRVOUT = ubertooth.so
all: $(SRVOUT)
@@ -38,9 +37,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
--- /var/tmp/portage/net-wireless/kismet-ubertooth-0.0_p534/work/ubertooth-r534/host/kismet/plugin-ubertooth/Makefile 2012-04-04 19:18:29.000000000 -0400
+++ host/kismet/plugin-ubertooth/Makefile 2012-07-23 12:50:07.890119040 -0400
@@ -11,12 +11,12 @@
PLUGINLDFLAGS ?= $(LDFLAGS)
PLUGINLDFLAGS += -shared -rdynamic
-LIBS += -lstdc++ -lusb-1.0 -lpthread -lbtbb
-CFLAGS ?= $(CFLAGS) $(CPPFLAGS)
+LIBS += -lstdc++ -lusb-1.0 -lpthread -lbtbb
CFLAGS += -I/usr/include -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
+CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
SRVOBJS = packetsource_ubertooth.o packet_btbb.o packet_btbb_types.o \
- tracker_btbb.o kismet_ubertooth.o $(RXTX_SRC_DIR)/ubertooth.o
+ tracker_btbb.o kismet_ubertooth.o
SRVOUT = ubertooth.so
CLIOBJS = ubertooth_ui.o
@@ -48,9 +48,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
|
GitWeb
