blob: 56de6ba2534d6760185310ae0d30b89590591c53 (
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
|
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,11 @@ LIBI2PD_CLIENT_PATH = $(I2PD_PATH)/libi2pd_client
CXX ?= g++
CXXFLAGS += -Wall -std=c++17 -O2
-INCFLAGS = -I$(LIBI2PD_PATH) -I$(LIBI2PD_CLIENT_PATH)
+INCFLAGS = -I/usr/include/i2pd
DEFINES = -DOPENSSL_SUPPRESS_DEPRECATED
LDFLAGS +=
-LDLIBS = $(I2PD_PATH)/$(I2PD_LIB) -lboost_system$(BOOST_SUFFIX) -lboost_date_time$(BOOST_SUFFIX) -lboost_filesystem$(BOOST_SUFFIX) -lboost_program_options$(BOOST_SUFFIX) -lssl -lcrypto -lz
+LDLIBS = -li2pd -lboost_system$(BOOST_SUFFIX) -lboost_date_time$(BOOST_SUFFIX) -lboost_filesystem$(BOOST_SUFFIX) -lboost_program_options$(BOOST_SUFFIX) -lssl -lcrypto -lz
ifeq ($(UNAME),Linux)
@@ -45,43 +45,43 @@ else
endif
-all: $(I2PD_LIB) vain keygen keyinfo famtool routerinfo regaddr regaddr_3ld i2pbase64 offlinekeys b33address regaddralias x25519 verifyhost
-vain: vain.o $(I2PD_LIB)
+all: vain keygen keyinfo famtool routerinfo regaddr regaddr_3ld i2pbase64 offlinekeys b33address regaddralias x25519 verifyhost
+vain: vain.o
$(CXX) -o vain $(LDFLAGS) vain.o $(LDLIBS)
-routerinfo: routerinfo.o $(I2PD_LIB)
+routerinfo: routerinfo.o
$(CXX) -o routerinfo $(LDFLAGS) routerinfo.o $(LDLIBS) -latomic
-keygen: keygen.o $(I2PD_LIB)
+keygen: keygen.o
$(CXX) -o keygen $(DEFINES) $(LDFLAGS) keygen.o $(LDLIBS)
-keyinfo: keyinfo.o $(I2PD_LIB)
+keyinfo: keyinfo.o
$(CXX) -o keyinfo $(DEFINES) $(LDFLAGS) keyinfo.o $(LDLIBS)
-famtool: famtool.o $(I2PD_LIB)
+famtool: famtool.o
$(CXX) -o famtool $(DEFINES) $(LDFLAGS) famtool.o $(LDLIBS) -latomic
-regaddr: regaddr.o $(I2PD_LIB)
+regaddr: regaddr.o
$(CXX) -o regaddr $(DEFINES) $(LDFLAGS) regaddr.o $(LDLIBS)
-regaddr_3ld: regaddr_3ld.o $(I2PD_LIB)
+regaddr_3ld: regaddr_3ld.o
$(CXX) -o regaddr_3ld $(DEFINES) $(LDFLAGS) regaddr_3ld.o $(LDLIBS)
-i2pbase64: i2pbase64.o $(I2PD_LIB)
+i2pbase64: i2pbase64.o
$(CXX) -o i2pbase64 $(DEFINES) $(LDFLAGS) i2pbase64.o $(LDLIBS)
-offlinekeys: offlinekeys.o $(I2PD_LIB)
+offlinekeys: offlinekeys.o
$(CXX) -o offlinekeys $(DEFINES) $(LDFLAGS) offlinekeys.o $(LDLIBS)
-b33address: b33address.o $(I2PD_LIB)
+b33address: b33address.o
$(CXX) -o b33address $(DEFINES) $(LDFLAGS) b33address.o $(LDLIBS)
-regaddralias: regaddralias.o $(I2PD_LIB)
+regaddralias: regaddralias.o
$(CXX) -o regaddralias $(DEFINES) $(LDFLAGS) regaddralias.o $(LDLIBS)
-x25519: x25519.o $(I2PD_LIB)
+x25519: x25519.o
$(CXX) -o x25519 $(DEFINES) $(LDFLAGS) x25519.o $(LDLIBS)
-verifyhost: verifyhost.o $(I2PD_LIB)
+verifyhost: verifyhost.o
$(CXX) -o verifyhost $(DEFINES) $(LDFLAGS) verifyhost.o $(LDLIBS)
.SUFFIXES:
@@ -90,7 +90,7 @@ verifyhost: verifyhost.o $(I2PD_LIB)
$(I2PD_LIB):
$(MAKE) -C $(I2PD_PATH) mk_obj_dir $(I2PD_LIB)
-%.o: %.cpp $(I2PD_LIB)
+%.o: %.cpp
$(CXX) $(CXXFLAGS) $(DEFINES) $(INCFLAGS) -c -o $@ $<
count:
@@ -105,7 +105,7 @@ clean-obj:
clean-bin:
rm -f b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain
-clean: clean-i2pd clean-obj clean-bin
+clean: clean-obj clean-bin
.PHONY: all
.PHONY: count
|