Same again for 2.5.24
The following gets make doc-books to succeed for me : the other doc-{ps,pdf,html}
targets still fail, either due to non-zero return codes from userspace tools ( db2xxx
),
or because of a bug in pp_makefile5.c ( do_dependencies ) which makes it always
see non-zero return codes ( a quick test using
$(objfile /scripts/pp_makefile5) --target=$@ --type=USER --command="/bin/true"
suggests the latter, and I can manually build the targets OK ).
BTW, to maintain consistency with existing kbuild practice, the target and command
should work like --target=$(notdir $@) --command="cd $(objdir) && db2xxx $(notdir $<)"
Jak
--- linux-2.5-src/Documentation/DocBook/Makefile.in Sun Jun 30 11:30:24 2002
+++ 2.5-src010/Documentation/DocBook/Makefile.in Thu Jul 4 13:07:40 2002
@@ -16,8 +16,8 @@
BOOKS := wanbook z8530book mcabook videobook \
kernel-api parportbook kernel-hacking \
kernel-locking via-audio mousedrivers sis900 \
- deviceiobook.sgml procfs-guide.sgml tulip-user.sgml \
- writing_usb_driver.sgml scsidrivers.sgml
+ deviceiobook procfs-guide tulip-user \
+ writing_usb_driver scsidrivers
BOOKS := $(patsubst %,$(objfile %.sgml),$(BOOKS))
PS := $(patsubst %.sgml, %.ps, $(BOOKS))
@@ -29,7 +29,7 @@
$(BOOKS): $(objfile /scripts/docproc) \
$(srcfile /scripts/docgen) \
- $(srcfile /scripts/gen-all-syms) \
+ $(objfile /scripts/gen-all-syms) \
$(objfile /scripts/kernel-doc)
.PHONY: doc-books doc-ps doc-pdf doc-html
@@ -156,8 +156,8 @@
$(srcfile_base /drivers/net/8390.c) \
$(srcfile_base /drivers/char/serial.c) \
$(srcfile_base /drivers/pci/pci.c) \
- $(srcfile_base drivers/hotplug/pci_hotplug_core.c) \
- $(srcfile_base drivers/hotplug/pci_hotplug_util.c) \
+ $(srcfile_base /drivers/hotplug/pci_hotplug_core.c) \
+ $(srcfile_base /drivers/hotplug/pci_hotplug_util.c) \
$(srcfile_base /drivers/block/ll_rw_blk.c) \
$(srcfile_base /sound/sound_core.c) \
$(srcfile_base /sound/sound_firmware.c) \
@@ -168,7 +168,6 @@
$(srcfile_base /drivers/usb/core/message.c) \
$(srcfile_base /drivers/usb/core/config.c) \
$(srcfile_base /drivers/usb/core/usb.c) \
- $(srcfile_base /drivers/usb/usb.c) \
$(srcfile_base /drivers/video/fbmem.c) \
$(srcfile_base /drivers/video/fbcmap.c) \
$(srcfile_base /drivers/video/fbcon.c) \
@@ -226,18 +225,18 @@
@(which db2ps > /dev/null 2>&1) || \
(echo "*** You need to install DocBook stylesheets ***"; \
exit 1)
- $(KBUILD_QUIET)$(objfile /scripts/pp_makefile5) --target=$@
--usercommand="db2ps $<"
+ $(KBUILD_QUIET)$(objfile /scripts/pp_makefile5) --target=$@ --type=USER
+--command="db2ps $<"
$(objfile %.pdf) : $(objfile %.sgml)
@(which db2pdf > /dev/null 2>&1) || \
(echo "*** You need to install DocBook stylesheets ***"; \
exit 1)
- $(KBUILD_QUIET)$(objfile /scripts/pp_makefile5) --target=$@
--usercommand="db2pdf $<"
+ $(KBUILD_QUIET)$(objfile /scripts/pp_makefile5) --target=$@ --type=USER
+--command="db2pdf $<"
$(objfile %): $(objfile %.sgml)
@(which db2html > /dev/null 2>&1) || \
(echo "*** You need to install DocBook stylesheets ***"; \
exit 1)
$(KBUILD_QUIET)rm -rf $@
- $(KBUILD_QUIET)$(objfile /scripts/pp_makefile5) --target=$@
--usercommand="db2html $<"
+ $(KBUILD_QUIET)$(objfile /scripts/pp_makefile5) --target=$@ --type=USER
+--command="db2html $<"
$(KBUILD_QUIET)if [ ! -z "$(PNG-$@)" ]; then cp -fa $(PNG-$@) $@; fi
--- linux-2.5-src/scripts/Makefile.in Sun Jun 30 11:30:24 2002
+++ 2.5-src010/scripts/Makefile.in Thu Jul 4 11:44:54 2002
@@ -12,9 +12,16 @@
# scripts/kernel-doc as a relative path. So copy into the object area. $empty
# is a kludge to avoid issrcfile processing, remove empty when issrcfile is no
# longer required.
+# FIXME: is $empty still required ?
empty :=
user_command(kernel-doc
- ($(srcfile_base kernel-doc$empty))
+ ($(srcfile_base kernel-doc$(empty)))
+ (cp -fa $< $@)
+ ()
+ )
+# gen-all-syms is also required
+user_command(gen-all-syms
+ ($(srcfile_base gen-all-syms))
(cp -fa $< $@)
()
)
###
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Caffeinated soap. No kidding.
http://thinkgeek.com/sf
_______________________________________________
kbuild-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/kbuild-devel
