[PATCH v3 2/3] config: Move Xlib-xcb to its own subdirectory.

Rami Ylimäki rami.ylimaki at vincit.fi
Fri Feb 4 14:21:47 PST 2011


2011/2/4 Gaetan Nadon <memsize at videotron.ca>

You will need to rebase, file has changed since.
>

Sure.


> -SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
> +SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS) . xcb
>
>  Can you explain why libX11 must be built before xcb subdir?
> The commit text says it does not use any symbols from libX11.
>

The dependency removal was the last thing that I did. Of course I then
forgot to fix this line.

 BUILT_SOURCES=ks_tables.h
>  CLEANFILES=ks_tables.h ks_tables_h
> @@ -13,6 +13,7 @@ AM_CPPFLAGS= \
>  	-I$(top_srcdir)/include/X11 \
>  	-I$(top_builddir)/include \
>  	-I$(top_builddir)/include/X11 \
> +	-I$(top_srcdir)/src/xcb \
>  	-I$(top_srcdir)/src/xcms \
>  	-I$(top_srcdir)/src/xkb \
>  	-I$(top_srcdir)/src/xlibi18n \
>
>
I noticed that I can get rid of this change by just not moving the Xxcbint.h
header file under xcb. The makefile under xcb already has a line to find the
header from parent directory into xcb/x11_xcb.c. It seems that leaving
Xxcbint.h where it was makes more sense.

+AM_CPPFLAGS= \
> +	-I$(top_srcdir)/include/X11 \
> +	-I$(top_builddir)/include/X11 \
> +	-I$(top_srcdir)/src \
> +	-D_BSD_SOURCE
>
>  _BSD_SOURCE is not required due to AC_USE_SYSTEM_EXTENSIONS.
> Notice the duplication in the gcc command
>

Ok.


>  +libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
> +libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
>
>  AM_LDFLAGS would do just fine. Now that each target is separated no need
> to use per-target flags
>

Ack.


>
> Thanks!
>
> Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
>

Thanks, I'll include your corrections and tag to a pull request.

-- Rami
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110205/4ed71ed4/attachment.htm>


More information about the xorg-devel mailing list