From 520ef4b5bcb8e950675c6e0d55cb50dd590c1bc7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 12 Dec 2003 15:33:51 +0000 Subject: [PATCH] new makefiles --- progs/miniglx/{Makefile.X11 => Makefile.solo} | 6 ++---- src/glut/mini/{Makefile.X11 => Makefile.solo} | 4 ++-- src/glx/mini/{Makefile.X11 => Makefile.solo} | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) rename progs/miniglx/{Makefile.X11 => Makefile.solo} (74%) rename src/glut/mini/{Makefile.X11 => Makefile.solo} (92%) rename src/glx/mini/{Makefile.X11 => Makefile.solo} (93%) diff --git a/progs/miniglx/Makefile.X11 b/progs/miniglx/Makefile.solo similarity index 74% rename from progs/miniglx/Makefile.X11 rename to progs/miniglx/Makefile.solo index 60eda759ac2..0cca1e07e35 100644 --- a/progs/miniglx/Makefile.X11 +++ b/progs/miniglx/Makefile.solo @@ -1,6 +1,4 @@ -# Simple makefile for compiling test programs on Linux -# These programs aren't intended to be included with the normal -# distro. They're not too interesting but they're good for testing. +# Makefile for miniglx demo programs TOP = ../.. @@ -47,7 +45,7 @@ clean: rm -f *.o -# Run 'make -f Makefile.X11 dep' to update the dependencies if you change +# Run 'make -f Makefile.solo dep' to update the dependencies if you change # what's included by any source file. depend: $(SOURCES) makedepend -fdepend -Y $(INCLUDES) \ diff --git a/src/glut/mini/Makefile.X11 b/src/glut/mini/Makefile.solo similarity index 92% rename from src/glut/mini/Makefile.X11 rename to src/glut/mini/Makefile.solo index bbdc6a690ce..f413ed17edc 100644 --- a/src/glut/mini/Makefile.X11 +++ b/src/glut/mini/Makefile.solo @@ -49,7 +49,7 @@ LIBS = -L$(TOP)/lib -lGL -lGLU -lm targets: depend libglut.so.3.7 install -libglut.so.3.7: $(OBJS) Makefile.X11 +libglut.so.3.7: $(OBJS) Makefile.solo gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ install: libglut.so.3.7 @@ -58,7 +58,7 @@ install: libglut.so.3.7 ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3 ln -s libglut.so.3 $(TOP)/lib/libglut.so -# Run 'make -f Makefile.X11 dep' to update the dependencies if you change +# Run 'make -f Makefile.solo dep' to update the dependencies if you change # what's included by any source file. depend: $(SOURCES) makedepend -fdepend -Y $(INCLUDES) \ diff --git a/src/glx/mini/Makefile.X11 b/src/glx/mini/Makefile.solo similarity index 93% rename from src/glx/mini/Makefile.X11 rename to src/glx/mini/Makefile.solo index 115854393a7..94e54f46a54 100644 --- a/src/glx/mini/Makefile.X11 +++ b/src/glx/mini/Makefile.solo @@ -44,7 +44,7 @@ INCLUDE_DIRS = \ targets: depend libGL.so.1.2 -libGL.so.1.2: $(OBJECTS) Makefile.X11 +libGL.so.1.2: $(OBJECTS) Makefile.solo rm -f $@ && gcc -shared -Wl,-soname,libGL.so -Wl,-Bsymbolic $(OBJECTS) $(LIBS) -o $@ rm -f $(TOP)/lib/libGL.so* rm -f $(TOP)/lib/miniglx.conf @@ -56,7 +56,7 @@ libGL.so.1.2: $(OBJECTS) Makefile.X11 drmtest: xf86drm.o drmtest.o rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o -# Run 'make -f Makefile.X11 dep' to update the dependencies if you change +# Run 'make -f Makefile.solo dep' to update the dependencies if you change # what's included by any source file. depend: $(C_SOURCES) $(ASM_SOURCES) makedepend -fdepend -Y $(INCLUDES) \ -- 2.30.2