oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/upnp: use include path without upnp/ prefix and honor pkg-config CFLAGS

Browse Source 
If libupnp is installed in a non-standard location we must rely on the
include path provided by $(pkg-config --cflags libupnp). Relative to the
path given from that command no prefix must be used to find the respective
files.
This commit is contained in:
Uwe Kleine-König 2017-10-13 18:14:06 +02:00 committed by Max Kellermann
parent 75d068b7cd
commit 5a11e03725
12 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -754,6 +754,7 @@ libneighbor_a_SOURCES = \
src/neighbor/NeighborPlugin.hxx src/neighbor/NeighborPlugin.hxx
libneighbor_a_CPPFLAGS = $(AM_CPPFLAGS) \ libneighbor_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(UPNP_CFLAGS) \
$(SMBCLIENT_CFLAGS) $(SMBCLIENT_CFLAGS)
if ENABLE_SMBCLIENT if ENABLE_SMBCLIENT
@ -803,6 +804,8 @@ libdb_plugins_a_SOURCES = \
src/db/plugins/simple/PrefixedLightSong.hxx \ src/db/plugins/simple/PrefixedLightSong.hxx \
src/db/plugins/simple/SimpleDatabasePlugin.cxx \ src/db/plugins/simple/SimpleDatabasePlugin.cxx \
src/db/plugins/simple/SimpleDatabasePlugin.hxx src/db/plugins/simple/SimpleDatabasePlugin.hxx
libdb_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(UPNP_CFLAGS)
if ENABLE_LIBMPDCLIENT if ENABLE_LIBMPDCLIENT
libdb_plugins_a_SOURCES += \ libdb_plugins_a_SOURCES += \

2
src/lib/upnp/Action.hxx
View File

@ -22,7 +22,7 @@
#include "Compiler.h" #include "Compiler.h"
#include <upnp/upnptools.h> #include <upnptools.h>
static inline constexpr unsigned static inline constexpr unsigned
CountNameValuePairs() CountNameValuePairs()

2
src/lib/upnp/Callback.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_UPNP_CALLBACK_HXX #ifndef MPD_UPNP_CALLBACK_HXX
#define 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 * A class that is supposed to be used for libupnp asynchronous

2
src/lib/upnp/ClientInit.cxx
View File

@ -24,7 +24,7 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <upnp/upnptools.h> #include <upnptools.h>
#include <assert.h> #include <assert.h>

2
src/lib/upnp/ClientInit.hxx
View File

@ -22,7 +22,7 @@
#include "check.h" #include "check.h"
#include <upnp/upnp.h> #include <upnp.h>
void void
UpnpClientGlobalInit(UpnpClient_Handle &handle); UpnpClientGlobalInit(UpnpClient_Handle &handle);

2
src/lib/upnp/Compat.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_UPNP_COMPAT_HXX #ifndef MPD_UPNP_COMPAT_HXX
#define MPD_UPNP_COMPAT_HXX #define MPD_UPNP_COMPAT_HXX
#include <upnp/upnp.h> #include <upnp.h>
#if UPNP_VERSION < 10800 #if UPNP_VERSION < 10800
/* emulate the libupnp 1.8 API with older versions */ /* emulate the libupnp 1.8 API with older versions */

2
src/lib/upnp/ContentDirectoryService.hxx
View File

@ -22,7 +22,7 @@
#include "Compiler.h" #include "Compiler.h"
#include <upnp/upnp.h> #include <upnp.h>
#include <string> #include <string>
#include <list> #include <list>

2
src/lib/upnp/Discovery.cxx
View File

@ -24,7 +24,7 @@
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <upnp/upnptools.h> #include <upnptools.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/lib/upnp/Discovery.hxx
View File

@ -27,7 +27,7 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <upnp/upnp.h> #include <upnp.h>
#include <list> #include <list>
#include <vector> #include <vector>

6
src/lib/upnp/Init.cxx
View File

@ -22,9 +22,9 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <upnp/upnp.h> #include <upnp.h>
#include <upnp/upnptools.h> #include <upnptools.h>
#include <upnp/ixml.h> #include <ixml.h>
#include <assert.h> #include <assert.h>

2
src/lib/upnp/UniqueIxml.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_UPNP_UNIQUE_XML_HXX #ifndef MPD_UPNP_UNIQUE_XML_HXX
#define MPD_UPNP_UNIQUE_XML_HXX #define MPD_UPNP_UNIQUE_XML_HXX
#include <upnp/ixml.h> #include <ixml.h>
#include <memory> #include <memory>

2
src/lib/upnp/ixmlwrap.hxx
View File

@ -17,7 +17,7 @@
#ifndef _IXMLWRAP_H_INCLUDED_ #ifndef _IXMLWRAP_H_INCLUDED_
#define _IXMLWRAP_H_INCLUDED_ #define _IXMLWRAP_H_INCLUDED_
#include <upnp/ixml.h> #include <ixml.h>
#include <string> #include <string>