diff options
| author | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
| commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
| tree | dee99970e9d1e6d892f21db31488470bc7929d18 /src/glx/x11/Makefile | |
| parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
| parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'src/glx/x11/Makefile')
| -rw-r--r-- | src/glx/x11/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index c45c7de6d6d..121f3dfac00 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -71,7 +71,7 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Make libGL $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile - $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) |