summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-12-12 15:33:51 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-12-12 15:33:51 +0000
commit520ef4b5bcb8e950675c6e0d55cb50dd590c1bc7 (patch)
tree80c898f7b4ba417ea49ad79fadf92c95527099e0
parentc882e19643a2403e9a339683649efe9aa182ffea (diff)
new makefiles
-rw-r--r--progs/miniglx/Makefile.solo (renamed from progs/miniglx/Makefile.X11)6
-rw-r--r--src/glut/mini/Makefile.solo (renamed from src/glut/mini/Makefile.X11)4
-rw-r--r--src/glx/mini/Makefile.solo (renamed from src/glx/mini/Makefile.X11)4
3 files changed, 6 insertions, 8 deletions
diff --git a/progs/miniglx/Makefile.X11 b/progs/miniglx/Makefile.solo
index 60eda759ac..0cca1e07e3 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
index bbdc6a690c..f413ed17ed 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
index 115854393a..94e54f46a5 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) \