Fix Makefiles to copy lib to $(TOP)/lib if missing

diff --git a/src/mesa/drivers/dri/fb/Makefile.X11 b/src/mesa/drivers/dri/fb/Makefile.X11
index 4a3c7a3fd794bceda09efc7adfdb4b27dddefb9d..671de313c088ba032a85e107f2f011844b8176fe 100644 (file)
--- a/src/mesa/drivers/dri/fb/Makefile.X11
+++ b/src/mesa/drivers/dri/fb/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.2 2003/08/23 04:58:24 jonsmirl Exp $
+# $Id: Makefile.X11,v 1.3 2003/10/20 02:17:32 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -57,6 +57,10 @@ fb_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/fb_dri.so && \
        install fb_dri.so $(TOP)/lib/fb_dri.so
 
+$(TOP)/lib/fb_dri.so:  fb_dri.so
+       rm -f $(TOP)/lib/fb_dri.so && \
+       install fb_dri.so $(TOP)/lib/fb_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/gamma/Makefile.X11 b/src/mesa/drivers/dri/gamma/Makefile.X11
index be0daceae721a266104a062d208ace13796a4424..f779bf336cc68e4b93203b1f48800b32a2ed0912 100644 (file)
--- a/src/mesa/drivers/dri/gamma/Makefile.X11
+++ b/src/mesa/drivers/dri/gamma/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.1 2003/10/16 04:50:42 jonsmirl Exp $
+# $Id: Makefile.X11,v 1.2 2003/10/20 02:17:32 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -22,7 +22,7 @@ DEFINES += \
        -DGLX_DIRECT_RENDERING 
 
 # Not yet
-# MINIGLX_SOURCES = server/i810_dri.c 
+# MINIGLX_SOURCES = server/gamma_dri.c 
 
 DRIVER_SOURCES = \
                gamma_context.c \
@@ -90,12 +90,16 @@ INCLUDE_DIRS = \
 
 ##### TARGETS #####
 
-targets: depend i810_dri.so
+targets: depend gamma_dri.so
 
-i810_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+gamma_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
-       rm -f $(TOP)/lib/i810_dri.so && \
-       install i810_dri.so $(TOP)/lib/i810_dri.so
+       rm -f $(TOP)/lib/gamma_dri.so && \
+       install gamma_dri.so $(TOP)/lib/gamma_dri.so
+
+$(TOP)/lib/gamma_dri.so:       gamma_dri.so
+       rm -f $(TOP)/lib/gamma_dri.so && \
+       install gamma_dri.so $(TOP)/lib/gamma_dri.so
 
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.

diff --git a/src/mesa/drivers/dri/i810/Makefile.X11 b/src/mesa/drivers/dri/i810/Makefile.X11
index 461da451e159faf1c4baa3886eaa39bea3f2b7d3..9fd5a5a3e59cdc2b583dde26157f209e4f20cd7f 100644 (file)
--- a/src/mesa/drivers/dri/i810/Makefile.X11
+++ b/src/mesa/drivers/dri/i810/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.1 2003/09/30 10:54:15 alanh Exp $
+# $Id: Makefile.X11,v 1.2 2003/10/20 02:17:32 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -94,6 +94,10 @@ i810_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/i810_dri.so && \
        install i810_dri.so $(TOP)/lib/i810_dri.so
 
+$(TOP)/lib/i810_dri.so:        i810_dri.so
+       rm -f $(TOP)/lib/i810_dri.so && \
+       install i810_dri.so $(TOP)/lib/i810_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/i830/Makefile.X11 b/src/mesa/drivers/dri/i830/Makefile.X11
index 622e5281cf520f68b5efe7026eaaa057d204a2c6..3c6a40368223677e5d42944888b43699bfda9cd6 100644 (file)
--- a/src/mesa/drivers/dri/i830/Makefile.X11
+++ b/src/mesa/drivers/dri/i830/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.2 2003/09/30 11:05:46 alanh Exp $
+# $Id: Makefile.X11,v 1.3 2003/10/20 02:17:33 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -95,6 +95,10 @@ i830_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/i830_dri.so && \
        install i830_dri.so $(TOP)/lib/i830_dri.so
 
+$(TOP)/lib/i830_dri.so:        i830_dri.so
+       rm -f $(TOP)/lib/i830_dri.so && \
+       install i830_dri.so $(TOP)/lib/i830_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/mga/Makefile.X11 b/src/mesa/drivers/dri/mga/Makefile.X11
index 4f20c7a833138fc34f3097dda5c7345dea4e34e3..f816616f2cf0158afb530083d02934836b0d5e1d 100644 (file)
--- a/src/mesa/drivers/dri/mga/Makefile.X11
+++ b/src/mesa/drivers/dri/mga/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.3 2003/08/24 04:44:23 jonsmirl Exp $
+# $Id: Makefile.X11,v 1.4 2003/10/20 02:17:33 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -99,6 +99,10 @@ mga_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/mga_dri.so && \
        install mga_dri.so $(TOP)/lib/mga_dri.so
 
+$(TOP)/lib/mga_dri.so: mga_dri.so
+       rm -f $(TOP)/lib/mga_dri.so && \
+       install mga_dri.so $(TOP)/lib/mga_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/r128/Makefile.X11 b/src/mesa/drivers/dri/r128/Makefile.X11
index 8ae146af9154c5d7c2964f7c66eb499b67479ee2..7265affcc6ce27a31a04b0068be0fb3548f56bab 100644 (file)
--- a/src/mesa/drivers/dri/r128/Makefile.X11
+++ b/src/mesa/drivers/dri/r128/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.1 2003/08/22 20:11:44 brianp Exp $
+# $Id: Makefile.X11,v 1.2 2003/10/20 02:17:33 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -94,6 +94,10 @@ r128_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/r128_dri.so && \
        install r128_dri.so $(TOP)/lib/r128_dri.so
 
+$(TOP)/lib/r128_dri.so: r128_dri.so
+       rm -f $(TOP)/lib/r128_dri.so && \
+       install r128_dri.so $(TOP)/lib/r128_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/r200/Makefile.X11 b/src/mesa/drivers/dri/r200/Makefile.X11
index 62f4b4b94c1b466b64e8f9acb9b8fb43ffaaa9a4..eb41e220f57f2cff5c6b23b693271eae41a5f10b 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile.X11
+++ b/src/mesa/drivers/dri/r200/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.4 2003/10/03 14:03:18 brianp Exp $
+# $Id: Makefile.X11,v 1.5 2003/10/20 02:17:33 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -118,6 +118,10 @@ r200_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/r200_dri.so && \
        install r200_dri.so $(TOP)/lib/r200_dri.so
 
+$(TOP)/lib/r200_dri.so:        r200_dri.so
+       rm -f $(TOP)/lib/r200_dri.so && \
+       install r200_dri.so $(TOP)/lib/r200_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/radeon/Makefile.X11 b/src/mesa/drivers/dri/radeon/Makefile.X11
index b73abe8f51bad4cf98690c463c11e60196f75ebd..57ef24e8fbadc61590889ad062ea7c2997f11a9a 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile.X11
+++ b/src/mesa/drivers/dri/radeon/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.1 2003/08/22 20:11:45 brianp Exp $
+# $Id: Makefile.X11,v 1.2 2003/10/20 02:17:33 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -132,6 +132,10 @@ $(TARGET):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/$(TARGET) && \
        install $(TARGET) $(TOP)/lib/$(TARGET)
 
+$(TOP)/lib/$(TARGET):  $(TARGET)
+       rm -f $(TOP)/lib/$(TARGET) && \
+       install $(TARGET) $(TOP)/lib/$(TARGET)
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)

diff --git a/src/mesa/drivers/dri/sis/Makefile.X11 b/src/mesa/drivers/dri/sis/Makefile.X11
index 529bd637c23de866f3ba3c28859f2329bd89b7bf..d6cea8fa6d87285aeb6332087108ba69adddfe64 100644 (file)
--- a/src/mesa/drivers/dri/sis/Makefile.X11
+++ b/src/mesa/drivers/dri/sis/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.1 2003/09/30 11:13:32 alanh Exp $
+# $Id: Makefile.X11,v 1.2 2003/10/20 02:17:33 jonsmirl Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -98,6 +98,10 @@ sis_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
        rm -f $(TOP)/lib/sis_dri.so && \
        install sis_dri.so $(TOP)/lib/sis_dri.so
 
+$(TOP)/lib/sis_dri.so: sis_dri.so
+       rm -f $(TOP)/lib/sis_dri.so && \
+       install sis_dri.so $(TOP)/lib/sis_dri.so
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)