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.

5 files changed, 25 insertions, 25 deletions

diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 9380e4d0a..ec6f4450a 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -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@
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 76ed9fc8b..8b93e9e2f 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -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:
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index cb1292802..5d0ca3f31 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -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)
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index 6380bd5ab..ee23d3a41 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 792f64a4d..f4424dcc0 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -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