Skip to content

P
paho.mqtt.c
Commit 9e44c3eb authored by Ian Craggs's avatar Ian Craggs
Browse files
Options

Update library names, and follow Makefile conventions

parent ebd9829a
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 34 deletions
Makefile
View file @ 9e44c3eb
...@@ -59,10 +59,10 @@ SAMPLE_FILES_A = stdoutsuba MQTTAsync_subscribe MQTTAsync_publish ...@@ -59,10 +59,10 @@ SAMPLE_FILES_A = stdoutsuba MQTTAsync_subscribe MQTTAsync_publish
ASYNC_SAMPLES = ${addprefix ${blddir}/samples/,${SAMPLE_FILES_A}} ASYNC_SAMPLES = ${addprefix ${blddir}/samples/,${SAMPLE_FILES_A}}
# The names of the four different libraries to be built # The names of the four different libraries to be built
MQTTLIB_C = mqttv3c MQTTLIB_C = paho-mqtt3c
MQTTLIB_CS = mqttv3cs MQTTLIB_CS = paho-mqtt3cs
MQTTLIB_A = mqttv3a MQTTLIB_A = paho-mqtt3a
MQTTLIB_AS = mqttv3as MQTTLIB_AS = paho-mqtt3as
# determine current platform # determine current platform
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
...@@ -76,6 +76,13 @@ ifeq ($(OSTYPE),Linux) ...@@ -76,6 +76,13 @@ ifeq ($(OSTYPE),Linux)
CC = gcc CC = gcc
ifndef INSTALL
INSTALL = install
endif
INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL) -m 644
DOXYGEN_COMMAND = doxygen
MAJOR_VERSION = 1 MAJOR_VERSION = 1
MINOR_VERSION = 0 MINOR_VERSION = 0
VERSION = ${MAJOR_VERSION}.${MINOR_VERSION} VERSION = ${MAJOR_VERSION}.${MINOR_VERSION}
...@@ -139,40 +146,40 @@ strip_options: ...@@ -139,40 +146,40 @@ strip_options:
install-strip: build strip_options install install-strip: build strip_options install
install: build install: build
install ${INSTALL_OPTS} ${MQTTLIB_C_TARGET} ${libdir} $(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_C_TARGET} $(DESTDIR)${libdir}
install ${INSTALL_OPTS} ${MQTTLIB_CS_TARGET} ${libdir} $(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_CS_TARGET} $(DESTDIR)${libdir}
install ${INSTALL_OPTS} ${MQTTLIB_A_TARGET} ${libdir} $(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_A_TARGET} $(DESTDIR)${libdir}
install ${INSTALL_OPTS} ${MQTTLIB_AS_TARGET} ${libdir} $(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_AS_TARGET} $(DESTDIR)${libdir}
install ${INSTALL_OPTS} ${MQTTVERSION_TARGET} ${bindir} $(INSTALL_PROGRAM) ${INSTALL_OPTS} ${MQTTVERSION_TARGET} $(DESTDIR)${bindir}
/sbin/ldconfig ${libdir} /sbin/ldconfig $(DESTDIR)${libdir}
ln -s lib$(MQTTLIB_C).so.${MAJOR_VERSION} ${libdir}/lib$(MQTTLIB_C).so ln -s lib$(MQTTLIB_C).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so
ln -s lib$(MQTTLIB_CS).so.${MAJOR_VERSION} ${libdir}/lib$(MQTTLIB_CS).so ln -s lib$(MQTTLIB_CS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
ln -s lib$(MQTTLIB_A).so.${MAJOR_VERSION} ${libdir}/lib$(MQTTLIB_A).so ln -s lib$(MQTTLIB_A).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
ln -s lib$(MQTTLIB_AS).so.${MAJOR_VERSION} ${libdir}/lib$(MQTTLIB_AS).so ln -s lib$(MQTTLIB_AS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so
install ${srcdir}/MQTTAsync.h ${includedir} $(INSTALL_DATA) ${srcdir}/MQTTAsync.h $(DESTDIR)${includedir}
install ${srcdir}/MQTTClient.h ${includedir} $(INSTALL_DATA) ${srcdir}/MQTTClient.h $(DESTDIR)${includedir}
install ${srcdir}/MQTTClientPersistence.h ${includedir} $(INSTALL_DATA) ${srcdir}/MQTTClientPersistence.h $(DESTDIR)${includedir}
uninstall: uninstall:
rm ${libdir}/lib$(MQTTLIB_C).so.${VERSION} rm $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${VERSION}
rm ${libdir}/lib$(MQTTLIB_CS).so.${VERSION} rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${VERSION}
rm ${libdir}/lib$(MQTTLIB_A).so.${VERSION} rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${VERSION}
rm ${libdir}/lib$(MQTTLIB_AS).so.${VERSION} rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${VERSION}
rm ${bindir}/MQTTVersion rm $(DESTDIR)${bindir}/MQTTVersion
/sbin/ldconfig ${libdir} /sbin/ldconfig $(DESTDIR)${libdir}
rm ${libdir}/lib$(MQTTLIB_C).so rm $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so
rm ${libdir}/lib$(MQTTLIB_CS).so rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
rm ${libdir}/lib$(MQTTLIB_A).so rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
rm ${libdir}/lib$(MQTTLIB_AS).so rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so
rm ${includedir}/MQTTAsync.h rm $(DESTDIR)${includedir}/MQTTAsync.h
rm ${includedir}/MQTTClient.h rm $(DESTDIR)${includedir}/MQTTClient.h
rm ${includedir}/MQTTClientPersistence.h rm $(DESTDIR)${includedir}/MQTTClientPersistence.h
html: html:
-mkdir -p ${blddir}/doc -mkdir -p ${blddir}/doc
cd ${srcdir}; doxygen ../doc/DoxyfileV3ClientAPI cd ${srcdir}; $(DOXYGEN_COMMAND) ../doc/DoxyfileV3ClientAPI
cd ${srcdir}; doxygen ../doc/DoxyfileV3AsyncAPI cd ${srcdir}; $(DOXYGEN_COMMAND) ../doc/DoxyfileV3AsyncAPI
cd ${srcdir}; doxygen ../doc/DoxyfileV3ClientInternal cd ${srcdir}; $(DOXYGEN_COMMAND) ../doc/DoxyfileV3ClientInternal
endif endif
src/MQTTVersion.c
View file @ 9e44c3eb
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
* */ * */
char* libraries[] = {"mqttv3c", "mqttv3cs", "mqttv3a", "mqttv3as"}; char* libraries[] = {"paho-mqtt3c", "paho-mqtt3cs", "paho-mqtt3a", "paho-mqtt3as"};
char* eyecatchers[] = {"MQTTAsyncV3_Version", "MQTTAsyncV3_Timestamp", char* eyecatchers[] = {"MQTTAsyncV3_Version", "MQTTAsyncV3_Timestamp",
"MQTTClientV3_Version", "MQTTClientV3_Timestamp"}; "MQTTClientV3_Version", "MQTTClientV3_Timestamp"};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment