diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-11-09 05:51:23 -0800 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-11-17 11:23:19 -0700 |
| commit | cf65d81cf1eb031384f7e8bfe849ce59c458f27e (patch) | |
| tree | b522bce48470749cf3ad22406299c0cb09ee1000 | |
| parent | 041cd0e110d41b543a0fe9cc484ae8373642912b (diff) | |
dri: Ensure subdirs have finished before linking driver
Recursive make is hard. If there are subdirectories in the DRI drivers,
it's pretty certain we want to finish building in them before linking
the driver. Add a new target to serialize the rules.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 1ce9315530..39d25ce3f4 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -60,9 +60,13 @@ SHARED_INCLUDES = \ ##### TARGETS ##### -default: symlinks subdirs depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) +default: subdirs lib +.PHONY: lib +lib: symlinks subdirs depend + @$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) + $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \ $(TOP)/src/mesa/drivers/dri/Makefile.template $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ |