reworked a bit documentation build system and added detection of inkscape and

xsltproc in configure
This commit is contained in:
Frédéric Péters 2005-02-10 09:48:58 +00:00
parent 4556818cc3
commit 25a54477a0
8 changed files with 71 additions and 12 deletions

View File

@ -13,16 +13,13 @@ endif
if PERL_ENABLED
PERL_SD = perl
endif
if GTK_DOC_ENABLED
GTK_DOC_SD = docs
endif
SUBDIRS = lasso \
$(PHP_SD) $(PYTHON_SD) $(JAVA_SD) $(CSHARP_SD) $(PERL_SD) \
tests \
swig \
win32 \
$(GTK_DOC_SD)
docs
ABS_BUILDDIR = $(shell pwd)

View File

@ -615,10 +615,6 @@ else
fi
AC_SUBST(HTML_DIR)
AC_CHECK_PROGS(REST2HTML, rest2html)
AM_CONDITIONAL(HAVE_REST2HTML, test -n "$ac_cv_prog_REST2HTML")
dnl pkg-config path
AC_ARG_WITH(pkg-config, [ --with-pkg-config=PATH set pkg-config metadata search path.],
@ -641,6 +637,17 @@ fi
dnl Conditional docs sub dir test.
AM_CONDITIONAL([GTK_DOC_ENABLED],[test "x$enable_gtk_doc" = "xyes"])
AC_CHECK_PROGS(REST2HTML, rest2html)
AM_CONDITIONAL(HAVE_REST2HTML, test -n "$ac_cv_prog_REST2HTML")
AC_CHECK_PROGS(XSLTPROC, xsltproc)
AM_CONDITIONAL(HAVE_XSLTPROC, test -n "$ac_cv_prog_XSLTPROC")
AC_CHECK_PROGS(INKSCAPE, inkscape)
AM_CONDITIONAL(HAVE_INKSCAPE, test -n "$ac_cv_prog_INKSCAPE")
dnl Debug
AC_MSG_CHECKING(for debugging)
AC_ARG_ENABLE(debugging, [ --enable-debugging enable debuging messages (no)])

View File

@ -1,4 +1,6 @@
## Process this file with automake to produce Makefile.in
if GTK_DOC_ENABLED
GTK_DOC_SD = reference
endif
SUBDIRS = lasso-book reference
SUBDIRS = lasso-book $(GTK_DOC_SD)

View File

@ -1,4 +1,8 @@
if HAVE_INKSCAPE
if HAVE_XSLTPROC
SUBDIRS = figures
endif
endif
docdir = $(datadir)/doc/lasso

View File

@ -23,11 +23,11 @@ figures_DATA = $(FIGURES_PNG_FILES)
CLEANFILES = $(FIGURES_PNG_FILES) $(FIGURES_SVG_FILES)
%.svg:
xsltproc --stringparam stepno `echo $@ | sed -e 's/[^0-9]//g'` $(srcdir)/step.xsl \
$(XSLTPROC) --stringparam stepno `echo $@ | sed -e 's/[^0-9]//g'` $(srcdir)/step.xsl \
$< > $@
%.png: %.svg
inkscape -d 150 --export-png=$@ $<
$(INKSCAPE) -d 150 --export-png=$@ $<
sso-brws-art-1.svg: sso-brws-art.svg step.xsl

View File

@ -356,3 +356,25 @@ Identifies the two possible profiles for Single Sign-On and Federation.
@Returns:
<!-- ##### FUNCTION lasso_login_set_encryptedResourceId ##### -->
<para>
</para>
@login:
@encryptedResourceId:
@Returns:
<!-- ##### FUNCTION lasso_login_set_resourceId ##### -->
<para>
</para>
@login:
@content:
@Returns:
<!-- # Unused Parameters # -->
@resourceId:

View File

@ -38,6 +38,10 @@ Base class for all ID-FF profiles
@LASSO_REQUEST_TYPE_NAME_REGISTRATION:
@LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING:
@LASSO_REQUEST_TYPE_LECP:
@LASSO_REQUEST_TYPE_DISCO_QUERY:
@LASSO_REQUEST_TYPE_DISCO_MODIFY:
@LASSO_REQUEST_TYPE_DST_QUERY:
@LASSO_REQUEST_TYPE_DST_MODIFY:
<!-- ##### STRUCT LassoProfile ##### -->
<para>

View File

@ -61,6 +61,19 @@ certificates to use, etc.
@Returns:
<!-- ##### FUNCTION lasso_server_add_service ##### -->
<para>
</para>
@server:
@service:
@Returns:
<!-- # Unused Parameters # -->
@service_type:
@service_endpoint:
<!-- ##### FUNCTION lasso_server_destroy ##### -->
<para>
@ -88,3 +101,13 @@ certificates to use, etc.
@Returns:
<!-- ##### FUNCTION lasso_server_get_service ##### -->
<para>
</para>
@server:
@serviceType:
@Returns: