On Fri, Dec 30, 2016 at 01:31:00PM +0500, Mihail Konev wrote: > To include two *.o files with same names in an *.a file, libtool has > to first copy and rename one of them. > This is the case with libxservertest.la. > > Avoid it by changing names of source files themselves, > and not double-including libdri3.la and lnx_apm.o. > Slightly speeds up linking of tests, and gets rid of the > "copying object files to avoid basename conflicts" message.
imo this should be a separate patch. One is a straightforward rename, but this one shouldn't be hidden behind a "rename files" subject. Cheers, Peter > Signed-off-by: Mihail Konev <[email protected]> > --- > hw/xfree86/os-support/linux/Makefile.am | 5 ++++- > hw/xfree86/ramdac/Makefile.am | 2 +- > hw/xfree86/ramdac/{xf86Cursor.c => xf86CursorRamDac.c} | 0 > test/Makefile.am | 11 +---------- > test/{xkb.c => test_xkb.c} | 0 > test/{xtest.c => test_xtest.c} | 0 > 6 files changed, 6 insertions(+), 12 deletions(-) > rename hw/xfree86/ramdac/{xf86Cursor.c => xf86CursorRamDac.c} (100%) > rename test/{xkb.c => test_xkb.c} (100%) > rename test/{xtest.c => test_xtest.c} (100%) > > diff --git a/hw/xfree86/os-support/linux/Makefile.am > b/hw/xfree86/os-support/linux/Makefile.am > index d8cb17777a8b..26e40bb935e3 100644 > --- a/hw/xfree86/os-support/linux/Makefile.am > +++ b/hw/xfree86/os-support/linux/Makefile.am > @@ -9,7 +9,10 @@ liblinuxev56_la_SOURCES = lnx_ev56.c > endif > > if LNXACPI > -ACPI_SRCS = lnx_acpi.c lnx_apm.c > +ACPI_SRCS = lnx_acpi.c > +if !LNXAPM > +ACPI_SRCS += lnx_apm.c > +endif > XORG_CFLAGS += -DHAVE_ACPI > endif > > diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am > index a3d77628c944..68951794482d 100644 > --- a/hw/xfree86/ramdac/Makefile.am > +++ b/hw/xfree86/ramdac/Makefile.am > @@ -1,7 +1,7 @@ > noinst_LTLIBRARIES = libramdac.la > > libramdac_la_SOURCES = xf86RamDac.c xf86RamDacCmap.c \ > - xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c > + xf86CursorRamDac.c xf86HWCurs.c IBM.c BT.c TI.c > > sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h > > diff --git a/hw/xfree86/ramdac/xf86Cursor.c > b/hw/xfree86/ramdac/xf86CursorRamDac.c > similarity index 100% > rename from hw/xfree86/ramdac/xf86Cursor.c > rename to hw/xfree86/ramdac/xf86CursorRamDac.c > diff --git a/test/Makefile.am b/test/Makefile.am > index c3850f70ca4a..bbb233f19842 100644 > --- a/test/Makefile.am > +++ b/test/Makefile.am > @@ -20,7 +20,7 @@ endif HAVE_LD_WRAP > if XORG > # Tests that require at least some DDX functions in order to fully link > # For now, requires xf86 ddx, could be adjusted to use another > -tests_SOURCES += xkb.c input.c xtest.c misc.c fixes.c xfree86.c > signal-logging.c touch.c > +tests_SOURCES += test_xkb.c input.c test_xtest.c misc.c fixes.c xfree86.c > signal-logging.c touch.c > if RES > tests_SOURCES += hashtabletest.c > endif > @@ -108,10 +108,6 @@ if DRI2 > libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la > endif > > -if DRI3 > -libxservertest_la_LIBADD += $(top_builddir)/dri3/libdri3.la > -endif > - > else > nodist_libxservertest_la_SOURCES = \ > ddxstubs.c \ > @@ -154,11 +150,6 @@ libxservertest_la_LIBADD += \ > $(top_builddir)/record/librecord.la > endif > > -if DRI3 > -libxservertest_la_LIBADD += \ > - $(top_builddir)/dri3/libdri3.la > -endif > - > if XQUARTZ > libxservertest_la_LIBADD += \ > $(top_builddir)/miext/rootless/librootless.la > diff --git a/test/xkb.c b/test/test_xkb.c > similarity index 100% > rename from test/xkb.c > rename to test/test_xkb.c > diff --git a/test/xtest.c b/test/test_xtest.c > similarity index 100% > rename from test/xtest.c > rename to test/test_xtest.c > -- > 2.9.2 > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
