diff options
| author | Eric Anholt <eric@anholt.net> | 2011-07-22 18:42:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-07-28 17:32:42 -0700 |
| commit | 83f5d5e6aa58754f52c3579c27d810c497fe13a3 (patch) | |
| tree | 76197fcc2cd43e75c9f393eba27e4519825b31b2 | |
| parent | f79e3518b4e39cd27f679c402e715154f63107f6 (diff) | |
Add dependency generation for Mesa and GLSL dricore objects.
Reviewed-By: Christopher James Halse Rogers
<christopher.halse.rogers@canonical.com>
| -rw-r--r-- | src/glsl/Makefile | 1 | ||||
| -rw-r--r-- | src/mesa/Makefile | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 005b51d724..c20a6c9edd 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -164,6 +164,7 @@ depend: $(ALL_SOURCES) Makefile rm -f depend touch depend $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null + $(MKDEP) $(MKDEP_OPTIONS) -a -p $(DRICORE_OBJ_DIR)/ $(INCLUDES) $(ALL_SOURCES) 2> /dev/null # Remove .o and backup files clean: clean-dricore diff --git a/src/mesa/Makefile b/src/mesa/Makefile index a903a260ac..88f31b6869 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -12,11 +12,10 @@ DRICORE_OBJ_DIR := objs-dricore include sources.mak # adjust object dirs +DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS)) MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS)) MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS)) -DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS)) - # define preprocessor flags MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES) @@ -124,6 +123,8 @@ depend: $(ALL_SOURCES) @ touch depend @$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \ $(ALL_SOURCES) > /dev/null 2>/dev/null + @$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \ + $(ALL_SOURCES) > /dev/null 2>/dev/null ###################################################################### # Installation rules |