blob: e0c1988cc83606c50e0a9530cf0d95b216609232 (
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
|
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -2,8 +2,8 @@
# $Id$
# complation
-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
-LDFLAGS = -lpcap -lm
+CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
+LDFLAGS += -lpcap -lm
CFLAGS_DEBUG = -D_DEBUG -ggdb
LDFLAGS_DEBUG = -pg
BINARY = lanmap
@@ -14,12 +14,12 @@
$(CC) $(OBJS) -o $(BINARY) $(LDFLAGS)
static:
- make clean
- make LDFLAGS="$(LDFLAGS) -static" all
+ $(MAKE) clean
+ $(MAKE) LDFLAGS="$(LDFLAGS) -static" all
debug:
- make clean
- make CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)" all
+ $(MAKE) clean
+ $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)" all
# for testing the classify code by itself
os_classify: os_classify.c misc.c
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,18 +10,18 @@
DATADEST = ${prefix}/share/lanmap/
all:
- cd ./src && make LANMAP_DATADIR="$(DATADEST)"
+ cd ./src && $(MAKE) LANMAP_DATADIR="$(DATADEST)"
install:
- install -m 0755 ./src/$(BINARY) $(BINDEST)
+ install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
install -m 0755 -d $(DATADEST)
install -m 0755 -d $(DATADEST)data/
install -m 0755 -d $(DATADEST)data/graph/
install -m 0755 -d $(DATADEST)graph/img/
install -m 0644 ./data/mac_vendor $(DATADEST)data/
- install -m 0644 -d $(DATADEST)graph
+ install -m 0755 -d $(DATADEST)graph
install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
- for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f $(DATADEST)graph/img/; done
+ for f in ./graph/img/*.gif ./graph/img/*.png ./graph/img/*.svg; do install -m 0644 $$f $(DATADEST)graph/img/; done
uninstall:
rm $(BINDEST)$(BINARY)
@@ -29,11 +29,11 @@
clean:
rm -f ./src/$(BINARY)
- cd ./src && make clean
+ cd ./src && $(MAKE) clean
distclean: clean
rm -f Makefile config.cache config.log config.status config.h
debug:
- cd ./src && make debug
+ cd ./src && $(MAKE) debug
|
GitWeb
