The "copying selected object files" message appears as some source files have the same name, and some objects are included twice.
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 => xf86CursorRD.c} | 0 test/Makefile.am | 6 ++---- test/{xkb.c => test_xkb.c} | 0 5 files changed, 7 insertions(+), 6 deletions(-) rename hw/xfree86/ramdac/{xf86Cursor.c => xf86CursorRD.c} (100%) rename test/{xkb.c => test_xkb.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..59e0996ad387 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 + xf86CursorRD.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/xf86CursorRD.c similarity index 100% rename from hw/xfree86/ramdac/xf86Cursor.c rename to hw/xfree86/ramdac/xf86CursorRD.c diff --git a/test/Makefile.am b/test/Makefile.am index 064e1c5b736f..bbf66913a9e7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -57,6 +57,8 @@ if SPECIAL_DTRACE_OBJECTS TEST_LDADD += $(OS_LIB) $(DIX_LIB) endif +xkb_SOURCES = test_xkb.c + xkb_LDADD=$(TEST_LDADD) input_LDADD=$(TEST_LDADD) xtest_LDADD=$(TEST_LDADD) @@ -99,10 +101,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 \ 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 -- 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
