Convert kdrive libraries to libtool convenience libraries.
Also correct a link failure due to unresolved symbols. This is arguably a libtool/ranlib/ld bug, that "may" be corrected by linking all convenience libraries in a single one. But in this case, it was preferred to just add a linker option to Xfake_LDFLAGS, to force linkage of all libraries. This corrects #19725.
This commit is contained in:
Paulo Cesar Pereira de Andrade
parent
b43a4e2d38
commit
f7585d0205
|
|
@ -1809,14 +1809,14 @@ if test "$KDRIVE" = yes; then
|
|||
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
|
||||
|
||||
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
|
||||
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
|
||||
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
|
||||
case $host_os in
|
||||
*linux*)
|
||||
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
|
||||
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
|
||||
KDRIVELINUX=yes
|
||||
;;
|
||||
esac
|
||||
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
|
||||
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
|
||||
KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ INCLUDES = \
|
|||
-I$(top_srcdir)/exa
|
||||
|
||||
if XV
|
||||
LIBXEPHYR_HOSTXV=libxephyr-hostxv.a
|
||||
LIBXEPHYR_HOSTXV=libxephyr-hostxv.la
|
||||
endif
|
||||
|
||||
if DRI
|
||||
LIBXEPHYR_HOSTDRI=libxephyr-hostdri.a
|
||||
LIBXEPHYR_HOSTDRI=libxephyr-hostdri.la
|
||||
endif
|
||||
|
||||
noinst_LIBRARIES = libxephyr-hostx.a $(LIBXEPHYR_HOSTXV) $(LIBXEPHYR_HOSTDRI) libxephyr.a
|
||||
noinst_LTLIBRARIES = libxephyr-hostx.la $(LIBXEPHYR_HOSTXV) $(LIBXEPHYR_HOSTDRI) libxephyr.la
|
||||
|
||||
bin_PROGRAMS = Xephyr
|
||||
|
||||
|
|
@ -47,24 +47,24 @@ XEPHYR_SRCS = \
|
|||
ephyr_draw.c \
|
||||
os.c
|
||||
|
||||
libxephyr_hostx_a_SOURCES = $(HOSTX_SRCS)
|
||||
libxephyr_hostx_la_SOURCES = $(HOSTX_SRCS)
|
||||
|
||||
if XV
|
||||
libxephyr_hostxv_a_SOURCES = $(HOSTVIDEO_SRCS)
|
||||
libxephyr_hostxv_la_SOURCES = $(HOSTVIDEO_SRCS)
|
||||
endif
|
||||
|
||||
if DRI
|
||||
libxephyr_hostdri_a_SOURCES = $(HOSTDRI_SRCS)
|
||||
libxephyr_hostdri_la_SOURCES = $(HOSTDRI_SRCS)
|
||||
endif
|
||||
|
||||
libxephyr_a_SOURCES = $(XEPHYR_SRCS)
|
||||
libxephyr_la_SOURCES = $(XEPHYR_SRCS)
|
||||
|
||||
Xephyr_SOURCES = \
|
||||
ephyrinit.c
|
||||
|
||||
Xephyr_LDADD = \
|
||||
libxephyr.a \
|
||||
libxephyr-hostx.a \
|
||||
libxephyr.la \
|
||||
libxephyr-hostx.la \
|
||||
$(LIBXEPHYR_HOSTXV) \
|
||||
$(LIBXEPHYR_HOSTDRI) \
|
||||
$(top_builddir)/exa/libexa.la \
|
||||
|
|
@ -72,8 +72,8 @@ Xephyr_LDADD = \
|
|||
@XEPHYR_LIBS@
|
||||
|
||||
Xephyr_DEPENDENCIES = \
|
||||
libxephyr.a \
|
||||
libxephyr-hostx.a \
|
||||
libxephyr.la \
|
||||
libxephyr-hostx.la \
|
||||
$(LIBXEPHYR_HOSTXV) \
|
||||
$(LIBXEPHYR_HOSTDRI) \
|
||||
@KDRIVE_LOCAL_LIBS@
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ INCLUDES = \
|
|||
@KDRIVE_INCS@ \
|
||||
@KDRIVE_CFLAGS@
|
||||
|
||||
noinst_LIBRARIES = libfake.a
|
||||
noinst_LTLIBRARIES = libfake.la
|
||||
|
||||
bin_PROGRAMS = Xfake
|
||||
|
||||
libfake_a_SOURCES = \
|
||||
libfake_la_SOURCES = \
|
||||
fake.c \
|
||||
kbd.c \
|
||||
os.c \
|
||||
|
|
@ -17,14 +17,14 @@ Xfake_SOURCES = \
|
|||
fakeinit.c
|
||||
|
||||
Xfake_LDADD = \
|
||||
libfake.a \
|
||||
libfake.la \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
|
||||
Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||||
Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-undefined=InitExtensions
|
||||
|
||||
Xfake_DEPENDENCIES = \
|
||||
libfake.a \
|
||||
libfake.la \
|
||||
@KDRIVE_LOCAL_LIBS@
|
||||
|
||||
relink:
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ INCLUDES = \
|
|||
@KDRIVE_INCS@ \
|
||||
@KDRIVE_CFLAGS@
|
||||
|
||||
noinst_LIBRARIES = libfbdev.a
|
||||
noinst_LTLIBRARIES = libfbdev.la
|
||||
|
||||
libfbdev_a_SOURCES = \
|
||||
libfbdev_la_SOURCES = \
|
||||
fbdev.c \
|
||||
fbdev.h
|
||||
|
||||
|
|
@ -15,11 +15,11 @@ Xfbdev_SOURCES = \
|
|||
fbinit.c
|
||||
|
||||
Xfbdev_LDADD = \
|
||||
libfbdev.a \
|
||||
libfbdev.la \
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xfbdev_DEPENDENCIES = \
|
||||
libfbdev.a \
|
||||
libfbdev.la \
|
||||
$(KDRIVE_PURE_LIBS)
|
||||
|
||||
Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ INCLUDES = \
|
|||
|
||||
AM_CFLAGS = -DHAVE_DIX_CONFIG_H
|
||||
|
||||
noinst_LIBRARIES = liblinux.a
|
||||
noinst_LTLIBRARIES = liblinux.la
|
||||
|
||||
if TSLIB
|
||||
TSLIB_C = tslib.c
|
||||
|
|
@ -19,7 +19,7 @@ KDRIVE_HW_SOURCES = \
|
|||
linux.c
|
||||
endif
|
||||
|
||||
liblinux_a_SOURCES = \
|
||||
liblinux_la_SOURCES = \
|
||||
bus.c \
|
||||
klinux.h \
|
||||
mouse.c \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ INCLUDES = \
|
|||
|
||||
AM_CFLAGS = -DHAVE_DIX_CONFIG_H
|
||||
|
||||
noinst_LIBRARIES = libkdrive.a libkdrivestubs.a
|
||||
noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la
|
||||
|
||||
if KDRIVE_HW
|
||||
KDRIVE_HW_SOURCES = \
|
||||
|
|
@ -18,7 +18,7 @@ KDRIVE_XV_SOURCES = \
|
|||
kxv.h
|
||||
endif
|
||||
|
||||
libkdrive_a_SOURCES = \
|
||||
libkdrive_la_SOURCES = \
|
||||
fourcc.h \
|
||||
kcmap.c \
|
||||
kcurscol.c \
|
||||
|
|
@ -34,5 +34,5 @@ libkdrive_a_SOURCES = \
|
|||
$(KDRIVE_HW_SOURCES) \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
libkdrivestubs_a_SOURCES = \
|
||||
libkdrivestubs_la_SOURCES = \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user