On 02/17/10 18:31, Randy Dunlap wrote: > On 02/17/10 09:06, Mauro Carvalho Chehab wrote: >> Adds DocBook items for Bayer and two proprietary formats used on gspca. >> >> In the past, a few targets were generated at the Mercurial development >> tree. However, at the beginning of this year, we moved to use -git as >> the primary resource. So, the Makefile logic to autogenerate those >> targets needs to be moved to git as well. >> >> While here, I noticed that DocBook is too verbose to generate the >> htmldocs target. So, make it less verbose, if V=0. >> >> Guennadi Liakhovetski (1): >> V4L/DVB: v4l: document new Bayer and monochrome pixel formats >> >> Mauro Carvalho Chehab (3): >> DocBook/Makefile: Make it less verbose >> DocBook: Add rules to auto-generate some media docbooks >> DocBook/v4l/pixfmt.xml: Add missing formats for gspca cpia1 and >> sn9c2028 drivers > > Hi Mauro, > > Patches 1 & 3 are OK. > > I'm having problems with patch 2/4 when I use O=DOCDIR on the make command > (which I always do). videodev2.h.xml is not being generated, and after > that it goes downhill. > > I will let you know more when I have more info, or you or Guennadi can send > a fixup patch for that. > I'm not making any progress on this. "make O=DOCDIR htmldocs" needs to work, but it does not: Also, $(objtree)/Documentation/DocBook/index.html is no longer being generated after these 4 patches are applied. That needs to be fixed also. I get lots of these: grep: /lnx/src/lnx-2633-rc8-docbook/DOC2/Documentation/DocBook/v4l/vidioc-*.xml: No such file or directory grep: /lnx/src/lnx-2633-rc8-docbook/DOC2/Documentation/DocBook/v4l/vidioc-*.xml: No such file or directory grep: /lnx/src/lnx-2633-rc8-docbook/DOC2/Documentation/DocBook/v4l/vidioc-*.xml: No such file or directory followed by: GEN Documentation/DocBook/media-indices.tmpl GEN Documentation/DocBook/v4l/videodev2.h.xml /bin/bash: line 1: Documentation/DocBook/v4l/videodev2.h.xml: No such file or directory make[2]: *** [Documentation/DocBook/v4l/videodev2.h.xml] Error 1 The patches do seem to be OK if O=dirname is not used... except that the main index.html is still not being generated. > > >> Documentation/DocBook/Makefile | 493 +++++++- >> Documentation/DocBook/dvb/frontend.h.xml | 415 ------ >> Documentation/DocBook/media-entities.tmpl | 383 ------ >> Documentation/DocBook/media-indices.tmpl | 89 -- >> Documentation/DocBook/v4l/pixfmt-srggb10.xml | 90 ++ >> Documentation/DocBook/v4l/pixfmt-srggb8.xml | 67 + >> Documentation/DocBook/v4l/pixfmt-y10.xml | 79 ++ >> Documentation/DocBook/v4l/pixfmt.xml | 18 +- >> Documentation/DocBook/v4l/videodev2.h.xml | 1757 -------------------------- >> 9 files changed, 738 insertions(+), 2653 deletions(-) >> delete mode 100644 Documentation/DocBook/dvb/frontend.h.xml >> delete mode 100644 Documentation/DocBook/media-entities.tmpl >> delete mode 100644 Documentation/DocBook/media-indices.tmpl >> create mode 100644 Documentation/DocBook/v4l/pixfmt-srggb10.xml >> create mode 100644 Documentation/DocBook/v4l/pixfmt-srggb8.xml >> create mode 100644 Documentation/DocBook/v4l/pixfmt-y10.xml >> delete mode 100644 Documentation/DocBook/v4l/videodev2.h.xml >> > > -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
