From 330a7a882e1decf93c73aea2571b14667df64a7a Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Sun, 25 May 2014 23:36:38 +0100 Subject: [PATCH] Add CROSS_COMPILE to Makefiles. --- client/Makefile | 14 +++++------ lib/Makefile | 38 ++++++++++++++-------------- lib/cpp/Makefile | 6 ++--- src/Makefile | 60 ++++++++++++++++++++++---------------------- src/db_dump/Makefile | 4 +-- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/client/Makefile b/client/Makefile index cfd8c76a..bd65355f 100644 --- a/client/Makefile +++ b/client/Makefile @@ -5,27 +5,27 @@ include ../config.mk all : mosquitto_pub mosquitto_sub mosquitto_pub : pub_client.o client_shared.o - ${CC} $^ -o $@ ${CLIENT_LDFLAGS} + ${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS} mosquitto_sub : sub_client.o client_shared.o - ${CC} $^ -o $@ ${CLIENT_LDFLAGS} + ${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS} pub_client.o : pub_client.c ../lib/libmosquitto.so.${SOVERSION} - ${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} sub_client.o : sub_client.c ../lib/libmosquitto.so.${SOVERSION} - ${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} client_shared.o : client_shared.c client_shared.h - ${CC} -c $< -o $@ ${CLIENT_CFLAGS} + ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} ../lib/libmosquitto.so.${SOVERSION} : $(MAKE) -C ../lib install : all $(INSTALL) -d ${DESTDIR}$(prefix)/bin - $(INSTALL) -s mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub - $(INSTALL) -s mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub + $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub + $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub uninstall : -rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub diff --git a/lib/Makefile b/lib/Makefile index 518d4566..c923b2e0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -24,7 +24,7 @@ all : libmosquitto.so.${SOVERSION} libmosquitto.a install : all $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ - $(INSTALL) -s libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} + $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so $(INSTALL) -d ${DESTDIR}${prefix}/include/ $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h @@ -42,55 +42,55 @@ clean : $(MAKE) -C cpp clean libmosquitto.so.${SOVERSION} : ${MOSQ_OBJS} - $(CC) -shared $(LIB_LDFLAGS) $^ -o $@ ${LIB_LIBS} + ${CROSS_COMPILE}$(CC) -shared $(LIB_LDFLAGS) $^ -o $@ ${LIB_LIBS} libmosquitto.a : ${MOSQ_OBJS} - $(AR) cr $@ $^ + ${CROSS_COMPILE}$(AR) cr $@ $^ mosquitto.o : mosquitto.c mosquitto.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ logging_mosq.o : logging_mosq.c logging_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ messages_mosq.o : messages_mosq.c messages_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ memory_mosq.o : memory_mosq.c memory_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ net_mosq.o : net_mosq.c net_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ read_handle.o : read_handle.c read_handle.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ read_handle_client.o : read_handle_client.c read_handle.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ read_handle_shared.o : read_handle_shared.c read_handle.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ send_mosq.o : send_mosq.c send_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ send_client_mosq.o : send_client_mosq.c send_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ srv_mosq.o : srv_mosq.c - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ thread_mosq.o : thread_mosq.c - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ time_mosq.o : time_mosq.c - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ tls_mosq.o : tls_mosq.c - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ util_mosq.o : util_mosq.c util_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ will_mosq.o : will_mosq.c will_mosq.h - $(CC) $(LIB_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@ diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile index 9dc8d809..8b627d32 100644 --- a/lib/cpp/Makefile +++ b/lib/cpp/Makefile @@ -10,7 +10,7 @@ all : libmosquittopp.so.${SOVERSION} install : all $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ - $(INSTALL) -s libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} + $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so $(INSTALL) -d ${DESTDIR}${prefix}/include/ $(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h @@ -24,8 +24,8 @@ clean : -rm -f *.o libmosquittopp.so.${SOVERSION} libmosquittopp.so.${SOVERSION} : mosquittopp.o - $(CXX) -shared $(LIB_LDFLAGS) $< -o $@ ../libmosquitto.so.${SOVERSION} + ${CROSS_COMPILE}$(CXX) -shared $(LIB_LDFLAGS) $< -o $@ ../libmosquitto.so.${SOVERSION} mosquittopp.o : mosquittopp.cpp mosquittopp.h - $(CXX) $(LIB_CXXFLAGS) -c $< -o $@ + ${CROSS_COMPILE}$(CXX) $(LIB_CXXFLAGS) -c $< -o $@ diff --git a/src/Makefile b/src/Makefile index 5dbf06fa..c3f06cce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,94 +9,94 @@ all : mosquitto endif mosquitto : mosquitto.o bridge.o conf.o context.o database.o logging.o loop.o memory_mosq.o persist.o net.o net_mosq.o read_handle.o read_handle_client.o read_handle_server.o read_handle_shared.o security.o security_default.o send_client_mosq.o send_mosq.o send_server.o service.o subs.o sys_tree.o time_mosq.o tls_mosq.o util_mosq.o will_mosq.o - ${CC} $^ -o $@ ${LDFLAGS} $(BROKER_LIBS) + ${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} $(BROKER_LIBS) mosquitto.o : mosquitto.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ -DCHANGESET=\"$$(cat ../changeset)\" + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ -DCHANGESET=\"$$(cat ../changeset)\" bridge.o : bridge.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ conf.o : conf.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ context.o : context.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ database.o : database.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ logging.o : logging.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ loop.o : loop.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ memory_mosq.o : ../lib/memory_mosq.c ../lib/memory_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ net.o : net.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ net_mosq.o : ../lib/net_mosq.c ../lib/net_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ persist.o : persist.c persist.h mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ read_handle.o : read_handle.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ read_handle_client.o : read_handle_client.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ read_handle_server.o : read_handle_server.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ read_handle_shared.o : ../lib/read_handle_shared.c ../lib/read_handle.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ security.o : security.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ security_default.o : security_default.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ send_client_mosq.o : ../lib/send_client_mosq.c ../lib/send_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ send_mosq.o : ../lib/send_mosq.c ../lib/send_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ send_server.o : send_server.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ service.o : service.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ subs.o : subs.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ sys_tree.o : sys_tree.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ time_mosq.o : ../lib/time_mosq.c ../lib/time_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ tls_mosq.o : ../lib/tls_mosq.c - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ util_mosq.o : ../lib/util_mosq.c ../lib/util_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ will_mosq.o : ../lib/will_mosq.c ../lib/will_mosq.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ mosquitto_passwd : mosquitto_passwd.o - ${CC} $^ -o $@ ${LDFLAGS} $(PASSWD_LIBS) + ${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} $(PASSWD_LIBS) mosquitto_passwd.o : mosquitto_passwd.c - ${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@ + ${CROSS_COMPILE}${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@ install : all $(INSTALL) -d ${DESTDIR}$(prefix)/sbin diff --git a/src/db_dump/Makefile b/src/db_dump/Makefile index 4317c9ab..13ae261b 100644 --- a/src/db_dump/Makefile +++ b/src/db_dump/Makefile @@ -7,10 +7,10 @@ CFLAGS_FINAL=${CFLAGS} -I.. -I../../lib -I../.. all : mosquitto_db_dump mosquitto_db_dump : db_dump.o - ${CC} $^ -o $@ ${LDFLAGS} ${LIBS} + ${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} ${LIBS} db_dump.o : db_dump.c ../persist.h - ${CC} $(CFLAGS_FINAL) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@ clean : -rm -f *.o mosquitto_db_dump