generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix out-of-tree compilation: missing include directive and build

Browse Source 
subdirectory

Out-of-tree builds seem to be currently broken, because ixml and
threadutil files need an include path to include UpnpGlobal.h, and
configure tries to copy files into a directory which it does not create.
The patch fixes both issues.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
(cherry picked from commit c124ae6507)
This commit is contained in:
Jean-Francois Dockes 2015-02-01 22:27:39 -02:00 committed by Marcelo Roberto Jimenez
parent e99617fa27
commit 945772d30c
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -362,6 +362,13 @@ Version 1.8.0
Version 1.6.20 Version 1.6.20
******************************************************************************* *******************************************************************************
2015-02-01 Jean-Francois Dockes <medoc@users.sf.net>
Out-of-tree builds seem to be currently broken, because ixml and
threadutil files need an include path to include UpnpGlobal.h, and
configure tries to copy files into a directory which it does not create.
The patch fixes both issues.
2014-01-03 Peng <howtofly(at)gmail.com> 2014-01-03 Peng <howtofly(at)gmail.com>
rewrite soap_device.c rewrite soap_device.c

1
THANKS
View File

@ -38,6 +38,7 @@ exempt of errors.
- Ingo Hofmann - Ingo Hofmann
- Ivan Romanov (ivanromanov) - Ivan Romanov (ivanromanov)
- Jiri Zouhar - Jiri Zouhar
- Jean-Francois Dockes (medoc)
- John Dennis - John Dennis
- Jonathan Casiot (no_dice) - Jonathan Casiot (no_dice)
- Josh Carroll - Josh Carroll

1
configure.ac
View File

@ -718,6 +718,7 @@ AC_OUTPUT
# Files copied for windows compilation. # Files copied for windows compilation.
# #
echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\"" echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\""
test -d build/inc || mkdir -p build/inc
cp autoconfig.h build/inc/autoconfig.h cp autoconfig.h build/inc/autoconfig.h
echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\"" echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\""
cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h

3
ixml/Makefile.am
View File

@ -7,7 +7,8 @@
SUBDIRS = doc SUBDIRS = doc
AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc \
-I$(top_srcdir)/upnp/inc
AM_CFLAGS = AM_CFLAGS =
LDADD = libixml.la LDADD = libixml.la

3
threadutil/Makefile.am
View File

@ -4,7 +4,8 @@
# (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net> # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
# #
AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc \
-I$(top_srcdir)/upnp/inc
if ENABLE_DEBUG if ENABLE_DEBUG
AM_CPPFLAGS += -DDEBUG -DSTATS AM_CPPFLAGS += -DDEBUG -DSTATS