Mesa (master): Add dependency generation for Mesa and GLSL dricore objects.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Jul 29 00:37:52 UTC 2011
Module: Mesa
Branch: master
Commit: 83f5d5e6aa58754f52c3579c27d810c497fe13a3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83f5d5e6aa58754f52c3579c27d810c497fe13a3
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jul 22 18:42:21 2011 -0700
Add dependency generation for Mesa and GLSL dricore objects.
Reviewed-By: Christopher James Halse Rogers
<christopher.halse.rogers at canonical.com>
---
src/glsl/Makefile | 1 +
src/mesa/Makefile | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 005b51d..c20a6c9 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 a903a26..88f31b6 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
More information about the mesa-commit
mailing list