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

Moved upnp_tv_ctrlpt and upnp_tv_device executables from folder

Browse Source 
upnp to folder upnp/sample. Moved folder upnp/sample/tvdevice/web
to folder upnp/sample/web. This way, if someone compiles the
tarball and executes upnp_tv_device from its creation directory,
there will be no error -108 for not finding directory web.

Also changed svnignore in the process.


git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@183 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2007-05-11 05:00:43 +00:00
parent b82c9c6009
commit 3fa207984a
10 changed files with 202 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -9,6 +9,13 @@ Version 1.4.7
2007-05-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net> 2007-05-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* Added inttypes.h as a header requirement in configure.ac. * Added inttypes.h as a header requirement in configure.ac.
2007-05-11 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* Moved upnp_tv_ctrlpt and upnp_tv_device executables from folder
upnp to folder upnp/sample. Moved folder upnp/sample/tvdevice/web
to folder upnp/sample/web. This way, if someone compiles the
tarball and executes upnp_tv_device from its creation directory,
there will be no error -108 for not finding directory web.
************************************************************************* *************************************************************************
Version 1.4.6 Version 1.4.6
************************************************************************* *************************************************************************

10
Makefile.am
View File

@ -1,4 +1,3 @@
# $Id: Makefile.am,v 1.5 2006/04/29 20:12:50 r3mi Exp $
# #
# Top-level "Makefile.am" for libupnp # Top-level "Makefile.am" for libupnp
# #
@ -9,7 +8,11 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-samples DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-samples
SUBDIRS = ixml threadutil upnp docs/dist SUBDIRS = \
ixml \
threadutil \
upnp \
docs/dist
EXTRA_DIST = \ EXTRA_DIST = \
@ -31,11 +34,12 @@ EXTRA_DIST = \
pkgconfigexecdir = $(libdir)/pkgconfig pkgconfigexecdir = $(libdir)/pkgconfig
pkgconfigexec_DATA = libupnp.pc pkgconfigexec_DATA = libupnp.pc
$(pkgconfigexec_DATA): config.status $(pkgconfigexec_DATA): config.status
if WITH_DOCUMENTATION if WITH_DOCUMENTATION
doc_DATA = LICENSE README NEWS TODO THANKS doc_DATA = LICENSE README NEWS TODO THANKS
endif endif

2
configure.ac
View File

@ -1,5 +1,4 @@
# -*- Autoconf -*- # -*- Autoconf -*-
# $Id: configure.ac,v 1.11 2006/04/09 13:59:44 r3mi Exp $
# #
# Top-level configure.ac file for libupnp # Top-level configure.ac file for libupnp
# #
@ -261,6 +260,7 @@ AC_CONFIG_FILES([
threadutil/Makefile threadutil/Makefile
upnp/Makefile upnp/Makefile
upnp/doc/Makefile upnp/doc/Makefile
upnp/sample/Makefile
docs/dist/Makefile docs/dist/Makefile
libupnp.pc libupnp.pc
]) ])

9
svnignore
View File

@ -1,5 +1,14 @@
.deps .deps
.dirstamp .dirstamp
.libs .libs
.*.swp
*~
Makefile Makefile
Makefile.in Makefile.in
aclocal.m4
autoconfig.h*
autom4te.cache
config*
libtool
libupnp.pc
stamp-h*

224
upnp/Makefile.am
View File

@ -1,163 +1,153 @@
# $Id: Makefile.am,v 1.10 2006/04/08 15:22:22 r3mi Exp $
# #
# "Makefile.am" for "libupnp/upnp" # "Makefile.am" for "libupnp/upnp"
# #
# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net> # Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
# #
SUBDIRS = doc SUBDIRS = doc . sample
AM_CPPFLAGS = -I$(srcdir)/inc \ AM_CPPFLAGS = \
-I$(top_srcdir)/threadutil/inc \ -I$(srcdir)/inc \
-I$(top_srcdir)/ixml/inc -I$(top_srcdir)/threadutil/inc \
-I$(top_srcdir)/ixml/inc
AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(PTHREAD_LIBS) AM_LDFLAGS = $(PTHREAD_LIBS)
LDADD = libupnp.la \ LDADD = \
$(top_builddir)/threadutil/libthreadutil.la \ libupnp.la \
$(top_builddir)/ixml/libixml.la $(top_builddir)/threadutil/libthreadutil.la \
$(top_builddir)/ixml/libixml.la
upnpincludedir = $(includedir)/upnp upnpincludedir = $(includedir)/upnp
upnpinclude_HEADERS = inc/upnp.h upnpinclude_HEADERS = inc/upnp.h
nodist_upnpinclude_HEADERS = inc/upnpconfig.h nodist_upnpinclude_HEADERS = inc/upnpconfig.h
if ENABLE_TOOLS if ENABLE_TOOLS
upnpinclude_HEADERS += inc/upnptools.h upnpinclude_HEADERS += inc/upnptools.h
endif endif
if ENABLE_DEBUG if ENABLE_DEBUG
upnpinclude_HEADERS += inc/upnpdebug.h upnpinclude_HEADERS += inc/upnpdebug.h
endif endif
lib_LTLIBRARIES = libupnp.la
libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc lib_LTLIBRARIES = libupnp.la
libupnp_la_LDFLAGS = -version-info $(LT_VERSION_UPNP) \
-export-symbols-regex '^Upnp.*' \
$(top_builddir)/threadutil/libthreadutil.la \
$(top_builddir)/ixml/libixml.la
libupnp_la_SOURCES = \ libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc
src/inc/config.h \
src/inc/client_table.h src/inc/global.h \ libupnp_la_LDFLAGS = \
src/inc/md5.h src/inc/ssdplib.h \ -version-info $(LT_VERSION_UPNP) \
src/inc/unixutil.h src/inc/urlconfig.h \ -export-symbols-regex '^Upnp.*' \
src/inc/gmtdate.h src/inc/membuffer.h \ $(top_builddir)/threadutil/libthreadutil.la \
src/inc/server.h src/inc/statcodes.h \ $(top_builddir)/ixml/libixml.la
src/inc/upnpapi.h src/inc/utilall.h \
src/inc/gena_ctrlpt.h src/inc/http_client.h \ libupnp_la_SOURCES = \
src/inc/miniserver.h src/inc/service_table.h \ src/inc/config.h \
src/inc/statuscodes.h src/inc/upnpclosesocket.h \ src/inc/client_table.h \
src/inc/util.h src/inc/gena_device.h \ src/inc/gena.h \
src/inc/httpparser.h src/inc/netall.h \ src/inc/gena_ctrlpt.h \
src/inc/soaplib.h src/inc/strintmap.h \ src/inc/gena_device.h \
src/inc/upnp_timeout.h src/inc/uuid.h \ src/inc/global.h \
src/inc/gena.h src/inc/httpreadwrite.h \ src/inc/gmtdate.h \
src/inc/parsetools.h src/inc/sock.h \ src/inc/http_client.h \
src/inc/sysdep.h src/inc/uri.h \ src/inc/httpparser.h \
src/inc/webserver.h src/inc/httpreadwrite.h \
src/inc/md5.h \
src/inc/membuffer.h \
src/inc/miniserver.h \
src/inc/netall.h \
src/inc/parsetools.h \
src/inc/server.h \
src/inc/service_table.h \
src/inc/soaplib.h \
src/inc/sock.h \
src/inc/statcodes.h \
src/inc/statuscodes.h \
src/inc/strintmap.h \
src/inc/ssdplib.h \
src/inc/sysdep.h \
src/inc/unixutil.h \
src/inc/upnpapi.h \
src/inc/upnpclosesocket.h \
src/inc/upnp_timeout.h \
src/inc/uri.h \
src/inc/urlconfig.h \
src/inc/util.h \
src/inc/utilall.h \
src/inc/uuid.h \
src/inc/webserver.h
# ssdp # ssdp
libupnp_la_SOURCES += src/ssdp/ssdp_device.c src/ssdp/ssdp_ctrlpt.c \ libupnp_la_SOURCES += \
src/ssdp/ssdp_server.c src/ssdp/ssdp_device.c \
src/ssdp/ssdp_ctrlpt.c \
src/ssdp/ssdp_server.c
# soap # soap
libupnp_la_SOURCES += src/soap/soap_device.c src/soap/soap_ctrlpt.c \ libupnp_la_SOURCES += \
src/soap/soap_common.c src/soap/soap_device.c \
src/soap/soap_ctrlpt.c \
src/soap/soap_common.c
# genlib # genlib
libupnp_la_SOURCES += \ libupnp_la_SOURCES += \
src/genlib/miniserver/miniserver.c \ src/genlib/miniserver/miniserver.c \
src/genlib/service_table/service_table.c \ src/genlib/service_table/service_table.c \
src/genlib/util/membuffer.c \ src/genlib/util/membuffer.c \
src/genlib/util/strintmap.c \ src/genlib/util/strintmap.c \
src/genlib/util/upnp_timeout.c \ src/genlib/util/upnp_timeout.c \
src/genlib/util/util.c \ src/genlib/util/util.c \
src/genlib/client_table/client_table.c \ src/genlib/client_table/client_table.c \
src/genlib/net/sock.c \ src/genlib/net/sock.c \
src/genlib/net/http/httpparser.c \ src/genlib/net/http/httpparser.c \
src/genlib/net/http/httpreadwrite.c \ src/genlib/net/http/httpreadwrite.c \
src/genlib/net/http/statcodes.c \ src/genlib/net/http/statcodes.c \
src/genlib/net/http/webserver.c \ src/genlib/net/http/webserver.c \
src/genlib/net/http/parsetools.c \ src/genlib/net/http/parsetools.c \
src/genlib/net/uri/uri.c src/genlib/net/uri/uri.c
# gena # gena
libupnp_la_SOURCES += src/gena/gena_device.c src/gena/gena_ctrlpt.c \ libupnp_la_SOURCES += \
src/gena/gena_callback2.c src/gena/gena_device.c \
src/gena/gena_ctrlpt.c \
src/gena/gena_callback2.c
# api # api
libupnp_la_SOURCES += src/api/upnpapi.c libupnp_la_SOURCES += src/api/upnpapi.c
if ENABLE_TOOLS if ENABLE_TOOLS
libupnp_la_SOURCES += src/api/upnptools.c libupnp_la_SOURCES += src/api/upnptools.c
endif endif
if ENABLE_DEBUG if ENABLE_DEBUG
libupnp_la_SOURCES += src/api/upnpdebug.c libupnp_la_SOURCES += src/api/upnpdebug.c
endif endif
# uuid # uuid
libupnp_la_SOURCES += src/uuid/md5.c src/uuid/sysdep.c src/uuid/uuid.c libupnp_la_SOURCES += \
src/uuid/md5.c \
src/uuid/sysdep.c \
src/uuid/uuid.c
# urlconfig # urlconfig
libupnp_la_SOURCES += src/urlconfig/urlconfig.c libupnp_la_SOURCES += src/urlconfig/urlconfig.c
# samples
noinst_PROGRAMS =
if ENABLE_SAMPLES
if ENABLE_CLIENT
noinst_PROGRAMS += upnp_tv_ctrlpt
upnp_tv_ctrlpt_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(srcdir)/sample/common/ \
-I$(srcdir)/sample/tvctrlpt
endif
if ENABLE_DEVICE
noinst_PROGRAMS += upnp_tv_device
upnp_tv_device_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(srcdir)/sample/common/ \
-I$(srcdir)/sample/tvdevice
endif
endif
upnp_tv_device_SOURCES = \
sample/common/sample_util.c \
sample/common/sample_util.h \
sample/tvdevice/upnp_tv_device.c \
sample/tvdevice/upnp_tv_device.h \
sample/tvdevice/linux/upnp_tv_device_main.c
upnp_tv_ctrlpt_SOURCES = \
sample/common/sample_util.c \
sample/common/sample_util.h \
sample/tvctrlpt/upnp_tv_ctrlpt.c \
sample/tvctrlpt/upnp_tv_ctrlpt.h \
sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
if WITH_DOCUMENTATION
examplesdir = $(docdir)/examples
examples_DATA = $(upnp_tv_ctrlpt_SOURCES) $(upnp_tv_device_SOURCES)
endif
# check / distcheck tests # check / distcheck tests
check_PROGRAMS = test_init check_PROGRAMS = test_init
TESTS = test_init TESTS = test_init
test_init_SOURCES = test/test_init.c
test_init_SOURCES = test/test_init.c
EXTRA_DIST = LICENSE \ EXTRA_DIST = \
sample/tvdevice/web/tvcontrolSCPD.xml \ LICENSE \
sample/tvdevice/web/tvdevicedesc.xml \ src/inc/inet_pton.h \
sample/tvdevice/web/tvdevicepres.html \ src/inet_pton.c \
sample/tvdevice/web/tvpictureSCPD.xml \ src/win_dll.c
src/inc/inet_pton.h \
src/inet_pton.c \
src/win_dll.c
CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
CLEANFILES = \
IUpnpErrFile.txt \
IUpnpInfoFile.txt

71
upnp/sample/Makefile.am Normal file
View File

@ -0,0 +1,71 @@
#
# "Makefile.am" for "libupnp/upnp/sample"
#
# Copyright (C) 2007 Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
#
AM_CPPFLAGS = \
-I$(top_srcdir)/upnp/inc \
-I$(top_srcdir)/threadutil/inc \
-I$(top_srcdir)/ixml/inc
AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(PTHREAD_LIBS)
LDADD = \
$(top_builddir)/upnp/libupnp.la \
$(top_builddir)/threadutil/libthreadutil.la \
$(top_builddir)/ixml/libixml.la
# samples
noinst_PROGRAMS =
if ENABLE_SAMPLES
if ENABLE_CLIENT
noinst_PROGRAMS += upnp_tv_ctrlpt
upnp_tv_ctrlpt_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(srcdir)/common/ \
-I$(srcdir)/tvctrlpt
endif
if ENABLE_DEVICE
noinst_PROGRAMS += upnp_tv_device
upnp_tv_device_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(srcdir)/common/ \
-I$(srcdir)/tvdevice
endif
endif
upnp_tv_device_SOURCES = \
common/sample_util.c \
common/sample_util.h \
tvdevice/upnp_tv_device.c \
tvdevice/upnp_tv_device.h \
tvdevice/linux/upnp_tv_device_main.c
upnp_tv_ctrlpt_SOURCES = \
common/sample_util.c \
common/sample_util.h \
tvctrlpt/upnp_tv_ctrlpt.c \
tvctrlpt/upnp_tv_ctrlpt.h \
tvctrlpt/linux/upnp_tv_ctrlpt_main.c
if WITH_DOCUMENTATION
examplesdir = $(docdir)/examples
examples_DATA = \
$(upnp_tv_ctrlpt_SOURCES) \
$(upnp_tv_device_SOURCES)
endif
EXTRA_DIST = \
tvdevice/web/tvcontrolSCPD.xml \
tvdevice/web/tvdevicedesc.xml \
tvdevice/web/tvdevicepres.html \
tvdevice/web/tvpictureSCPD.xml

0
upnp/sample/tvdevice/web/tvcontrolSCPD.xml → upnp/sample/web/tvcontrolSCPD.xml
View File

0
upnp/sample/tvdevice/web/tvdevicedesc.xml → upnp/sample/web/tvdevicedesc.xml
View File

0
upnp/sample/tvdevice/web/tvdevicepres.html → upnp/sample/web/tvdevicepres.html
View File

0
upnp/sample/tvdevice/web/tvpictureSCPD.xml → upnp/sample/web/tvpictureSCPD.xml
View File