diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 03:13:28 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 03:13:28 -0200 |
commit | f7585d020593345e7a61b1fe1a517c38da8f6d79 (patch) | |
tree | e089ada181cd39f3eab79b2dc8f731efbd3bd97c /hw/kdrive/ephyr/Makefile.am | |
parent | b43a4e2d38adb9ff16204218f24df93cfd820d1b (diff) |
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.
Diffstat (limited to 'hw/kdrive/ephyr/Makefile.am')
-rw-r--r-- | hw/kdrive/ephyr/Makefile.am | 22 |
1 files changed, 11 insertions, 11 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@ |