From adfc1ed8e1e150100accf014e46241201275138f Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Mon, 29 Dec 2003 09:04:20 +0000
Subject: [PATCH] Add dependency lines so that servers are rebuilt when server
 libraries are     changed.

---
 hw/kdrive/ati/Makefile.am    | 17 +++++++++++------
 hw/kdrive/chips/Makefile.am  |  8 ++++++--
 hw/kdrive/mga/Makefile.am    | 10 +++++++---
 hw/kdrive/nvidia/Makefile.am |  9 +++++++--
 hw/kdrive/r128/Makefile.am   |  8 ++++++--
 hw/kdrive/sis300/Makefile.am | 12 ++++++++----
 hw/kdrive/smi/Makefile.am    |  9 +++++++--
 7 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index 69c88f019..8452abcbb 100644
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@@ -50,12 +50,17 @@ libati_a_SOURCES = 	\
 Xati_SOURCES = \
 	ati_stub.c
 
+ATI_LIBS =				\
+	libati.a 			\
+	$(FBDEV_LIBS)			\
+	$(VESA_LIBS)			\
+	$(DRI_LIBS)			\
+	@KDRIVE_LIBS@
+
 Xati_LDADD = \
-	libati.a 				\
-	$(DRI_LIBS)				\
-	$(FBDEV_LIBS)				\
-	$(VESA_LIBS)				\
-	@KDRIVE_LIBS@				\
-	@XSERVER_LIBS@                          \
+	$(ATI_LIBS)			\
+	@XSERVER_LIBS@			\
 	$(TSLIB_FLAG)
 
+
+Xati_DEPENDENCIES = $(ATI_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am
index 6e7481e90..833c1f44a 100644
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@@ -19,10 +19,14 @@ libchips_a_SOURCES = 	\
 Xchips_SOURCES = \
 	chipsstub.c
 
-Xchips_LDADD = \
+CHIPS_LIBS =					\
 	libchips.a 				\
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
-	@KDRIVE_LIBS@				\
+	@KDRIVE_LIBS@
+
+Xchips_LDADD = \
+	$(CHIPS_LIBS)				\
 	@XSERVER_LIBS@                          \
 	$(TSLIB_FLAG)
 
+Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index 56fa3a0cf..0cae19ea6 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -19,10 +19,14 @@ libmga_a_SOURCES = 	\
 Xmga_SOURCES = \
 	mgastub.c
 
-Xmga_LDADD = \
+MGA_LIBS =						\
 	libmga.a 					\
-	$(top_builddir)/hw/kdrive/vesa/libvesa.a 	\
-	@KDRIVE_LIBS@					\
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a	\
+	@KDRIVE_LIBS@
+
+Xmga_LDADD = \
+	$(MGA_LIBS)					\
 	@XSERVER_LIBS@                                  \
 	$(TSLIB_FLAG)
 
+Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 41ad93691..21c795acf 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -16,12 +16,17 @@ libnvidia_a_SOURCES = 	\
 	nvidia.h	\
 	nvidiadraw.h
 
-	
 Xnvidia_SOURCES = \
 	nvidiastub.c
 
-Xnvidia_LDADD = \
+NVIDIA_LIBS =					\
 	libnvidia.a 				\
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
+	@KDRIVE_LIBS@
+
+Xnvidia_LDADD = \
+	$(NVIDIA_LIBS)				\
 	@KDRIVE_LIBS@				\
 	@XSERVER_LIBS@
+
+Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index a3a989c41..d115fb053 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -19,10 +19,14 @@ libr128_a_SOURCES = 	\
 Xr128_SOURCES = \
 	r128stub.c
 
-Xr128_LDADD = \
+R128_LIBS =					\
 	libr128.a 				\
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
-	@KDRIVE_LIBS@				\
+	@KDRIVE_LIBS@
+
+Xr128_LDADD = \
+	$(R128_LIBS)				\
 	@XSERVER_LIBS@                          \
 	$(TSLIB_FLAG)
 
+Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am
index 4a63c2ee1..b8d1b9ea6 100644
--- a/hw/kdrive/sis300/Makefile.am
+++ b/hw/kdrive/sis300/Makefile.am
@@ -32,11 +32,15 @@ libsis_a_SOURCES = 	\
 Xsis_SOURCES = \
 	sis_stub.c
 
+SIS_LIBS =				\
+	libsis.a 			\
+	$(FBDEV_LIBS)			\
+	$(VESA_LIBS)			\
+	@KDRIVE_LIBS@
+
 Xsis_LDADD = \
-	libsis.a 				\
-	$(FBDEV_LIBS)				\
-	$(VESA_LIBS)				\
-	@KDRIVE_LIBS@				\
+	$(SIS_LIBS)				\
 	@XSERVER_LIBS@                          \
 	$(TSLIB_FLAG)
 
+Xsis_DEPENDENCIES = $(SIS_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index 129330587..d7e4d66ae 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -23,10 +23,15 @@ libsmi_a_SOURCES = 	\
 Xsmi_SOURCES = \
 	smistub.c
 
-Xsmi_LDADD = \
+SMI_LIBS =					\
 	libsmi.a 				\
 	$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
-	@KDRIVE_LIBS@				\
+	@KDRIVE_LIBS@
+
+Xsmi_LDADD = \
+	$(SMI_LIBS)				\
 	@XSERVER_LIBS@                          \
 	$(TSLIB_FLAG)
+
+Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@