summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-12 10:59:40 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-12 10:59:40 -0700
commit98e7c1cf3852fbc2924b55b5a684f13a710eec04 (patch)
tree3070fcdd111c167906b9d67cf03ec11c47920c0c
parentc61f4e2ccec5d8dcb50b5f58a2ea08218b669129 (diff)
downloadexternal_mesa3d-98e7c1cf3852fbc2924b55b5a684f13a710eec04.zip
external_mesa3d-98e7c1cf3852fbc2924b55b5a684f13a710eec04.tar.gz
external_mesa3d-98e7c1cf3852fbc2924b55b5a684f13a710eec04.tar.bz2
Fixed 'make install' for darwin
-rw-r--r--configs/darwin7
-rw-r--r--configs/default6
-rw-r--r--src/glu/Makefile2
-rw-r--r--src/glut/glx/Makefile2
-rw-r--r--src/glw/Makefile2
-rw-r--r--src/glx/x11/Makefile2
-rw-r--r--src/mesa/Makefile4
7 files changed, 19 insertions, 6 deletions
diff --git a/configs/darwin b/configs/darwin
index f2728c8..b41c6cb 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -32,6 +32,13 @@ GLUT_LIB_NAME = libglut.dylib
GLW_LIB_NAME = libGLw.dylib
OSMESA_LIB_NAME = libOSMesa.dylib
+# globs used to install the lib and all symlinks
+GL_LIB_GLOB = libGL.*dylib
+GLU_LIB_GLOB = libGLU.*dylib
+GLUT_LIB_GLOB = libglut.*dylib
+GLW_LIB_GLOB = libGLw.*dylib
+OSMESA_LIB_GLOB = libOSMesa.*dylib
+
GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
diff --git a/configs/default b/configs/default
index 1547972..fe655e7 100644
--- a/configs/default
+++ b/configs/default
@@ -54,6 +54,12 @@ GLUT_LIB_NAME = lib$(GLUT_LIB).so
GLW_LIB_NAME = lib$(GLW_LIB).so
OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
+# globs used to install the lib and all symlinks
+GL_LIB_GLOB = $(GL_LIB_NAME)*
+GLU_LIB_GLOB = $(GLU_LIB_NAME)*
+GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
+GLW_LIB_GLOB = $(GLW_LIB_NAME)*
+OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
# Optional assembly language optimization files for libGL
ASM_SOURCES =
diff --git a/src/glu/Makefile b/src/glu/Makefile
index 599b3fc..b025a90 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -25,7 +25,7 @@ glu.pc: glu.pc.in
install: glu.pc
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
- $(INSTALL) $(TOP)/$(LIB_DIR)/libGLU.* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
clean:
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 0dd438e..7f886f7 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -112,7 +112,7 @@ install: glut.pc
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
$(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 63251ef..753c4b7 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -39,7 +39,7 @@ install: glw.pc
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
$(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
clean:
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 9d32539..5d9c61c 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -73,7 +73,7 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-major 1 -minor 2 $(MKLIB_OPTIONS) \
- -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/libGL.1.dylib \
+ -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \
$(GL_LIB_DEPS) $(OBJECTS)
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 605e700..ba65ce6 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -105,13 +105,13 @@ install-headers:
install-libgl: default gl.pc install-headers
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
- $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)* \
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
$(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
install-osmesa: default
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)* \
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
$(DESTDIR)$(INSTALL_LIB_DIR)
install-dri: default