On 14-03-22 03:27 PM, Jon TURNEY wrote: > On 19/03/2014 21:29, Gaetan Nadon wrote: >> On 14-03-03 10:08 AM, Jon TURNEY wrote: >>> Build fbcmap_mi.c once, rather than for each DDX, and make it part of libfb >>> or >>> libwfb convenience library. >>> >>> Since 84e8de1271bb11b5b4b9747ae4647f47333a8ab7 we don't have fbcmap.c >>> >>> This is a sort of revert of 7ecc2d526c4ea5db2589644a2fec0daf71df36da >>> >> kdrive fbdev fails because libkdrivestubs is added in configure.ac. >> Consider this change: >> >> diff --git a/configure.ac b/configure.ac >> index 162c0cf..d7a55a4 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -2400,8 +2400,7 @@ if test "$KDRIVE" = yes; then >> fi >> ;; >> esac >> - KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la' >> - KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB" >> + KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB" >> KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB >> $KDRIVE_PURE_LIBS" >> KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB" >> KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS >> $DLOPEN_LIB > Thanks. Squashed this into revised patch attached. > >> It looks like Xnest does not need libfb at all which is set in >> configure.ac. It does not cause any problem, however. > I guess that makes some kind of sense. > >
Reviewed-by: Gaetan Nadon <[email protected]> Feel free to review/scoop [PATCH RESEND xserver] test: create a link to the generated hw/xfree86/sdksyms.c at build time It's also to fix the subdir-objects issue in future automake versions.
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
