Merge of trunk into branch-1.4.x.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.4.x@127 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez
2007-02-03 19:30:31 +00:00
parent 9e775e662e
commit 8cfa0e488c
29 changed files with 874 additions and 443 deletions

13
docs/dist/Makefile.am vendored
View File

@@ -1,4 +1,7 @@
EXTRA_DIST = ./UPnP_Programming_Guide.pdf \
EXTRA_DIST = \
./UPnP_Programming_Guide.pdf \
./IXML_Programming_Guide.pdf \
./html/upnp/icon1.gif \
./html/upnp/icon2.gif \
@@ -251,9 +254,10 @@ EXTRA_DIST = ./UPnP_Programming_Guide.pdf \
./html/ixml/ixmlCloneDOMString.html \
./html/ixml/ixmlFreeDOMString.html
if WITH_DOCDIR
docsdir = @DOCDIR@
nobase_docs_DATA = ./UPnP_Programming_Guide.pdf \
if WITH_DOCUMENTATION
docsdir = @docdir@
nobase_docs_DATA = \
./UPnP_Programming_Guide.pdf \
./IXML_Programming_Guide.pdf \
./html/upnp/icon1.gif \
./html/upnp/icon2.gif \
@@ -506,3 +510,4 @@ if WITH_DOCDIR
./html/ixml/ixmlCloneDOMString.html \
./html/ixml/ixmlFreeDOMString.html
endif