projects/aports·blob master · refs

94 lines · 2.9 KiB

1--- a/Makefile
2+++ b/Makefile
3@@ -7,7 +7,7 @@
4 CXXFLAGS = $(CXXFLAGS_SERV) $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
5
6 LD = g++
7-LDFLAGS = $(FLAGS) -lm -ldl -lpthread deps/open62541/build/bin/libopen62541.a -lresolv
8+LDFLAGS = $(FLAGS) -lm -ldl -lpthread -lcares deps/open62541/build/bin/libopen62541.a -lresolv
9
10 OBJECTS_LOW = \
11 app/main.o \
12@@ -52,14 +52,12 @@
13
14 clean:
15 rm -rf */*.o */*.d bin/* deps/duktape/src-low lib lib_js/build node_modules util/dukc test/duk_crash
16- cd deps/c-ares && make clean
17 cd deps/mbedtls && make clean
18 cd deps/open62541 && rm -rf build
19- rm deps/c-ares/configure
20
21 bin/low: $(OBJECTS) $(OBJECTS_LOW) deps/mbedtls/programs/test/benchmark
22 mkdir -p bin
23- $(LD) -o bin/low deps/mbedtls/library/*.o deps/mbedtls/crypto/library/*.o deps/c-ares/libcares_la-*.o $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS)
24+ $(LD) -o bin/low deps/mbedtls/library/*.o deps/mbedtls/crypto/library/*.o $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS)
25
26 obj_lowjs_serv: $(OBJECTS) $(OBJECTS_LOW) deps/mbedtls/programs/test/benchmark util/dukc
27
28@@ -76,7 +74,7 @@
29 $(CXX) $(CXXFLAGS) -MMD -o $@ -c $<
30 %.o : %.c Makefile
31 $(C) $(CFLAGS) -MMD -o $@ -c $<
32-%.o : %.cpp Makefile deps/c-ares/.libs/libcares.a deps/open62541/build/bin/libopen62541.a
33+%.o : %.cpp Makefile deps/open62541/build/bin/libopen62541.a
34 $(CXX) $(CXXFLAGS) -MMD -o $@ -c $<
35
36 -include $(OBJECTS:.o=.d) $(OBJECTS_LOW:.o=.d)
37@@ -117,13 +115,6 @@
38 -DDUK_USE_SECTION_B \
39 -DDUK_USE_CPP_EXCEPTIONS
40
41-deps/c-ares/configure:
42- cd deps/c-ares && . ./buildconf
43-deps/c-ares/Makefile: deps/c-ares/configure
44- cd deps/c-ares && ./configure
45-deps/c-ares/.libs/libcares.a: deps/c-ares/Makefile
46- cd deps/c-ares && make
47-
48 deps/mbedtls/programs/test/benchmark:
49 cd deps/mbedtls && make
50
51--- a/src/LowDNSResolver.cpp
52+++ b/src/LowDNSResolver.cpp
53@@ -13,7 +13,7 @@
54 #include "low_alloc.h"
55 #include "low_config.h"
56
57-#include "../deps/c-ares/nameser.h"
58+#include <arpa/nameser.h>
59
60 #include <arpa/inet.h>
61 #include <unistd.h>
62--- a/src/LowDNSResolver.h
63+++ b/src/LowDNSResolver.h
64@@ -7,7 +7,7 @@
65
66 #include "LowLoopCallback.h"
67
68-#include "../deps/c-ares/ares.h"
69+#include <ares.h>
70
71 struct low_t;
72
73--- a/src/low_main.cpp
74+++ b/src/low_main.cpp
75@@ -24,7 +24,7 @@
76
77 #include "duktape.h"
78 #if LOW_INCLUDE_CARES_RESOLVER
79-#include "../deps/c-ares/ares.h"
80+#include <ares.h>
81 #include "LowDNSResolver.h"
82 #endif /* LOW_INCLUDE_CARES_RESOLVER */
83
84--- a/src/low_process.cpp
85+++ b/src/low_process.cpp
86@@ -36,7 +36,7 @@
87 #endif /* __APPLE__ */
88
89 #if LOW_INCLUDE_CARES_RESOLVER
90-#include "../deps/c-ares/ares.h"
91+#include <ares.h>
92 #endif /* LOW_INCLUDE_CARES_RESOLVER */
93 #include "mbedtls/version.h"
94