diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-01-15 08:50:19 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-01-15 08:50:19 -0800 |
| commit | 8f126a65525a15d49c1496ebef881b009a28b6ae (patch) | |
| tree | 6bf71850f6c6e75d2567eb0cfeaf2836bf2adc4d /templates | |
| parent | 12c8209c93cebc43d49db794930c044e7aed258e (diff) | |
Remove _DEPS variables
They're trivially recreatable from the _OBJS variables now.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 962bbd6729..d60448d4a4 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -613,7 +613,6 @@ PUBLIC_HEADERS_C += \\ % endif LIB${lib.name.upper()}_OBJS = $(addprefix objs/$(CONFIG)/, $(addsuffix .o, $(basename $(LIB${lib.name.upper()}_SRC)))) -LIB${lib.name.upper()}_DEPS = $(addprefix objs/$(CONFIG)/, $(addsuffix .dep, $(basename $(LIB${lib.name.upper()}_SRC)))) % if lib.get('secure', True): ifeq ($(NO_SECURE),true) @@ -701,13 +700,11 @@ endif endif % endif -deps_lib${lib.name}: $(LIB${lib.name.upper()}_DEPS) - % if lib.get('secure', True): ifneq ($(NO_SECURE),true) % endif ifneq ($(NO_DEPS),true) --include $(LIB${lib.name.upper()}_DEPS) +-include $(LIB${lib.name.upper()}_OBJS:.o=.dep) endif % if lib.get('secure', True): endif @@ -735,7 +732,6 @@ ${tgt.name.upper()}_SRC = \\ % endfor ${tgt.name.upper()}_OBJS = $(addprefix objs/$(CONFIG)/, $(addsuffix .o, $(basename $(${tgt.name.upper()}_SRC)))) -${tgt.name.upper()}_DEPS = $(addprefix objs/$(CONFIG)/, $(addsuffix .dep, $(basename $(${tgt.name.upper()}_SRC)))) % if tgt.get('secure', True): ifeq ($(NO_SECURE),true) @@ -802,13 +798,13 @@ objs/$(CONFIG)/${os.path.splitext(src)[0]}.o: \ % endfor -deps_${tgt.name}: $(${tgt.name.upper()}_DEPS) +deps_${tgt.name}: $(${tgt.name.upper()}_OBJS:.o=.dep) % if tgt.get('secure', True): ifneq ($(NO_SECURE),true) % endif ifneq ($(NO_DEPS),true) --include $(${tgt.name.upper()}_DEPS) +-include $(${tgt.name.upper()}_OBJS:.o=.dep) endif % if tgt.get('secure', True): endif |