diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-23 08:14:14 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-23 08:14:49 -0600 |
| commit | 76b94a636eea0ffb642a90cf9ff4a00bfe6e064e (patch) | |
| tree | c9a4919fefed490f261a77453d27ddea2b1196f2 | |
| parent | 8319f2f326f74a93b51eb3db1e9f619a2a74e14e (diff) | |
Don't make libmesa.a or libglapi.a depend on asm_subdirs
Since the asm_subdirs target does not actually create a file, make will
always consider that it needs to be rebuilt. If libmesa.a and libglapi.a
have asm_subdirs as a prerequisite, then they will always need to be
rebuilt, too. The correct order will be preserved by the default target,
though.
This should fix #16358.
Conflicts:
src/mesa/Makefile
cherry-picked from master
| -rw-r--r-- | src/mesa/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 4e0cea240a..cf75baa706 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -32,11 +32,11 @@ default: depend asm_subdirs libmesa.a $(GLAPI_LIB) driver_subdirs # Helper libraries used by many drivers: # Make archive of core mesa object files -libmesa.a: $(MESA_OBJECTS) asm_subdirs +libmesa.a: $(MESA_OBJECTS) @ $(TOP)/bin/mklib -o mesa -static $(MESA_OBJECTS) # Make archive of gl* API dispatcher functions only -$(GLAPI_LIB): $(GLAPI_OBJECTS) asm_subdirs +$(GLAPI_LIB): $(GLAPI_OBJECTS) @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \ touch libglapi.a ; \ else \ |