projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300: Remove calls to rcommonEnsureCmdBufSpace.
[mesa.git]
/
src
/
mesa
/
drivers
/
x11
/
Makefile
diff --git
a/src/mesa/drivers/x11/Makefile
b/src/mesa/drivers/x11/Makefile
index 8ee9b61808166fd03b502013e5fbd8cbff0ebc7d..5e427d2d5c6013dbfd1e0b4cd923bbd616a0e952 100644
(file)
--- a/
src/mesa/drivers/x11/Makefile
+++ b/
src/mesa/drivers/x11/Makefile
@@
-18,7
+18,6
@@
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
HEADERS = \
glxapi.h \
glxheader.h \
HEADERS = \
glxapi.h \
glxheader.h \
- realglx.h \
xfonts.h \
xmesaP.h \
xm_glide.h \
xfonts.h \
xmesaP.h \
xm_glide.h \
@@
-27,7
+26,6
@@
HEADERS = \
SOURCES = \
fakeglx.c \
glxapi.c \
SOURCES = \
fakeglx.c \
glxapi.c \
- realglx.c \
xfonts.c \
xm_api.c \
xm_buffer.c \
xfonts.c \
xm_api.c \
xm_buffer.c \
@@
-43,7
+41,8
@@
OBJECTS = $(SOURCES:.c=.o)
INCLUDE_DIRS = \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
INCLUDE_DIRS = \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/main
+ -I$(TOP)/src/mesa/main \
+ $(X11_INCLUDES)
CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
@@
-57,11
+56,11
@@
default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA)
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA)
- @ $(TOP)/bin/mklib -o $(GL_LIB) \
- -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+ @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
- -install $(TOP)/$(LIB_DIR) \
- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
+ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).$(GL_MAJOR).dylib \
+ $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA)