Fixed documentation generation

This commit is contained in:
Pierre Pronchery 2012-05-14 23:28:27 +00:00
parent 0d4ef46850
commit 67b2a0b744
3 changed files with 22 additions and 14 deletions

View File

@ -1,5 +1,5 @@
SUBDIRS = gtkdoc SUBDIRS = gtkdoc
TARGETS = gtkdoc/cpp.types gtkdoc/sgml.stamp html/index.html TARGETS = gtkdoc/cpp.types gtkdoc/tmpl.stamp gtkdoc/sgml.stamp gtkdoc/html.stamp
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
RM ?= rm -f RM ?= rm -f
@ -16,19 +16,22 @@ subdirs:
gtkdoc/cpp.types: gtkdoc/cpp.types:
./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/cpp.types" ./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/cpp.types"
gtkdoc/sgml.stamp: gtkdoc/cpp.types gtkdoc/tmpl.stamp: gtkdoc/cpp.types
./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/tmpl.stamp"
gtkdoc/sgml.stamp: gtkdoc/tmpl.stamp
./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/sgml.stamp" ./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/sgml.stamp"
html/index.html: gtkdoc/cpp-docs.xml gtkdoc/sgml.stamp gtkdoc/html.stamp: gtkdoc/cpp-docs.xml gtkdoc/sgml.stamp
./gtkdoc.sh -P "$(PREFIX)" -- "html/index.html" ./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/html.stamp"
clean: clean:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done @for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
$(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(html/index.html_OBJS) $(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
distclean: distclean:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done @for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
$(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(html/index.html_OBJS) $(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
$(RM) -- $(TARGETS) $(RM) -- $(TARGETS)
install: $(TARGETS) install: $(TARGETS)

View File

@ -95,15 +95,15 @@ while [ $# -gt 0 ]; do
#create #create
case "$target" in case "$target" in
html/index.html) gtkdoc/html.stamp)
$MKDIR "html" && $MKDIR "gtkdoc/html" &&
(cd "html" && (cd "gtkdoc/html" &&
$DEBUG $GTKDOC_MKHTML "$MODULE" \ $DEBUG $GTKDOC_MKHTML "$MODULE" \
"../gtkdoc/$MODULE-docs.xml") && "../$MODULE-docs.xml") &&
(cd "gtkdoc" && (cd "gtkdoc" &&
$DEBUG $GTKDOC_FIXXREF \ $DEBUG $GTKDOC_FIXXREF \
--module="$MODULE" \ --module="$MODULE" \
--module-dir="../html" \ --module-dir="html" \
--html-dir="$DATADIR/doc/html/$MODULE") --html-dir="$DATADIR/doc/html/$MODULE")
;; ;;
gtkdoc/sgml.stamp) gtkdoc/sgml.stamp)

View File

@ -1,17 +1,22 @@
subdirs=gtkdoc subdirs=gtkdoc
targets=gtkdoc/cpp.types,gtkdoc/sgml.stamp,html/index.html targets=gtkdoc/cpp.types,gtkdoc/tmpl.stamp,gtkdoc/sgml.stamp,gtkdoc/html.stamp
dist=Makefile,GRAMMAR,gtkdoc.sh dist=Makefile,GRAMMAR,gtkdoc.sh
[gtkdoc/cpp.types] [gtkdoc/cpp.types]
type=script type=script
script=./gtkdoc.sh script=./gtkdoc.sh
[gtkdoc/sgml.stamp] [gtkdoc/tmpl.stamp]
type=script type=script
script=./gtkdoc.sh script=./gtkdoc.sh
depends=gtkdoc/cpp.types depends=gtkdoc/cpp.types
[html/index.html] [gtkdoc/sgml.stamp]
type=script
script=./gtkdoc.sh
depends=gtkdoc/tmpl.stamp
[gtkdoc/html.stamp]
type=script type=script
script=./gtkdoc.sh script=./gtkdoc.sh
depends=gtkdoc/cpp-docs.xml,gtkdoc/sgml.stamp depends=gtkdoc/cpp-docs.xml,gtkdoc/sgml.stamp