hw/dmx/config: Link directly with libdmxconfig.a
When building xserver with slibtool (https://dev.midipix.org/cross/slibtool) the build will fail. /usr/bin/ld: cannot find -ldmxconfig This is because xserver creates libdmxconfig.a internally and then links with the linker flag -ldmxconfig. However according to automake documentation the -lfoo linker flags should only be used for external dependencies and all internal libraries should be linked with the libtool archive file (.la) or the static archive (.a) when the former is not available. GNU libtool is far more permissive and happens to silently obscure this issue while slibtool fails because it instead sees '-L./.libs -ldmxconfig'.
This commit is contained in:
parent
2f53d1cf73
commit
2531ee0245
|
@ -38,23 +38,20 @@ AM_CFLAGS = \
|
||||||
|
|
||||||
bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx
|
bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx
|
||||||
|
|
||||||
xdmxconfig_DEPENDENCIES = libdmxconfig.a
|
|
||||||
xdmxconfig_SOURCES = \
|
xdmxconfig_SOURCES = \
|
||||||
xdmxconfig.c \
|
xdmxconfig.c \
|
||||||
$(top_srcdir)/hw/dmx/dmxlog.c \
|
$(top_srcdir)/hw/dmx/dmxlog.c \
|
||||||
Canvas.c \
|
Canvas.c \
|
||||||
Canvas.h \
|
Canvas.h \
|
||||||
CanvasP.h
|
CanvasP.h
|
||||||
xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@
|
xdmxconfig_LDADD = libdmxconfig.a @XDMXCONFIG_DEP_LIBS@
|
||||||
xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@
|
xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@
|
||||||
|
|
||||||
vdltodmx_DEPENDENCIES = libdmxconfig.a
|
|
||||||
vdltodmx_SOURCES = vdltodmx.c
|
vdltodmx_SOURCES = vdltodmx.c
|
||||||
vdltodmx_LDADD = -L. -ldmxconfig
|
vdltodmx_LDADD = libdmxconfig.a
|
||||||
|
|
||||||
dmxtodmx_DEPENDENCIES = libdmxconfig.a
|
|
||||||
dmxtodmx_SOURCES = dmxtodmx.c
|
dmxtodmx_SOURCES = dmxtodmx.c
|
||||||
dmxtodmx_LDADD = -L. -ldmxconfig
|
dmxtodmx_LDADD = libdmxconfig.a
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
test-a.in test-a.out \
|
test-a.in test-a.out \
|
||||||
|
|
Loading…
Reference in New Issue