Changeset 0dc2fec in mainline for kernel/Makefile

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/Makefile (modified) (5 diffs)

kernel/Makefile ¶

@@ -48 +48 @@
 #
 
+AGDEPEND = Makefile.ag.depend
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
@@ -138 +139 @@
 -include genarch/Makefile.inc
 -include $(DEPEND)
+-include $(AGDEPEND)
 
 ## The at-sign
@@ -377 +379 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
+GENARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(GENARCH_AUTOGENS_AG)))
+GENARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(GENARCH_AUTOGENS_AG)))
+GENARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(GENARCH_AUTOGENS_AG)))
+
 ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
 ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
 ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
+
+AUTOGENS_H := $(ARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_H)
+AUTOGENS_AG := $(ARCH_AUTOGENS_AG) $(GENARCH_AUTOGENS_AG)
 
 LFLAGS_LTO := $(addprefix -Xlinker ,$(LFLAGS))
@@ -460 +469 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(DEPEND): $(COMMON_HEADER_ARCH) $(ARCH_AUTOGENS_H)
+$(AUTOGENS_H): $(AGDEPEND)
+
+$(AGDEPEND): $(AUTOGENS_AG)
+        echo "# DO NOT EDIT" >$@
+        for g in $^; do \
+                h=`dirname $$g`/`basename $$g .ag`.h; \
+                for l in `$(AUTOGEN) depend $$g`; do \
+                        echo "$$h: $$l" >>$@; \
+                done \
+        done
+
+$(DEPEND): $(COMMON_HEADER_ARCH) $(AUTOGENS_H)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
@@ -469 +489 @@
 autogen_clean:
         -rm $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
+        -rm $(GENARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_PROBE_C) $(GENARCH_AUTOGENS_PROBE_S)
+        -rm $(AGDEPEND)