diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390	2007-09-21 11:11:58.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am	2007-09-21 11:12:46.000000000 +0200
@@ -27,19 +27,8 @@ Xvnc_SOURCES = \
 		$(top_srcdir)/fb/fbcmap.c
 
 Xvnc_LDADD =	$(XORG_CORE_LIBS) \
-		$(XORG_LIBS) \
+		$(XVFB_LIBS) \
 		$(XSERVER_LIBS) \
-		../../fb/libfb.la \
-		../../mi/libminimi.la \
-		../../render/librender.la \
-		../../xkb/libxkbstubs.la \
-		../../dbe/libdbe.la \
-		../../Xext/libXext.la \
-		../../XTrap/libxtrap.la \
-		../../record/librecord.la \
-		../xfree86/os-support/libxorgos.la \
-		../../os/libos.la \
-		../xfree86/common/libcommon.la \
 		-lX11 \
 		libvnccommon.la \
 		../../../../common/rfb/librfb.la