status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

listdevices => upnp-listdevices

This commit is contained in:
Thomas Bernard 2023-06-16 00:40:35 +02:00
parent b557fdf4db
commit ed16f24eec
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miniupnpc/CMakeLists.txt
View File

@ -144,6 +144,14 @@ if (UPNPC_BUILD_STATIC)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()
endif () endif ()
add_executable (upnp-listdevices-static src/listdevices.c)
target_link_libraries (upnp-listdevices-static PRIVATE libminiupnpc-static)
target_include_directories(upnp-listdevices-static PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
if (NOT UPNPC_NO_INSTALL)
install (TARGETS upnp-listdevices-static
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
endif () endif ()
if (UPNPC_BUILD_SHARED) if (UPNPC_BUILD_SHARED)
@ -186,11 +194,11 @@ if (UPNPC_BUILD_SHARED)
endif() endif()
endif () endif ()
add_executable (listdevices src/listdevices.c) add_executable (upnp-listdevices-shared src/listdevices.c)
target_link_libraries (listdevices PRIVATE libminiupnpc-shared) target_link_libraries (upnp-listdevices-shared PRIVATE libminiupnpc-shared)
target_include_directories(listdevices PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(upnp-listdevices-shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
if (NOT UPNPC_NO_INSTALL) if (NOT UPNPC_NO_INSTALL)
install (TARGETS listdevices install (TARGETS upnp-listdevices-shared
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()
endif () endif ()

1
miniupnpc/Changelog.txt
View File

@ -3,6 +3,7 @@ miniUPnP client Changelog.
2023/06/15: 2023/06/15:
Make User-Agent compliant. Make User-Agent compliant.
listdevices => upnp-listdevices
VERSION 2.2.5 : released 2023/06/12 VERSION 2.2.5 : released 2023/06/12

14
miniupnpc/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.145 2021/09/28 20:42:25 nanard Exp $ # $Id: Makefile,v 1.149 2023/06/15 22:42:37 nanard Exp $
# MiniUPnP Project # MiniUPnP Project
# http://miniupnp.free.fr/ # http://miniupnp.free.fr/
# https://miniupnp.tuxfamily.org/ # https://miniupnp.tuxfamily.org/
@ -118,7 +118,7 @@ else
endif endif
endif endif
EXECUTABLES = $(addprefix $(BUILD)/, upnpc-static listdevices) EXECUTABLES = $(addprefix $(BUILD)/, upnpc-static upnp-listdevices-static)
EXECUTABLES_ADDTESTS = $(addprefix $(BUILD)/, testminixml minixmlvalid \ EXECUTABLES_ADDTESTS = $(addprefix $(BUILD)/, testminixml minixmlvalid \
testupnpreplyparse testigddescparse testminiwget testportlistingparse) testupnpreplyparse testigddescparse testminiwget testportlistingparse)
@ -141,7 +141,7 @@ ifeq (, $(findstring amiga, $(OS)))
ifeq (, $(findstring mingw, $(OS))$(findstring cygwin, $(OS))$(findstring msys, $(OS))) ifeq (, $(findstring mingw, $(OS))$(findstring cygwin, $(OS))$(findstring msys, $(OS)))
CFLAGS += -fPIC CFLAGS += -fPIC
endif endif
EXECUTABLES += $(BUILD)/upnpc-shared EXECUTABLES += $(BUILD)/upnpc-shared $(BUILD)/upnp-listdevices-shared
TESTMINIWGETOBJS += $(BUILD)/minissdpc.o TESTMINIWGETOBJS += $(BUILD)/minissdpc.o
TESTIGDDESCPARSE += $(BUILD)/minissdpc.o TESTIGDDESCPARSE += $(BUILD)/minissdpc.o
LIBOBJS += $(BUILD)/minissdpc.o LIBOBJS += $(BUILD)/minissdpc.o
@ -258,8 +258,10 @@ endif
$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN) $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
ifneq (, $(findstring amiga, $(OS))) ifneq (, $(findstring amiga, $(OS)))
$(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
$(INSTALL) -m 755 $(BUILD)/upnp-listdevices-static $(DESTDIR)$(INSTALLDIRBIN)/upnp-listdevices
else else
$(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
$(INSTALL) -m 755 $(BUILD)/upnp-listdevices-shared $(DESTDIR)$(INSTALLDIRBIN)/upnp-listdevices
endif endif
$(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
ifeq (, $(findstring amiga, $(OS))) ifeq (, $(findstring amiga, $(OS)))
@ -330,7 +332,11 @@ $(BUILD)/upnpc-static: $(BUILD)/upnpc.o $(LIBRARY)
$(BUILD)/upnpc-shared: $(BUILD)/upnpc.o $(SHAREDLIBRARY) $(BUILD)/upnpc-shared: $(BUILD)/upnpc.o $(SHAREDLIBRARY)
$(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS) $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS)
$(BUILD)/listdevices: $(BUILD)/listdevices.o $(LIBRARY) $(BUILD)/upnp-listdevices-static: $(BUILD)/listdevices.o $(LIBRARY)
$(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS)
$(BUILD)/upnp-listdevices-shared: $(BUILD)/listdevices.o $(SHAREDLIBRARY)
$(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS)
$(BUILD)/testminixml: $(TESTMINIXMLOBJS) $(BUILD)/testminixml: $(TESTMINIXMLOBJS)