Use $(STRIP) for stripping binaries when installing, to allow easier cross compilation.

Thanks to Frank Pagliughi.
This commit is contained in:
Roger A. Light 2014-05-08 23:18:50 +01:00
parent 1573b3a1c5
commit dc71f9157d
5 changed files with 10 additions and 6 deletions

View File

@ -19,6 +19,10 @@ Broker:
Client library: Client library:
- Fix topic matching edge case. - Fix topic matching edge case.
General:
- Use $(STRIP) for stripping binaries when installing, to allow easier cross
compilation.
1.3.1 - 20140324 1.3.1 - 20140324
================ ================

View File

@ -24,8 +24,8 @@ client_shared.o : client_shared.c client_shared.h
install : all install : all
$(INSTALL) -d ${DESTDIR}$(prefix)/bin $(INSTALL) -d ${DESTDIR}$(prefix)/bin
$(INSTALL) -s mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub $(INSTALL) -s --strip-program=$(STRIP) mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
$(INSTALL) -s mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub $(INSTALL) -s --strip-program=$(STRIP) mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
uninstall : uninstall :
-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub -rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub

View File

@ -24,7 +24,7 @@ all : libmosquitto.so.${SOVERSION} libmosquitto.a
install : all install : all
$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
$(INSTALL) -s libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} $(INSTALL) -s --strip-program=$(STRIP) libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so
$(INSTALL) -d ${DESTDIR}${prefix}/include/ $(INSTALL) -d ${DESTDIR}${prefix}/include/
$(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h

View File

@ -10,7 +10,7 @@ all : libmosquittopp.so.${SOVERSION}
install : all install : all
$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
$(INSTALL) -s libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} $(INSTALL) -s --strip-program=$(STRIP) libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so
$(INSTALL) -d ${DESTDIR}${prefix}/include/ $(INSTALL) -d ${DESTDIR}${prefix}/include/
$(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h $(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h

View File

@ -100,10 +100,10 @@ mosquitto_passwd.o : mosquitto_passwd.c
install : all install : all
$(INSTALL) -d ${DESTDIR}$(prefix)/sbin $(INSTALL) -d ${DESTDIR}$(prefix)/sbin
$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto $(INSTALL) -s --strip-program=$(STRIP) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
ifeq ($(WITH_TLS),yes) ifeq ($(WITH_TLS),yes)
$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd $(INSTALL) -s --strip-program=$(STRIP) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
endif endif
uninstall : uninstall :