[PATCH] xserver -> libshadow linkage
Enrico Weigelt
weigelt at metux.de
Wed May 31 17:29:20 PDT 2006
Hi folks,
this patch removes the variable MIEXT_SHADOW_LIB and instead
links this lib to each Server directly. It makes thinks a little
bit clearer.
cu
--
---------------------------------------------------------------------
Enrico Weigelt == metux IT service - http://www.metux.de/
---------------------------------------------------------------------
Please visit the OpenSource QM Taskforce:
http://wiki.metux.de/public/OpenSource_QM_Taskforce
Patches / Fixes for a lot dozens of packages in dozens of versions:
http://patches.metux.de/
---------------------------------------------------------------------
-------------- next part --------------
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/xgl/Makefile.am xorg-server-1.0.99.902/hw/xgl/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/xgl/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/xgl/Makefile.am Thu Jun 1 00:02:49 2006
@@ -74,6 +74,7 @@
Xgl_LDADD = \
libxgl.a \
$(XORG_CORE_LIBS) \
+ $(top_builddir)/miext/shadow/libshadow.la \
$(XGL_LIBS) \
$(XSERVER_LIBS) \
$(EXTENSION_LIBS) -lglitz -ldl
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/kdrive/sdl/Makefile.am xorg-server-1.0.99.902/hw/kdrive/sdl/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/kdrive/sdl/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/kdrive/sdl/Makefile.am Thu Jun 1 00:08:42 2006
@@ -11,10 +11,12 @@
Xsdl_SOURCES = sdl.c
-Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \
- @KDRIVE_LIBS@ \
- @XSERVER_LIBS@ \
+Xsdl_LDADD = \
+ $(KDRIVE_PURE_LIBS) \
+ $(top_builddir)/miext/shadow/libshadow.la \
+ $(KDRIVE_LIBS) \
+ $(XSERVER_LIBS) \
$(TSLIB_FLAG) \
- @XSDL_LIBS@
+ $(XSDL_LIBS)
Xsdl_DEPENDENCIES = @KDRIVE_LIBS@
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/xfree86/Makefile.am xorg-server-1.0.99.902/hw/xfree86/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/xfree86/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/xfree86/Makefile.am Thu Jun 1 00:47:08 2006
@@ -23,27 +23,24 @@
DISTCLEANFILES = xorg.c
-xorg.c:
- touch $@
-
-OS_LIBS = os-support/libxorgos.la
-
-XORG_LIBS = \
- @XORG_CORE_LIBS@ \
- common/libinit.a \
- loader/libloader.a \
- common/libcommon.a \
- parser/libxf86config.a \
- $(OS_LIBS) \
- dixmods/libdixmods.la \
- @XORG_LIBS@
-
-Xorg_LDADD = $(XORG_LIBS) \
- @XSERVER_LIBS@ \
- dixmods/libxorgxkb.la
+Xorg_LDADD = $(XORG_CORE_LIBS) \
+ common/libinit.a \
+ loader/libloader.a \
+ common/libcommon.a \
+ parser/libxf86config.a \
+ $(OS_LIBS) \
+ dixmods/libdixmods.la \
+ $(XORG_LIBS) \
+ $(top_builddir)/miext/shadow/libshadow.la \
+ $(XSERVER_LIBS) \
+ dixmods/libxorgxkb.la
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+OS_LIBS = os-support/libxorgos.la
+
+xorg.c:
+ touch $@
if SOLARIS_ASM_INLINE
# Needs to be built before any files are compiled when using Sun compilers
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/configure.ac xorg-server-1.0.99.902/configure.ac
--- xorg-server-1.0.99.902.orig-miext-shadow/configure.ac Wed May 31 23:50:41 2006
+++ xorg-server-1.0.99.902/configure.ac Thu Jun 1 00:11:10 2006
@@ -848,7 +848,6 @@
FB_LIB='$(top_builddir)/fb/libfb.la'
FB_INC='-I$(top_srcdir)/fb'
MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'
-MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la'
CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
@@ -899,7 +898,7 @@
modules not found.])
fi
DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
- XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB"
+ XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $OS_LIB $CWRAP_LIB"
AC_SUBST([XDMX_LIBS])
dnl USB sources in DMX require <linux/input.h>
@@ -938,7 +937,7 @@
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then
- XVFB_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 $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XVFB_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 $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
AC_SUBST([XVFB_LIBS])
fi
@@ -954,7 +953,7 @@
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then
- XNEST_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 $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XNEST_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 $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
AC_SUBST([XNEST_LIBS])
fi
@@ -983,7 +982,7 @@
AM_CONDITIONAL(XGL, [test "x$XGL" = xyes])
if test "x$XGL" = xyes; then
- XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_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 $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
AC_SUBST([XGL_LIBS])
AC_DEFINE(XGL_MODULAR, 1, [Use loadable XGL modules])
@@ -1004,7 +1003,7 @@
AM_CONDITIONAL(XEGL, [test "x$XEGL" = xyes])
if test "x$XEGL" = xyes; then
- XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_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 $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
AC_SUBST([XEGL_LIBS])
fi
@@ -1020,7 +1019,7 @@
AM_CONDITIONAL(XGLX, [test "x$XGLX" = xyes])
if test "x$XGLX" = xyes; then
- XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_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 $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
AC_SUBST([XGLX_LIBS])
fi
@@ -1041,7 +1040,7 @@
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
- XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
+ XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
@@ -1439,8 +1438,8 @@
# 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"
+ # $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 $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/vfb/Makefile.am xorg-server-1.0.99.902/hw/vfb/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/vfb/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/vfb/Makefile.am Thu Jun 1 00:01:50 2006
@@ -11,6 +11,7 @@
Xvfb_SOURCES = $(SRCS)
Xvfb_LDADD = $(XORG_CORE_LIBS) \
+ $(top_builddir)/miext/shadow/libshadow.la \
$(XVFB_LIBS) \
$(XSERVER_LIBS) \
$(EXTENSION_LIBS) \
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/dmx/Makefile.am xorg-server-1.0.99.902/hw/dmx/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/dmx/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/dmx/Makefile.am Thu Jun 1 00:00:15 2006
@@ -76,6 +76,7 @@
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
Xdmx_LDADD = $(XORG_CORE_LIBS) \
$(XDMX_LIBS) \
+ $(top_builddir)/miext/shadow/libshadow.la \
$(GLX_LIBS) \
input/libdmxinput.a \
config/libdmxconfig.a \
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/xnest/Makefile.am xorg-server-1.0.99.902/hw/xnest/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/xnest/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/xnest/Makefile.am Thu Jun 1 00:02:19 2006
@@ -47,6 +47,7 @@
Xnest_LDADD = $(XORG_CORE_LIBS) \
$(XNEST_LIBS) \
+ $(top_builddir)/miext/libshadow.la \
$(XNESTMODULES_LIBS)
Xnest_LDFLAGS =
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/xgl/glx/Makefile.am xorg-server-1.0.99.902/hw/xgl/glx/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/xgl/glx/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/xgl/glx/Makefile.am Thu Jun 1 00:05:03 2006
@@ -27,7 +27,7 @@
xglx.c \
xglxorg.c
-# Xglx_DEPENDENCIES = @XGLX_LIBS@
+# Xglx_DEPENDENCIES = $(XGLX_LIBS) $(top_builddir)/miext/shadow/libshadow.la
# Xglx_LDFLAGS = -export-dynamic
# Xglx_SOURCES = \
# xglxinit.c \
@@ -39,6 +39,7 @@
# libxglx.la \
# ../libxgl.a \
# $(XORG_CORE_LIBS) \
+# $(top_builddir)/miext/shadow/libshadow.la \
# $(XGLX_LIBS) \
# $(EXTENSION_LIBS) \
# $(XGLXMODULES_LIBS) \
diff -ruN xorg-server-1.0.99.902.orig-miext-shadow/hw/xgl/egl/Makefile.am xorg-server-1.0.99.902/hw/xgl/egl/Makefile.am
--- xorg-server-1.0.99.902.orig-miext-shadow/hw/xgl/egl/Makefile.am Wed May 31 23:50:40 2006
+++ xorg-server-1.0.99.902/hw/xgl/egl/Makefile.am Thu Jun 1 00:04:12 2006
@@ -9,7 +9,7 @@
$(XGL_MODULE_DIRS)
AM_CFLAGS = \
- @SERVER_DEFINES@ \
+ $(SERVER_DEFINES) \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XEGLMODULES_CFLAGS)
@@ -24,7 +24,7 @@
kinput.c \
evdev.c
-Xegl_DEPENDENCIES = @XEGL_LIBS@
+Xegl_DEPENDENCIES = $(XEGL_LIBS) $(top_builddir)/miext/shadow/libshadow.la
Xegl_LDFLAGS = -export-dynamic
Xegl_SOURCES = \
xeglinit.c \
@@ -36,6 +36,7 @@
libxegl.la \
../libxgl.a \
$(XORG_CORE_LIBS) \
+ $(top_builddir)/miext/shadow/libshadow.la \
$(XEGL_LIBS) \
$(XSERVER_LIBS) \
$(EXTENSION_LIBS) \
More information about the xorg
mailing list