test: create a link to the generated hw/xfree86/sdksyms.c at build time
Automake 1.14 gives us warning about source code specified in _SOURCES that comes from directories other than the current one. It suggests to enable the subdir-objects feature which only supports code in sub directories. The test directory needs source from hw/xfree86 which is neither under test nor under a sub directory of test. In 1.14 we get a warning, in 2.0 it will break as it will overwrite the object code in xfree86. The solution in this case is to create a link to hw/xfree86/sdksyms.c at build time. It's just like any other built source file. There are no links created in git. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
58ef01648b
commit
3119aae807
|
@ -4,6 +4,7 @@ input
|
||||||
list
|
list
|
||||||
misc
|
misc
|
||||||
os
|
os
|
||||||
|
sdksyms.c
|
||||||
string
|
string
|
||||||
touch
|
touch
|
||||||
xfree86
|
xfree86
|
||||||
|
|
|
@ -41,7 +41,7 @@ os_LDADD=$(TEST_LDADD)
|
||||||
libxservertest_la_LIBADD = $(XSERVER_LIBS)
|
libxservertest_la_LIBADD = $(XSERVER_LIBS)
|
||||||
if XORG
|
if XORG
|
||||||
|
|
||||||
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
|
nodist_libxservertest_la_SOURCES = sdksyms.c
|
||||||
libxservertest_la_LIBADD += \
|
libxservertest_la_LIBADD += \
|
||||||
$(top_builddir)/hw/xfree86/loader/libloader.la \
|
$(top_builddir)/hw/xfree86/loader/libloader.la \
|
||||||
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
|
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
|
||||||
|
@ -55,6 +55,12 @@ libxservertest_la_LIBADD += \
|
||||||
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
|
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
|
||||||
@XORG_LIBS@
|
@XORG_LIBS@
|
||||||
|
|
||||||
|
BUILT_SOURCES = sdksyms.c
|
||||||
|
CLEANFILES = sdksyms.c
|
||||||
|
|
||||||
|
sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c
|
||||||
|
$(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c
|
||||||
|
|
||||||
if DRI
|
if DRI
|
||||||
libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la
|
libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue