miniupnpc: move public .h files to include/ subdir

fixes #540

miniupnpc/CMakeLists.txt

@@ -70,21 +70,6 @@ set (MINIUPNPC_SOURCES
   portlistingparse.c
   receivedata.c
   addr_is_reserved.c
-  connecthostport.h
-  igd_desc_parse.h
-  minisoap.h
-  minissdpc.h
-  miniupnpc.h
-  miniupnpctypes.h
-  miniwget.h
-  minixml.h
-  portlistingparse.h
-  receivedata.h
-  upnpcommands.h
-  upnpdev.h
-  upnperrors.h
-  upnpreplyparse.h
-  addr_is_reserved.h
   ${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h
 )
 
@@ -105,12 +90,15 @@ elseif (HAIKU)
   find_library (SOCKET_LIBRARY NAMES network)
   find_library (NSL_LIBRARY NAMES network)
   find_library (RESOLV_LIBRARY NAMES network)
-  set (LDLIBS ${SOCKET_LIBRARY} ${NSL_LIBRARY} ${RESOLV_LIBRARY} ${LDLIBS})  
+  set (LDLIBS ${SOCKET_LIBRARY} ${NSL_LIBRARY} ${RESOLV_LIBRARY} ${LDLIBS})
 endif ()
 
 
 if (UPNPC_BUILD_STATIC)
   add_library (libminiupnpc-static STATIC ${MINIUPNPC_SOURCES})
+  target_include_directories (libminiupnpc-static PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include/miniupnpc>)
   if (NOT UPNPC_BUILD_SHARED)
     add_library (miniupnpc::miniupnpc ALIAS libminiupnpc-static)
   endif()
@@ -151,6 +139,9 @@ endif ()
 
 if (UPNPC_BUILD_SHARED)
   add_library (libminiupnpc-shared SHARED ${MINIUPNPC_SOURCES})
+  target_include_directories (libminiupnpc-shared PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include/miniupnpc>)
   add_library (miniupnpc::miniupnpc ALIAS libminiupnpc-shared)
   set_target_properties (libminiupnpc-shared PROPERTIES EXPORT_NAME miniupnpc)
   set_target_properties (libminiupnpc-shared PROPERTIES OUTPUT_NAME "miniupnpc")
@@ -193,6 +184,8 @@ if (UPNPC_BUILD_TESTS)
   target_compile_definitions(miniupnpc-tests INTERFACE MINIUPNP_STATICLIB)
 
   add_executable (testminixml testminixml.c minixml.c igd_desc_parse.c)
+  target_include_directories (testminixml PRIVATE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
   target_link_libraries (testminixml PRIVATE miniupnpc-tests)
 
   add_executable (minixmlvalid minixmlvalid.c minixml.c)
@@ -200,6 +193,8 @@ if (UPNPC_BUILD_TESTS)
 
   add_executable (testupnpreplyparse testupnpreplyparse.c
                                      minixml.c upnpreplyparse.c)
+  target_include_directories (testupnpreplyparse PRIVATE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
   target_link_libraries (testupnpreplyparse PRIVATE miniupnpc-tests)
 
   add_executable (testigddescparse testigddescparse.c
@@ -207,6 +202,8 @@ if (UPNPC_BUILD_TESTS)
                                    upnpcommands.c upnpreplyparse.c minisoap.c connecthostport.c
                                    portlistingparse.c receivedata.c addr_is_reserved.c
   )
+  target_include_directories (testigddescparse PRIVATE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
   target_link_libraries (testigddescparse PRIVATE miniupnpc-tests)
 
   add_executable (testminiwget testminiwget.c
@@ -214,6 +211,8 @@ if (UPNPC_BUILD_TESTS)
                                upnpreplyparse.c minixml.c igd_desc_parse.c connecthostport.c
                                portlistingparse.c receivedata.c addr_is_reserved.c
   )
+  target_include_directories (testminiwget PRIVATE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
   target_link_libraries (testminiwget PRIVATE miniupnpc-tests)
 
   add_executable (testaddr_is_reserved testaddr_is_reserved.c

miniupnpc/Makefile

@@ -3,7 +3,7 @@
 # http://miniupnp.free.fr/
 # https://miniupnp.tuxfamily.org/
 # https://github.com/miniupnp/miniupnp
-# (c) 2005-2020 Thomas Bernard
+# (c) 2005-2021 Thomas Bernard
 # to install use :
 # $ make DESTDIR=/tmp/dummylocation install
 # or
@@ -101,11 +101,8 @@ endif
 OBJS = $(patsubst %.c,%.o,$(SRCS))
 
 # HEADERS to install
-HEADERS = miniupnpc.h miniwget.h upnpcommands.h igd_desc_parse.h \
-          upnpreplyparse.h upnperrors.h miniupnpctypes.h \
-          portlistingparse.h \
-          upnpdev.h \
-          miniupnpc_declspec.h
+CPPFLAGS += -Iinclude/
+HEADERS = $(wildcard include/*.h)
 
 # library names
 LIBRARY = libminiupnpc.a
@@ -241,9 +238,9 @@ clean:
 distclean: clean
 	$(RM) $(JNAERATOR) java/*.jar java/*.class out.errors.txt
 
-updateversion:	miniupnpc.h
-	cp miniupnpc.h miniupnpc.h.bak
-	sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < miniupnpc.h.bak > miniupnpc.h
+updateversion:	include/miniupnpc.h
+	cp $< $<.bak
+	sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < $<.bak > $<
 
 install:	updateversion $(FILESTOINSTALL)
 	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
@@ -380,41 +377,49 @@ minihttptestserver:	minihttptestserver.o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-igd_desc_parse.o: igd_desc_parse.h
-miniupnpc.o: miniupnpc.h miniupnpc_declspec.h igd_desc_parse.h upnpdev.h
-miniupnpc.o: minissdpc.h miniwget.h minisoap.h minixml.h upnpcommands.h
-miniupnpc.o: upnpreplyparse.h portlistingparse.h miniupnpctypes.h
-miniupnpc.o: connecthostport.h
+igd_desc_parse.o: include/igd_desc_parse.h
+miniupnpc.o: include/miniupnpc.h include/miniupnpc_declspec.h
+miniupnpc.o: include/igd_desc_parse.h include/upnpdev.h minissdpc.h
+miniupnpc.o: include/miniwget.h miniwget_private.h miniupnpc_socketdef.h
+miniupnpc.o: minisoap.h minixml.h include/upnpcommands.h
+miniupnpc.o: include/miniupnpctypes.h connecthostport.h addr_is_reserved.h
 minixml.o: minixml.h
-minisoap.o: minisoap.h miniupnpcstrings.h
-miniwget.o: miniupnpcstrings.h miniwget.h miniupnpc_declspec.h
-miniwget.o: connecthostport.h receivedata.h
-upnpc.o: miniwget.h miniupnpc_declspec.h miniupnpc.h igd_desc_parse.h
-upnpc.o: upnpdev.h upnpcommands.h upnpreplyparse.h portlistingparse.h
-upnpc.o: miniupnpctypes.h upnperrors.h miniupnpcstrings.h
-upnpcommands.o: upnpcommands.h upnpreplyparse.h portlistingparse.h
-upnpcommands.o: miniupnpc_declspec.h miniupnpctypes.h miniupnpc.h
-upnpcommands.o: igd_desc_parse.h upnpdev.h
-upnpreplyparse.o: upnpreplyparse.h minixml.h
-testminixml.o: minixml.h igd_desc_parse.h
+minisoap.o: minisoap.h miniupnpc_socketdef.h miniupnpcstrings.h
+miniwget.o: miniupnpcstrings.h include/miniwget.h
+miniwget.o: include/miniupnpc_declspec.h connecthostport.h
+miniwget.o: miniupnpc_socketdef.h receivedata.h
+upnpc.o: include/miniwget.h include/miniupnpc_declspec.h include/miniupnpc.h
+upnpc.o: include/igd_desc_parse.h include/upnpdev.h include/upnpcommands.h
+upnpc.o: include/miniupnpctypes.h include/portlistingparse.h
+upnpc.o: include/upnperrors.h miniupnpcstrings.h
+upnpcommands.o: include/upnpcommands.h include/miniupnpc_declspec.h
+upnpcommands.o: include/miniupnpctypes.h include/miniupnpc.h
+upnpcommands.o: include/igd_desc_parse.h include/upnpdev.h
+upnpcommands.o: include/portlistingparse.h include/upnpreplyparse.h
+upnpreplyparse.o: include/upnpreplyparse.h minixml.h
+testminixml.o: minixml.h include/igd_desc_parse.h
 minixmlvalid.o: minixml.h
-testupnpreplyparse.o: upnpreplyparse.h
-minissdpc.o: minissdpc.h miniupnpc_declspec.h upnpdev.h miniupnpc.h
-minissdpc.o: igd_desc_parse.h receivedata.h codelength.h
-upnperrors.o: upnperrors.h miniupnpc_declspec.h upnpcommands.h
-upnperrors.o: upnpreplyparse.h portlistingparse.h miniupnpctypes.h
-upnperrors.o: miniupnpc.h igd_desc_parse.h upnpdev.h
-testigddescparse.o: igd_desc_parse.h minixml.h miniupnpc.h
-testigddescparse.o: miniupnpc_declspec.h upnpdev.h
-testminiwget.o: miniwget.h miniupnpc_declspec.h
-connecthostport.o: connecthostport.h
-portlistingparse.o: portlistingparse.h miniupnpc_declspec.h miniupnpctypes.h
-portlistingparse.o: minixml.h
-receivedata.o: receivedata.h
-upnpdev.o: upnpdev.h miniupnpc_declspec.h
-testportlistingparse.o: portlistingparse.h miniupnpc_declspec.h
-testportlistingparse.o: miniupnpctypes.h
-miniupnpcmodule.o: miniupnpc.h miniupnpc_declspec.h igd_desc_parse.h
-miniupnpcmodule.o: upnpdev.h upnpcommands.h upnpreplyparse.h
-miniupnpcmodule.o: portlistingparse.h miniupnpctypes.h upnperrors.h
-listdevices.o: miniupnpc.h miniupnpc_declspec.h igd_desc_parse.h upnpdev.h
+testupnpreplyparse.o: include/upnpreplyparse.h
+minissdpc.o: miniupnpc_socketdef.h minissdpc.h include/miniupnpc_declspec.h
+minissdpc.o: include/upnpdev.h include/miniupnpc.h include/igd_desc_parse.h
+minissdpc.o: receivedata.h codelength.h
+upnperrors.o: include/upnperrors.h include/miniupnpc_declspec.h
+upnperrors.o: include/upnpcommands.h include/miniupnpctypes.h
+upnperrors.o: include/miniupnpc.h include/igd_desc_parse.h include/upnpdev.h
+testigddescparse.o: include/igd_desc_parse.h minixml.h include/miniupnpc.h
+testigddescparse.o: include/miniupnpc_declspec.h include/upnpdev.h
+testminiwget.o: include/miniwget.h include/miniupnpc_declspec.h
+connecthostport.o: connecthostport.h miniupnpc_socketdef.h
+portlistingparse.o: include/portlistingparse.h include/miniupnpc_declspec.h
+portlistingparse.o: include/miniupnpctypes.h minixml.h
+receivedata.o: receivedata.h miniupnpc_socketdef.h
+upnpdev.o: include/upnpdev.h include/miniupnpc_declspec.h
+testportlistingparse.o: include/portlistingparse.h
+testportlistingparse.o: include/miniupnpc_declspec.h include/miniupnpctypes.h
+miniupnpcmodule.o: include/miniupnpc.h include/miniupnpc_declspec.h
+miniupnpcmodule.o: include/igd_desc_parse.h include/upnpdev.h
+miniupnpcmodule.o: include/upnpcommands.h include/miniupnpctypes.h
+miniupnpcmodule.o: include/upnperrors.h
+testaddr_is_reserved.o: addr_is_reserved.h
+listdevices.o: include/miniupnpc.h include/miniupnpc_declspec.h
+listdevices.o: include/igd_desc_parse.h include/upnpdev.h

miniupnpc/Makefile.mingw

@@ -18,8 +18,11 @@ RM = del
 else
 RM = rm -f
 endif
-#CFLAGS = -Wall -g -DDEBUG -D_WIN32_WINNT=0X501
-CFLAGS = -Wall -W -Wstrict-prototypes -Os -DNDEBUG -D_WIN32_WINNT=0X501
+#CFLAGS = -Wall -g
+#CPPFLAGS = -DDEBUG -D_WIN32_WINNT=0X501
+CFLAGS = -Wall -W -Wstrict-prototypes -Os
+CPPFLAGS = -DNDEBUG -D_WIN32_WINNT=0X501
+CPPFLAGS += -Iinclude
 LDLIBS = -lws2_32 -liphlpapi
 # -lwsock32
 # -liphlpapi is needed for GetBestRoute() and GetIpAddrTable()
@@ -75,13 +78,13 @@ miniupnpc.dll:	miniupnpc.def $(OBJSDLL)
 miniupnpc.lib:	miniupnpc.dll
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -DMINIUPNP_STATICLIB -c -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMINIUPNP_STATICLIB -c -o $@ $<
 
 dll-%.o:	%.c
-	$(CC) $(CFLAGS) -DMINIUPNP_EXPORTS -c -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMINIUPNP_EXPORTS -c -o $@ $<
 
 %-shared.o:	%.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 # --enable-stdcall-fixup
 %-static.exe:	%.o libminiupnpc.a
@@ -95,7 +98,7 @@ dll-%.o:	%.c
 # sed (if cross compiling from another platform).
 ifeq ($(OS),Windows_NT)
 wingenminiupnpcstrings.exe:	wingenminiupnpcstrings.c
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^
 
 miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings.exe VERSION
 	.\wingenminiupnpcstrings.exe $< $@ rc_version.h
@@ -122,23 +125,24 @@ testminixml.exe:	testminixml.o minixml.o igd_desc_parse.o
 
 minixml.o:	minixml.c minixml.h
 
-upnpc.o:	miniwget.h minisoap.h miniupnpc.h igd_desc_parse.h
-upnpc.o:	upnpreplyparse.h upnpcommands.h upnperrors.h miniupnpcstrings.h
+upnpc.o:	include/miniwget.h minisoap.h include/miniupnpc.h include/igd_desc_parse.h
+upnpc.o:	include/upnpreplyparse.h include/upnpcommands.h include/upnperrors.h miniupnpcstrings.h
 
-miniwget.o:	miniwget.c miniwget.h miniupnpcstrings.h connecthostport.h
+miniwget.o:	miniwget.c include/miniwget.h miniupnpcstrings.h connecthostport.h
 
 minisoap.o:	minisoap.c minisoap.h miniupnpcstrings.h
 
-miniupnpc.o:	miniupnpc.c miniupnpc.h minisoap.h miniwget.h minixml.h \
+miniupnpc.o:	miniupnpc.c include/miniupnpc.h minisoap.h include/miniwget.h minixml.h \
 	addr_is_reserved.h
 
-igd_desc_parse.o:	igd_desc_parse.c igd_desc_parse.h
+igd_desc_parse.o:	igd_desc_parse.c include/igd_desc_parse.h
 
-upnpreplyparse.o:	upnpreplyparse.c upnpreplyparse.h minixml.h
+upnpreplyparse.o:	upnpreplyparse.c include/upnpreplyparse.h minixml.h
 
-upnpcommands.o:	upnpcommands.c upnpcommands.h upnpreplyparse.h miniupnpc.h portlistingparse.h
+upnpcommands.o:	upnpcommands.c include/upnpcommands.h include/upnpreplyparse.h \
+	include/miniupnpc.h include/portlistingparse.h
 
 minissdpc.o:	minissdpc.c minissdpc.h receivedata.h
 
-upnpdev.o:	upnpdev.c upnpdev.h
+upnpdev.o:	upnpdev.c include/upnpdev.h
 

miniupnpc/setup.py

@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # vim: tabstop=8 shiftwidth=8 expandtab
 # $Id: setup.py,v 1.14 2020/04/06 10:23:02 nanard Exp $
-# the MiniUPnP Project (c) 2007-2020 Thomas Bernard
+# the MiniUPnP Project (c) 2007-2021 Thomas Bernard
 # https://miniupnp.tuxfamily.org/ or http://miniupnp.free.fr/
 #
 # python script to build the miniupnpc module under unix
@@ -30,6 +30,6 @@ setup(name="miniupnpc",
       cmdclass={'build_ext': make_then_build_ext},
       ext_modules=[
          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
-                   extra_objects=EXT)
+                   include_dirs=['include'], extra_objects=EXT)
       ])
 

miniupnpc/setupmingw32.py

@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # vim: tabstop=8 shiftwidth=8 expandtab
 # $Id: setupmingw32.py,v 1.12 2020/04/06 10:23:02 nanard Exp $
-# the MiniUPnP Project (c) 2007-2020 Thomas Bernard
+# the MiniUPnP Project (c) 2007-2021 Thomas Bernard
 # https://miniupnp.tuxfamily.org/ or http://miniupnp.free.fr/
 #
 # python script to build the miniupnpc module under windows (using mingw32)
@@ -30,6 +30,6 @@ setup(name="miniupnpc",
       ext_modules=[
          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
                    libraries=["ws2_32", "iphlpapi"] + compat_lib,
-                   extra_objects=["miniupnpc.lib"])
+                   include_dirs=['include'], extra_objects=["miniupnpc.lib"])
       ])