xserver: Branch 'master' - 2 commits
Tiago Vignatti
vignatti at kemper.freedesktop.org
Wed Jul 4 22:28:50 PDT 2007
configure.ac | 7 ++-----
hw/kdrive/ati/Makefile.am | 4 +++-
hw/kdrive/chips/Makefile.am | 4 +++-
hw/kdrive/ephyr/Makefile.am | 5 ++++-
hw/kdrive/epson/Makefile.am | 4 +++-
hw/kdrive/fake/Makefile.am | 4 ++++
hw/kdrive/fbdev/Makefile.am | 4 +++-
hw/kdrive/i810/Makefile.am | 4 +++-
hw/kdrive/mach64/Makefile.am | 4 +++-
hw/kdrive/mga/Makefile.am | 4 +++-
hw/kdrive/neomagic/Makefile.am | 4 +++-
hw/kdrive/nvidia/Makefile.am | 4 +++-
hw/kdrive/pm2/Makefile.am | 4 +++-
hw/kdrive/r128/Makefile.am | 4 +++-
hw/kdrive/sdl/Makefile.am | 2 ++
hw/kdrive/sis300/Makefile.am | 4 ++++
hw/kdrive/smi/Makefile.am | 4 +++-
hw/kdrive/vesa/Makefile.am | 4 +++-
hw/kdrive/via/Makefile.am | 4 +++-
19 files changed, 58 insertions(+), 20 deletions(-)
New commits:
diff-tree a92dc6b5295e4f352115fed2856169929819863f (from 41b5155c8be75c4e171c0f64616cc09598b8ec54)
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Thu Jul 5 02:28:14 2007 -0300
Remove redundant linking in kdrive. Fix configure.ac variable name and clean
it up a little.
diff --git a/configure.ac b/configure.ac
index 5ee9ad7..760db87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1721,7 +1721,7 @@ _AM_DEPENDENCIES([OBJC])
dnl kdrive DDX
-XEYPHR_LIBS=
+XEPHYR_LIBS=
XEPHYR_INCS=
XSDL_LIBS=
XSDL_INCS=
@@ -1786,7 +1786,7 @@ if test "$KDRIVE" = yes; then
# Xephyr needs nanosleep() which is in librt on Solaris
AC_CHECK_FUNC([nanosleep], [],
AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
- XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
+
if test "x$TSLIB" = xyes; then
PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
if test "x$HAVE_TSLIB" = xno; then
@@ -1803,9 +1803,6 @@ if test "$KDRIVE" = yes; then
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
- # dix os fb mi extension glx (NOTYET) damage shadow xpstubs
- #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \
- # $MIEXT_SHADOW_LIB $XPSTUBS_LIB"
KDRIVE_PURE_LIBS="$FB_LIB $MI_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 $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
case $host_os in
diff-tree 41b5155c8be75c4e171c0f64616cc09598b8ec54 (from 16e429bcbf2f62cfc58162ab2857afb7376dda41)
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Thu Jul 5 01:57:41 2007 -0300
For each kdrive server put a dependencie on its own libraries.
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index d7996fc..9e1fc7f 100644
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@@ -63,7 +63,9 @@ Xati_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xati_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xati_DEPENDENCIES = \
+ libati.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am
index 4bb5713..8188a8e 100644
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@@ -25,7 +25,9 @@ Xchips_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xchips_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xchips_DEPENDENCIES = \
+ libchips.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 11fe454..cc3019f 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -30,7 +30,10 @@ Xephyr_LDADD = \
@KDRIVE_LIBS@ \
@XEPHYR_LIBS@
-Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xephyr_DEPENDENCIES = \
+ libxephyr.a \
+ libxephyr-hostx.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am
index 0ef8e45..cd20571 100644
--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@@ -25,7 +25,9 @@ Xepson_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xepson_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xepson_DEPENDENCIES = \
+ libepson.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 69fdf59..09d179e 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -21,5 +21,9 @@ Xfake_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
+Xfake_DEPENDENCIES = \
+ libfake.a \
+ @KDRIVE_LOCAL_LIBS@
+
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index f7a94e1..ea2aff3 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -19,7 +19,9 @@ Xfbdev_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xfbdev_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xfbdev_DEPENDENCIES = \
+ libfbdev.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index b7aacd6..e3a702d 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -28,7 +28,9 @@ Xi810_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xi810_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xi810_DEPENDENCIES = \
+ libi810.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index 1f8a3c3..5379390 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -32,7 +32,9 @@ Xmach64_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xmach64_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xmach64_DEPENDENCIES = \
+ libmach64.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index 72bd539..0598651 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -27,7 +27,9 @@ Xmga_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xmga_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xmga_DEPENDENCIES = \
+ libmga.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index 770ada2..4686547 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -39,7 +39,9 @@ Xneomagic_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xneomagic_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xneomagic_DEPENDENCIES = \
+ libneomagic.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 3aec124..8ebfec9 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -28,7 +28,9 @@ Xnvidia_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xnvidia_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xnvidia_DEPENDENCIES = \
+ libnvidia.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am
index 6223abb..b2b48ba 100644
--- a/hw/kdrive/pm2/Makefile.am
+++ b/hw/kdrive/pm2/Makefile.am
@@ -26,7 +26,9 @@ Xpm2_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xpm2_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xpm2_DEPENDENCIES = \
+ libpm2.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index 6b2ca85..609e0f5 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -25,7 +25,9 @@ Xr128_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xr128_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xr128_DEPENDENCIES = \
+ libr128.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
index fa09640..e742499 100644
--- a/hw/kdrive/sdl/Makefile.am
+++ b/hw/kdrive/sdl/Makefile.am
@@ -12,5 +12,7 @@ Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \
@XSERVER_LIBS@ \
@XSDL_LIBS@
+Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am
index 62f3266..3e8ce90 100644
--- a/hw/kdrive/sis300/Makefile.am
+++ b/hw/kdrive/sis300/Makefile.am
@@ -39,5 +39,9 @@ Xsis_LDADD = \
@KDRIVE_LIBS@ \
$(TSLIB_FLAG)
+Xsis_DEPENDENCIES = \
+ libsis.a \
+ @KDRIVE_LOCAL_LIBS@
+
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index d6a143b..6cee316 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -30,7 +30,9 @@ Xsmi_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xsmi_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xsmi_DEPENDENCIES = \
+ libsmi.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index 934b995..d58f20f 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -24,7 +24,9 @@ Xvesa_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xvesa_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xvesa_DEPENDENCIES = \
+ libvesa.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am
index caf3f5f..8c8189d 100644
--- a/hw/kdrive/via/Makefile.am
+++ b/hw/kdrive/via/Makefile.am
@@ -26,7 +26,9 @@ Xvia_LDADD = \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
-Xvia_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xvia_DEPENDENCIES = \
+ libvia.a \
+ @KDRIVE_LOCAL_LIBS@
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
More information about the xorg-commit
mailing list