diff options
author | Julien Cristau <jcristau@debian.org> | 2008-07-13 19:20:03 +0200 |
---|---|---|
committer | Julien Cristau <jcristau@debian.org> | 2008-07-13 19:20:03 +0200 |
commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
tree | dee99970e9d1e6d892f21db31488470bc7929d18 /src/glu/sgi/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/glu/sgi/Makefile')
-rw-r--r-- | src/glu/sgi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile index 207247ad87a..63eca5cbe77 100644 --- a/src/glu/sgi/Makefile +++ b/src/glu/sgi/Makefile @@ -136,7 +136,7 @@ $(TOP)/$(LIB_DIR): # Make the library: $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) - $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ + $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLU_LIB_DEPS) $(OBJECTS) |