blob: 2bc748e413e4c504581e1ba215a5d6fee0c747d6 (
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
116
117
118
119
120
121
|
From 811d81859dd0525a160df4aae83d3f729a7a39ff Mon Sep 17 00:00:00 2001
From: Scott Ware <scott.r.ware@intel.com>
Date: Thu, 13 Apr 2017 22:44:45 +0100
Subject: [PATCH 1/3] Fix dependencies
---
lib/CMakeLists.txt | 86 +-----------------------------------------------------
src/CMakeLists.txt | 6 ++--
2 files changed, 4 insertions(+), 88 deletions(-)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index fbb1b76..02a3e7e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -15,88 +15,4 @@ set(src_mqtt
MQTTUnsubscribeClient.c
)
-set(src_crypto
- aes.c
- aesni.c
- arc4.c
- asn1parse.c
- asn1write.c
- base64.c
- bignum.c
- blowfish.c
- camellia.c
- ccm.c
- cipher.c
- cipher_wrap.c
- cmac.c
- ctr_drbg.c
- des.c
- dhm.c
- ecdh.c
- ecdsa.c
- ecjpake.c
- ecp.c
- ecp_curves.c
- entropy.c
- entropy_poll.c
- error.c
- gcm.c
- havege.c
- hmac_drbg.c
- md.c
- md2.c
- md4.c
- md5.c
- md_wrap.c
- memory_buffer_alloc.c
- oid.c
- padlock.c
- pem.c
- pk.c
- pk_wrap.c
- pkcs12.c
- pkcs5.c
- pkparse.c
- pkwrite.c
- platform.c
- ripemd160.c
- rsa.c
- sha1.c
- sha256.c
- sha512.c
- threading.c
- timing.c
- version.c
- version_features.c
- xtea.c
-)
-
-set(src_x509
- certs.c
- pkcs11.c
- x509.c
- x509_create.c
- x509_crl.c
- x509_crt.c
- x509_csr.c
- x509write_crt.c
- x509write_csr.c
-)
-
-set(src_tls
- debug.c
- net_sockets.c
- ssl_cache.c
- ssl_ciphersuites.c
- ssl_cli.c
- ssl_cookie.c
- ssl_srv.c
- ssl_ticket.c
- ssl_tls.c
-)
-
-add_library(cJSON cJSON.c)
-add_library(mqttlib ${src_mqtt})
-add_library(mbedcrypto ${src_crypto})
-add_library(mbedx509 ${src_x509})
-add_library(mbedtls ${src_tls})
+add_library(iotfmqtt ${src_mqtt})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db75a98..43a52cc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,6 @@ add_library(iotfgatewayclient SHARED gatewayclient.c)
add_library(iotfdevicemgmt SHARED devicemanagementclient.c)
TARGET_LINK_LIBRARIES (iotf_network_tls_wrapper mbedcrypto mbedx509 mbedtls )
-TARGET_LINK_LIBRARIES (iotfdeviceclient iotfclient iotf_utils iotf_network_tls_wrapper mqttlib)
-TARGET_LINK_LIBRARIES (iotfgatewayclient iotfclient iotf_utils iotf_network_tls_wrapper mqttlib)
-TARGET_LINK_LIBRARIES (iotfdevicemgmt iotfclient iotfdeviceclient cJSON iotf_utils iotf_network_tls_wrapper mqttlib)
+TARGET_LINK_LIBRARIES (iotfdeviceclient iotfclient iotf_utils iotf_network_tls_wrapper iotfmqtt)
+TARGET_LINK_LIBRARIES (iotfgatewayclient iotfclient iotf_utils iotf_network_tls_wrapper iotfmqtt)
+TARGET_LINK_LIBRARIES (iotfdevicemgmt iotfclient iotfdeviceclient cJSON iotf_utils iotf_network_tls_wrapper iotfmqtt)
--
1.9.1
|
