diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/upnp/Action.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/Callback.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/ClientInit.cxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/ClientInit.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/Compat.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/ContentDirectoryService.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/Discovery.cxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/Discovery.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/Init.cxx | 6 | ||||
| -rw-r--r-- | src/lib/upnp/UniqueIxml.hxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/ixmlwrap.hxx | 2 |
12 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 52221db74..ecc398d63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -754,6 +754,7 @@ libneighbor_a_SOURCES = \ src/neighbor/NeighborPlugin.hxx libneighbor_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(UPNP_CFLAGS) \ $(SMBCLIENT_CFLAGS) if ENABLE_SMBCLIENT @@ -803,6 +804,8 @@ libdb_plugins_a_SOURCES = \ src/db/plugins/simple/PrefixedLightSong.hxx \ src/db/plugins/simple/SimpleDatabasePlugin.cxx \ src/db/plugins/simple/SimpleDatabasePlugin.hxx +libdb_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(UPNP_CFLAGS) if ENABLE_LIBMPDCLIENT libdb_plugins_a_SOURCES += \ diff --git a/src/lib/upnp/Action.hxx b/src/lib/upnp/Action.hxx index a3aa069e2..70e45bda2 100644 --- a/src/lib/upnp/Action.hxx +++ b/src/lib/upnp/Action.hxx @@ -22,7 +22,7 @@ #include "Compiler.h" -#include <upnp/upnptools.h> +#include <upnptools.h> static inline constexpr unsigned CountNameValuePairs() diff --git a/src/lib/upnp/Callback.hxx b/src/lib/upnp/Callback.hxx index 2f559ab3f..f5cabdd53 100644 --- a/src/lib/upnp/Callback.hxx +++ b/src/lib/upnp/Callback.hxx @@ -20,7 +20,7 @@ #ifndef MPD_UPNP_CALLBACK_HXX #define MPD_UPNP_CALLBACK_HXX -#include <upnp/upnp.h> +#include <upnp.h> /** * A class that is supposed to be used for libupnp asynchronous diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx index fed42a7e0..58f7b67eb 100644 --- a/src/lib/upnp/ClientInit.cxx +++ b/src/lib/upnp/ClientInit.cxx @@ -24,7 +24,7 @@ #include "thread/Mutex.hxx" #include "util/RuntimeError.hxx" -#include <upnp/upnptools.h> +#include <upnptools.h> #include <assert.h> diff --git a/src/lib/upnp/ClientInit.hxx b/src/lib/upnp/ClientInit.hxx index 75f3a8088..de463ec5c 100644 --- a/src/lib/upnp/ClientInit.hxx +++ b/src/lib/upnp/ClientInit.hxx @@ -22,7 +22,7 @@ #include "check.h" -#include <upnp/upnp.h> +#include <upnp.h> void UpnpClientGlobalInit(UpnpClient_Handle &handle); diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx index c9f1cc47f..b4b5bd01b 100644 --- a/src/lib/upnp/Compat.hxx +++ b/src/lib/upnp/Compat.hxx @@ -20,7 +20,7 @@ #ifndef MPD_UPNP_COMPAT_HXX #define MPD_UPNP_COMPAT_HXX -#include <upnp/upnp.h> +#include <upnp.h> #if UPNP_VERSION < 10800 /* emulate the libupnp 1.8 API with older versions */ diff --git a/src/lib/upnp/ContentDirectoryService.hxx b/src/lib/upnp/ContentDirectoryService.hxx index 78d7dffca..ccd0c6d24 100644 --- a/src/lib/upnp/ContentDirectoryService.hxx +++ b/src/lib/upnp/ContentDirectoryService.hxx @@ -22,7 +22,7 @@ #include "Compiler.h" -#include <upnp/upnp.h> +#include <upnp.h> #include <string> #include <list> diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx index 163f03bd6..ed273a073 100644 --- a/src/lib/upnp/Discovery.cxx +++ b/src/lib/upnp/Discovery.cxx @@ -24,7 +24,7 @@ #include "util/ScopeExit.hxx" #include "util/RuntimeError.hxx" -#include <upnp/upnptools.h> +#include <upnptools.h> #include <stdlib.h> #include <string.h> diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx index a768d14c0..14f5c79c0 100644 --- a/src/lib/upnp/Discovery.hxx +++ b/src/lib/upnp/Discovery.hxx @@ -27,7 +27,7 @@ #include "thread/Mutex.hxx" #include "Compiler.h" -#include <upnp/upnp.h> +#include <upnp.h> #include <list> #include <vector> diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx index 807a984ca..ac2167fb8 100644 --- a/src/lib/upnp/Init.cxx +++ b/src/lib/upnp/Init.cxx @@ -22,9 +22,9 @@ #include "thread/Mutex.hxx" #include "util/RuntimeError.hxx" -#include <upnp/upnp.h> -#include <upnp/upnptools.h> -#include <upnp/ixml.h> +#include <upnp.h> +#include <upnptools.h> +#include <ixml.h> #include <assert.h> diff --git a/src/lib/upnp/UniqueIxml.hxx b/src/lib/upnp/UniqueIxml.hxx index 9817ca340..0e1e90242 100644 --- a/src/lib/upnp/UniqueIxml.hxx +++ b/src/lib/upnp/UniqueIxml.hxx @@ -20,7 +20,7 @@ #ifndef MPD_UPNP_UNIQUE_XML_HXX #define MPD_UPNP_UNIQUE_XML_HXX -#include <upnp/ixml.h> +#include <ixml.h> #include <memory> diff --git a/src/lib/upnp/ixmlwrap.hxx b/src/lib/upnp/ixmlwrap.hxx index 0d519a323..34ad3993a 100644 --- a/src/lib/upnp/ixmlwrap.hxx +++ b/src/lib/upnp/ixmlwrap.hxx @@ -17,7 +17,7 @@ #ifndef _IXMLWRAP_H_INCLUDED_ #define _IXMLWRAP_H_INCLUDED_ -#include <upnp/ixml.h> +#include <ixml.h> #include <string> |