Author: locilka Date: Fri Aug 8 14:57:50 2008 New Revision: 49870 URL: http://svn.opensuse.org/viewcvs/yast?rev=49870&view=rev Log: - Re-added support to build libycp documentation in separate files additionally to combined.xml (needed for overall documentation). Modified: trunk/core/libycp/doc/Makefile.am trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/doc/Makefile.am?rev=4... ============================================================================== --- trunk/core/libycp/doc/Makefile.am (original) +++ trunk/core/libycp/doc/Makefile.am Fri Aug 8 14:57:50 2008 @@ -6,7 +6,10 @@ htmldir = $(yastdocdir)/ycp builtin = $(wildcard $(srcdir)/../src/YCPBuiltin*.cc) +builtinxml := $(builtin:%.cc=%.xml) xmlfiles = combined.xml +# needed for building the overall documentation +xmlfilesseparated := $(foreach xml,$(builtinxml),$(notdir $(xml))) htmlfiles = $(wildcard html/*.html html/*/*.html) @@ -15,24 +18,31 @@ html/index.html \ $(htmlfiles) -html/index.html: $(xmlfiles) builtins.xml +html/index.html: $(xmlfilesseparated) $(xmlfiles) builtins.xml XML_CATALOG_FILES=@XML_CATALOG@ $(XSLTPROC) $(XSLTPROC_FLAGS) --xinclude @STYLESHEET_HTML@ builtins.xml YDOC := $(shell pkg-config --variable=ybindir yast2-devtools)/ydoc2 RENT := $(shell pkg-config --variable=ybindir yast2-devtools)/replace_entities + $(xmlfiles) : $(builtin) $(YDOC) -o $@.tmp $^ $(XSLTPROC) --stringparam disambiguate yes $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ $(RENT) $@ rm $@.tmp +$(xmlfilesseparated) : $(builtin) + $(YDOC) -o $@.tmp ../src/$(subst xml,cc,$@) + $(XSLTPROC) $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ + $(RENT) $@ + rm $@.tmp + html/yast2docs.css: html/index.html cp @STYLESHEET_CSS@ html cp -a `pkg-config --variable=yast2dir yast2-devtools`/data/docbook/images html EXTRA_DIST = builtins.xml -CLEANFILES = $(xmlfiles) +CLEANFILES = $(xmlfiles) $(xmlfilesseparated) clean-local: rm -rf html Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?r... ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Aug 8 14:57:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 8 14:56:07 CEST 2008 - locilka@suse.cz + +- Re-added support to build libycp documentation in separate files + additionally to combined.xml (needed for overall documentation). + +------------------------------------------------------------------- Wed Jul 30 15:22:15 CEST 2008 - mvidner@suse.cz - Moved documentation around and adjusted it to conform with -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org