From 3e4a50f0d28f90791f1c2eec2ece660c53dd4845 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Mon, 20 Oct 2003 02:17:32 +0000 Subject: [PATCH] Fix Makefiles to copy lib to $(TOP)/lib if missing --- src/mesa/drivers/dri/fb/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/gamma/Makefile.X11 | 16 ++++++++++------ src/mesa/drivers/dri/i810/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/i830/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/mga/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/r128/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/r200/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/radeon/Makefile.X11 | 6 +++++- src/mesa/drivers/dri/sis/Makefile.X11 | 6 +++++- 9 files changed, 50 insertions(+), 14 deletions(-) diff --git a/src/mesa/drivers/dri/fb/Makefile.X11 b/src/mesa/drivers/dri/fb/Makefile.X11 index 4a3c7a3fd79..671de313c08 100644 --- 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 be0daceae72..f779bf336cc 100644 --- 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 461da451e15..9fd5a5a3e59 100644 --- 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 622e5281cf5..3c6a4036822 100644 --- 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 4f20c7a8331..f816616f2cf 100644 --- 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 8ae146af915..7265affcc6c 100644 --- 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 62f4b4b94c1..eb41e220f57 100644 --- 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 b73abe8f51b..57ef24e8fba 100644 --- 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 529bd637c23..d6cea8fa6d8 100644 --- 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) -- 2.30.2