sessreg: Changes to 'master'

Dan Nicholson dbn.lists at gmail.com
Mon Mar 14 08:18:23 PDT 2011


On Mon, Mar 14, 2011 at 7:31 AM, Jon TURNEY <jon.turney at dronecode.org.uk> wrote:
> On 19/01/2011 15:49, Gaetan Nadon wrote:
>>  Makefile.am         |   25 ---------
>>  configure.ac        |    5 +
>>  filenames.sed.c     |   29 -----------
>>  man/Makefile.am     |   22 ++++++++
>>  man/filenames.sed.c |   29 +++++++++++
>>  man/sessreg.man     |  135 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  sessreg.man         |  135 ----------------------------------------------------
>>  7 files changed, 192 insertions(+), 188 deletions(-)
>>
>> New commits:
>> commit 3bb9256b8e3a56b94281ea787c07f080c0a80312
>> Author: Gaetan Nadon <memsize at videotron.ca>
>> Date:   Wed Jan 19 10:06:55 2011 -0500
>>
>>     config: move man pages into their own directory
>>
>>     Use services provided by XORG_MANPAGE_SECTIONS.
>>     Use standard Makefile for man pages.
>
> I can't tell for sure since sessreg has only recently been added to the
> xorg.modules list and thus gets built by tinderbox, but it looks like this
> change broke builddir != srcdir builds, see [1]. (there's also a separate
> cygwin platform issue with WTMPX_FILE I need to look)
>
> Patch attached for your consideration.
>
> [1] http://tinderbox.freedesktop.org/builds/2011-03-13-0008/logs/sessreg/#build

Oh, I think I know the reason. -I$(top_srcdir) would normally be part
of $(INCLUDES). However, since the man page moved to its own
subdirectory, this variable (and others related to C code compilation)
are not set by automake. This is because there are no actual C code
rules in that Makefile.am. When it was in the top directory, it got
these because sessreg.c was getting built there.

I think to be correct you need -I$(top_srcdir) and -I$(top_builddir)
so you get both sessreg.h and config.h (included through sessreg.h).
The alternative is to leave filenames.sed.c in the top directory and
ensure it gets built before descending to the man directory.

--
Dan


More information about the xorg-devel mailing list