diff options
| author | Nicolai Haehnle <nhaehnle@gmail.com> | 2008-09-28 18:28:05 +0200 |
|---|---|---|
| committer | Nicolai Haehnle <nhaehnle@gmail.com> | 2008-09-28 18:47:13 +0200 |
| commit | 3dba9178ec5dbf8183a5ceee701c9a36606ad464 (patch) | |
| tree | 51276417f55673bb44810780d222516c84672a3e /src/glx/x11/Makefile | |
| parent | 857362ef14fc4f175a9d425a74f9ca2b691971d6 (diff) | |
| parent | 2e5d717007ba6515b094b9af8ed869130185a308 (diff) | |
Merge branch 'master' into develop
Conflicts:
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/radeon_context.c
src/mesa/drivers/dri/r300/radeon_context.h
Diffstat (limited to 'src/glx/x11/Makefile')
| -rw-r--r-- | src/glx/x11/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 121f3dfac0..419cb2853b 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -50,7 +50,7 @@ OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS) INCLUDES = -I. \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ - -I$(TOP)/src/mesa/main \ + -I$(TOP)/src/mesa \ -I$(TOP)/src/mesa/glapi \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ @@ -73,7 +73,8 @@ 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) $(GL_LIB_DEPS) $(OBJECTS) + -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \ + $(GL_LIB_DEPS) $(OBJECTS) depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile |