xserver: Branch 'master'

Dodji Seketeli dodji at kemper.freedesktop.org
Wed Sep 5 08:47:13 PDT 2007 

 configure.ac                 |    8 +++++---
 hw/kdrive/ati/Makefile.am    |    3 +--
 hw/kdrive/chips/Makefile.am  |    3 +--
 hw/kdrive/epson/Makefile.am  |    3 +--
 hw/kdrive/fbdev/Makefile.am  |    3 +--
 hw/kdrive/i810/Makefile.am   |    3 +--
 hw/kdrive/mach64/Makefile.am |    3 +--
 hw/kdrive/mga/Makefile.am    |    3 +--
 hw/kdrive/nvidia/Makefile.am |    3 +--
 hw/kdrive/pm2/Makefile.am    |    3 +--
 hw/kdrive/r128/Makefile.am   |    3 +--
 hw/kdrive/sdl/Makefile.am    |    3 +--
 hw/kdrive/smi/Makefile.am    |    3 +--
 hw/kdrive/vesa/Makefile.am   |    3 +--
 hw/kdrive/via/Makefile.am    |    3 +--
 15 files changed, 19 insertions(+), 31 deletions(-)

New commits:
diff-tree 6c89d1237c4fdce961b30a8eaee964af5d56565e (from 28e48cd8e6e4c412a49d7177daad6d3c93c28e08)
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Wed Sep 5 17:46:49 2007 +0200

    Kdrive: unbreak kdrive linking
    
            * configure.ac: re-sort Kdrive libs so that symbols get properly resolved.
              Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS,
              and some libs orders are not correct. So I made sure Kdrive servers don't have
              to link against $KDRIVE_LIBS  *and* $XSERVER_LIBS. They just have to link
              against $KDRIVE_LIBS now.
            * hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac

diff --git a/configure.ac b/configure.ac
index a5bdfb4..c909c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1868,7 +1868,7 @@ if test "$KDRIVE" = yes; then
     
     KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
 
-    KDRIVE_PURE_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
+    KDRIVE_PURE_LIBS="$FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
     case $host_os in
 	*linux*)
@@ -1877,8 +1877,10 @@ if test "$KDRIVE" = yes; then
 	    ;;
     esac
     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
-    KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-    KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS"
+    KDRIVE_LOCAL_LIBS="$TSLIB_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"
+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVERLIBS_LIBS"
 
     # check if we can build Xephyr
     PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index 9e1fc7f..8429250 100644
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@@ -60,8 +60,7 @@ ATI_LIBS =				\
 
 Xati_LDADD = \
 	$(ATI_LIBS)			\
-	@KDRIVE_LIBS@			\
-	@XSERVER_LIBS@
+	@KDRIVE_LIBS@
 
 Xati_DEPENDENCIES =	\
 	libati.a 			\
diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am
index 8188a8e..51b0edf 100644
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@@ -22,8 +22,7 @@ CHIPS_LIBS =					 \
 
 Xchips_LDADD = \
 	$(CHIPS_LIBS)				\
-	@KDRIVE_LIBS@                           \
-	@XSERVER_LIBS@				
+	@KDRIVE_LIBS@
 
 Xchips_DEPENDENCIES = 	\
 	libchips.a 				 \
diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am
index cd20571..2a44014 100644
--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@@ -22,8 +22,7 @@ EPSON_LIBS =					\
 
 Xepson_LDADD = \
 	$(EPSON_LIBS)			       \
-	@KDRIVE_LIBS@                          \
-	@XSERVER_LIBS@				
+	@KDRIVE_LIBS@
 
 Xepson_DEPENDENCIES =	\
 	libepson.a 				\
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index ea2aff3..1ce4833 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -16,8 +16,7 @@ Xfbdev_SOURCES = \
 
 Xfbdev_LDADD = 						\
 	libfbdev.a					\
-	@KDRIVE_LIBS@					\
-	@XSERVER_LIBS@
+	@KDRIVE_LIBS@
 
 Xfbdev_DEPENDENCIES =	\
 	libfbdev.a					\
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index e3a702d..ea02cb6 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -25,8 +25,7 @@ I810_LIBS =						\
 
 Xi810_LDADD = \
 	$(I810_LIBS)					\
-	@KDRIVE_LIBS@                                  \
-	@XSERVER_LIBS@					
+	@KDRIVE_LIBS@
 
 Xi810_DEPENDENCIES =	\
 	libi810.a 					\
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index 5379390..746ffff 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -29,8 +29,7 @@ MACH64_LIBS =						\
 
 Xmach64_LDADD = 					\
 	$(MACH64_LIBS)					\
-	@KDRIVE_LIBS@					\
-	@XSERVER_LIBS@
+	@KDRIVE_LIBS@
 
 Xmach64_DEPENDENCIES =	\
 	libmach64.a 					\
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index 0598651..37bc50c 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -24,8 +24,7 @@ MGA_LIBS =						\
 
 Xmga_LDADD = \
 	$(MGA_LIBS)					\
-	@KDRIVE_LIBS@                                  \
-	@XSERVER_LIBS@
+	@KDRIVE_LIBS@
 
 Xmga_DEPENDENCIES =	\
 	libmga.a 					\
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 8ebfec9..b380e44 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -25,8 +25,7 @@ NVIDIA_LIBS =					\
 
 Xnvidia_LDADD = \
 	$(NVIDIA_LIBS)				\
-	@KDRIVE_LIBS@				\
-	@XSERVER_LIBS@			
+	@KDRIVE_LIBS@
 
 Xnvidia_DEPENDENCIES =	\
 	libnvidia.a 				\
diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am
index b2b48ba..208d031 100644
--- a/hw/kdrive/pm2/Makefile.am
+++ b/hw/kdrive/pm2/Makefile.am
@@ -23,8 +23,7 @@ PM2_LIBS =					\
 
 Xpm2_LDADD = \
 	$(PM2_LIBS)				\
-	@KDRIVE_LIBS@                          \
-	@XSERVER_LIBS@			
+	@KDRIVE_LIBS@
 
 Xpm2_DEPENDENCIES =	\
 	libpm2.a 				\
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index 609e0f5..62c1fcf 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -22,8 +22,7 @@ R128_LIBS =					\
 
 Xr128_LDADD = \
 	$(R128_LIBS)				\
-	@KDRIVE_LIBS@                          \
-	@XSERVER_LIBS@					
+	@KDRIVE_LIBS@
 
 Xr128_DEPENDENCIES =	\
 	libr128.a 				\
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
index e742499..fe9309e 100644
--- a/hw/kdrive/sdl/Makefile.am
+++ b/hw/kdrive/sdl/Makefile.am
@@ -7,9 +7,8 @@ bin_PROGRAMS = Xsdl
 
 Xsdl_SOURCES = sdl.c
 
-Xsdl_LDADD = @KDRIVE_PURE_LIBS@				\
+Xsdl_LDADD = \
 	@KDRIVE_LIBS@                                  \
-	@XSERVER_LIBS@					\
 	@XSDL_LIBS@
 
 Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index 6cee316..a4d6624 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -27,8 +27,7 @@ SMI_LIBS =					\
 
 Xsmi_LDADD = \
 	$(SMI_LIBS)				\
-	@KDRIVE_LIBS@                          \
-	@XSERVER_LIBS@					
+	@KDRIVE_LIBS@
 
 Xsmi_DEPENDENCIES =	\
 	libsmi.a 				\
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index d58f20f..ac50d2b 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -21,8 +21,7 @@ Xvesa_SOURCES = \
 
 Xvesa_LDADD = \
 	libvesa.a 				\
-	@KDRIVE_LIBS@				\
-	@XSERVER_LIBS@
+	@KDRIVE_LIBS@
 
 Xvesa_DEPENDENCIES =	\
 	libvesa.a 				\
diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am
index 8c8189d..249b3f3 100644
--- a/hw/kdrive/via/Makefile.am
+++ b/hw/kdrive/via/Makefile.am
@@ -23,8 +23,7 @@ VIA_LIBS =	\
 
 Xvia_LDADD =						\
 	$(VIA_LIBS)					\
-	@KDRIVE_LIBS@					\
-	@XSERVER_LIBS@
+	@KDRIVE_LIBS@
 
 Xvia_DEPENDENCIES =	\
 	libvia.a	\

More information about the xorg-commit mailing list