[PATCH 3/5 v4] Show Xserver release/version date in DIX & DDX docs

Alan Coopersmith alan.coopersmith at oracle.com
Wed May 19 08:21:03 PDT 2010


Dan Nicholson wrote:
> On Tue, May 18, 2010 at 3:51 PM, Alan Coopersmith
>> + <!ENTITY % defs SYSTEM "file:///xserver.ent"> %defs;
> 
> Just FYI because I toyed around with this a little more. The file://
> prefix seems to be redundant and just a normal absolute path is fine.
> Also, any directory prefix is fine since the tools will strip down to
> just the basename when searching. So, /X11/doc/xserver.ent or any
> other bogus path would be fine, too.

Thanks for looking into this.   I've changed both .xml files to use:

+ <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs;

to at least give people editing the file a hint as to where in the source
tree it would be.

>>  CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES)
>> +
>> +# All the files we build depend on the entities
>> +$(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent
>> +
>> +$(XML_ENT_DIR)/xserver.ent:
>> +       (cd $(XML_ENT_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F))
> 
> Is $(@F) a gnu makeism? I can't tell, but I don't think so. 

I first learned about it when using Solaris make, and since it also worked
with GNU make, I assumed it was fairly common but didn't check, since GNU
make is currently required to build the Xorg server due to the "sinclude"
usage in the exported interfaces list generation in the module loader.

> Note that
> if you're using this variant to avoid writing "xserver.ent" twice, you
> might as well use $(@D) for the "cd" so you don't have to write
> "$(XML_ENT_DIR)" twice. Just a nitpick, though.

I had originally written it that way in a previous version of the patch,
when the rule was used for both xserver.ent & catalog, and didn't change
it back when the catalog was dropped.

> Once the commit message is cleaned up:
> Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>

http://cgit.freedesktop.org/~alanc/xserver/commit/?id=b92e30c1f7bf6f579a8f19f9cfc1fdbf627277d1

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list