From 4c72542eae07ac8aa3bddcb368116877c395e990 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Fri, 15 Apr 2022 22:08:49 +0100
Subject: [PATCH] Move mosquittopp header to include dir.

---
 config.mk                          | 2 +-
 {lib/cpp => include}/mosquittopp.h | 0
 lib/cpp/Makefile                   | 4 ++--
 test/lib/c/Makefile                | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename {lib/cpp => include}/mosquittopp.h (100%)

diff --git a/config.mk b/config.mk
index 1f296729..345474ae 100644
--- a/config.mk
+++ b/config.mk
@@ -130,7 +130,7 @@ WITH_OLD_KEEPALIVE=no
 
 # Use link time optimisation - note that enabling this currently prevents
 # broker plugins from working.
-WITH_LTO=yes
+#WITH_LTO=yes
 
 # Build with sqlite3 support - this enables the sqlite persistence plugin.
 WITH_SQLITE=yes
diff --git a/lib/cpp/mosquittopp.h b/include/mosquittopp.h
similarity index 100%
rename from lib/cpp/mosquittopp.h
rename to include/mosquittopp.h
diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile
index 25b8dc73..162bc25b 100644
--- a/lib/cpp/Makefile
+++ b/lib/cpp/Makefile
@@ -24,7 +24,7 @@ ifeq ($(WITH_STATIC_LIBRARIES),yes)
 	${CROSS_COMPILE}${STRIP} -g --strip-unneeded "${DESTDIR}${libdir}/libmosquittopp.a"
 endif
 	$(INSTALL) -d "${DESTDIR}${incdir}/"
-	$(INSTALL) mosquittopp.h "${DESTDIR}${incdir}/mosquittopp.h"
+	$(INSTALL) ${R}/include/mosquittopp.h "${DESTDIR}${incdir}/mosquittopp.h"
 	$(INSTALL) -d "${DESTDIR}${libdir}/pkgconfig/"
 	$(INSTALL) -m644 ${R}/libmosquittopp.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
 	sed ${SEDINPLACE} -e "s#@CMAKE_INSTALL_PREFIX@#${prefix}#" -e "s#@VERSION@#${VERSION}#" "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
@@ -44,6 +44,6 @@ libmosquittopp.so.${SOVERSION} : mosquittopp.o
 libmosquittopp.a : mosquittopp.o
 	${CROSS_COMPILE}$(AR) cr $@ $^
 
-mosquittopp.o : mosquittopp.cpp mosquittopp.h
+mosquittopp.o : mosquittopp.cpp ${R}/include/mosquittopp.h
 	${CROSS_COMPILE}$(CXX) $(LIB_CPPFLAGS) $(LIB_CXXFLAGS) -c $< -o $@
 
diff --git a/test/lib/c/Makefile b/test/lib/c/Makefile
index 0bbf341b..de6c926e 100644
--- a/test/lib/c/Makefile
+++ b/test/lib/c/Makefile
@@ -14,6 +14,7 @@ SRC = \
 	01-no-clean-session.c \
 	01-pre-connect-callback.c \
 	01-server-keepalive-pingreq.c \
+	01-server-redirect.c \
 	01-unpwd-set.c \
 	01-will-set.c \
 	01-will-unpwd-set.c \