Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
paho.mqtt.c
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
eclipse
paho.mqtt.c
Commits
06ab926a
Commit
06ab926a
authored
Jul 17, 2017
by
Ian Craggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make MACOS Makefile work with brew OpenSSL
parent
e940c3c8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
12 deletions
+17
-12
.gitignore
.gitignore
+1
-0
Makefile
Makefile
+14
-12
travis-macos-vars
travis-macos-vars
+2
-0
No files found.
.gitignore
View file @
06ab926a
...
...
@@ -2,4 +2,5 @@
/build/
/build.paho/
*.swp
*.pyc
/build.paho
Makefile
View file @
06ab926a
#*******************************************************************************
# Copyright (c) 2009, 2017 IBM Corp.
#
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# and Eclipse Distribution License v1.0 which accompany this distribution.
#
# The Eclipse Public License is available at
# and Eclipse Distribution License v1.0 which accompany this distribution.
#
# The Eclipse Public License is available at
# http://www.eclipse.org/legal/epl-v10.html
# and the Eclipse Distribution License is available at
# and the Eclipse Distribution License is available at
# http://www.eclipse.org/org/documents/edl-v10.php.
#
#
# Contributors:
# Ian Craggs - initial API and implementation and/or initial documentation
# Allan Stockdill-Mander - SSL updates
...
...
@@ -84,13 +84,13 @@ HEADERS = $(srcdir)/*.h
HEADERS_C
=
$
(
filter-out
$(srcdir)
/MQTTAsync.h,
$(HEADERS)
)
HEADERS_A
=
$(HEADERS)
SAMPLE_FILES_C
=
paho_cs_pub paho_cs_sub MQTTClient_publish MQTTClient_publish_async MQTTClient_subscribe
SAMPLE_FILES_C
=
paho_cs_pub paho_cs_sub MQTTClient_publish MQTTClient_publish_async MQTTClient_subscribe
SYNC_SAMPLES
=
${
addprefix
${
blddir
}
/samples/,
${
SAMPLE_FILES_C
}}
SAMPLE_FILES_A
=
paho_c_pub paho_c_sub MQTTAsync_subscribe MQTTAsync_publish
ASYNC_SAMPLES
=
${
addprefix
${
blddir
}
/samples/,
${
SAMPLE_FILES_A
}}
TEST_FILES_C
=
test1 test2 sync_client_test test_mqtt4sync
TEST_FILES_C
=
test1 test2 sync_client_test test_mqtt4sync
SYNC_TESTS
=
${
addprefix
${
blddir
}
/test/,
${
TEST_FILES_C
}}
TEST_FILES_CS
=
test3
...
...
@@ -160,16 +160,17 @@ else ifeq ($(OSTYPE),Darwin)
MQTTCLIENT_INIT
=
_MQTTClient_init
MQTTASYNC_INIT
=
_MQTTAsync_init
START_GROUP
=
END_GROUP
=
END_GROUP
=
EXTRA_LIB
=
-ldl
CCFLAGS_SO
+=
-Wno-deprecated-declarations
-DOSX
CCFLAGS_SO
+=
-Wno-deprecated-declarations
-DOSX
-I
/usr/local/opt/openssl/include
LDFLAGS_C
+=
-Wl
,-install_name,lib
$(MQTTLIB_C)
.so.
${
MAJOR_VERSION
}
LDFLAGS_CS
+=
-Wl
,-install_name,lib
$(MQTTLIB_CS)
.so.
${
MAJOR_VERSION
}
LDFLAGS_CS
+=
-Wl
,-install_name,lib
$(MQTTLIB_CS)
.so.
${
MAJOR_VERSION
}
-L
/usr/local/opt/openssl/lib
LDFLAGS_A
+=
-Wl
,-install_name,lib
${
MQTTLIB_A
}
.so.
${
MAJOR_VERSION
}
LDFLAGS_AS
+=
-Wl
,-install_name,lib
${
MQTTLIB_AS
}
.so.
${
MAJOR_VERSION
}
LDFLAGS_AS
+=
-Wl
,-install_name,lib
${
MQTTLIB_AS
}
.so.
${
MAJOR_VERSION
}
-L
/usr/local/opt/openssl/lib
FLAGS_EXE
+=
-DOSX
FLAGS_EXES
+=
-L
/usr/local/opt/openssl/lib
endif
...
...
@@ -179,6 +180,7 @@ build: | mkdir ${MQTTLIB_C_TARGET} ${MQTTLIB_CS_TARGET} ${MQTTLIB_A_TARGET} ${MQ
clean
:
rm
-rf
${
blddir
}
/
*
rm
-rf
${
blddir_work
}
/
*
mkdir
:
-
mkdir
-p
${
blddir
}
/samples
...
...
travis-macos-vars
0 → 100644
View file @
06ab926a
export TRAVIS_OS_NAME=osx
export TRAVIS_BUILD_DIR=/Users/icraggs/git/paho.mqtt.c
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment