Fixed reference docs make problems:

- Docs did not compile invoking top level make when enabled in configure.

- Docs did not compile in references directory with make all.

- Docs used the old substitution variables.
This commit is contained in:
Romain Chantereay 2004-08-06 13:32:01 +00:00
parent b307a00145
commit ed288aacd6
3 changed files with 15 additions and 11 deletions

View File

@ -7,8 +7,14 @@ endif
if PHP_ENABLED
PHP_SD = php
endif
if GTK_DOC_ENABLED
GTK_DOC_SD = docs
endif
SUBDIRS = lasso docs $(PHP_SD) $(PYTHON_SD) $(JAVA_SD) tests
SUBDIRS = lasso \
$(PHP_SD) $(PYTHON_SD) $(JAVA_SD) \
tests \
$(GTK_DOC_SD)
ABS_BUILDDIR = $(shell pwd)

View File

@ -421,6 +421,10 @@ if test "x$enable_gtk_doc" = "xyes" ; then
PKG_CHECK_MODULES(GTK_DOC, gtk-doc >= $GTK_DOC_MIN_VERSION, enable_gtk_doc="yes",
enable_gtk_doc="no")
fi
dnl Conditional docs sub dir test.
AM_CONDITIONAL([GTK_DOC_ENABLED],[test "x$enable_gtk_doc" = "xyes"])
AC_MSG_RESULT($enable_gtk_doc)
dnl ==========================================================================
dnl check do we have size_t and its size,

View File

@ -24,7 +24,7 @@ DOC_SOURCE_FILES=\
$(shell find $(INCLUDE_DIR) -name '*.h' -print )
# do nothing for all
all:
all: docs
docs: sgml html clean-sources
@ -66,17 +66,11 @@ templates: scan
# CFLAGS and LDFLAGS for compiling scan program.
GTKDOC_CFLAGS = \
@CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXML_CFLAGS@ \
@XMLSEC1_CFLAGS@ \
$(LASSO_CFLAGS) \
-I$(top_srcdir)
GTKDOC_LIBS = \
@LIBS@ \
@GLIB_LIBS@ -lgobject-2.0 \
@LIBXML_LIBS@ \
@XMLSEC1_LIBS@ \
GTKDOC_LIBS = \
$(LASSO_LIBS) \
-L$(top_srcdir)/lasso -llasso
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)