For each kdrive server put a dependencie on its own libraries.

18 files changed, 56 insertions, 15 deletions

diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index d7996fc7a..9e1fc7f57 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 4bb57131e..8188a8e7e 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 11fe4547f..cc3019fc7 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 0ef8e4573..cd2057132 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 69fdf59d5..09d179eb0 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 f7a94e183..ea2aff3b3 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 b7aacd6d7..e3a702dde 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 1f8a3c31f..537939083 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 72bd539fb..0598651d6 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 770ada23b..468654711 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 3aec12402..8ebfec9de 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 6223abbc8..b2b48ba6a 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 6b2ca8505..609e0f5d2 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 fa09640d2..e74249967 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 62f3266e1..3e8ce90b7 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 d6a143b95..6cee31610 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 934b995c7..d58f20f95 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 caf3f5f31..8c8189d12 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)