Changeset 5af6cf3d in mainline for kernel/Makefile

Timestamp:

2018-03-05T15:55:34Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

db3c8834

Parents:

d5e5fd1

Message:

todo

File:

• kernel/Makefile (modified) (6 diffs)

kernel/Makefile

@@ -48 +48 @@
 #
 
+AUTOGEN = $(ROOT_PATH)/tools/autogen2.sh
 AGDEPEND = Makefile.ag.depend
 RAW = kernel.raw
@@ -73 +74 @@
 
 .PHONY: all clean autogen_clean depend
+.DELETE_ON_ERROR:
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BIN) $(DISASM)
@@ -354 +356 @@
 GENARCH_DEPENDS := $(addsuffix .d,$(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)
+AUTOGEN_DEPENDS := $(addsuffix .d,$(AUTOGENS_AG))
 
 AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
@@ -371 +365 @@
 -include $(ARCH_DEPENDS)
 -include $(GENARCH_DEPENDS)
+-include $(AUTOGEN_DEPENDS)
 
 ifeq ($(COMPILER),clang)
@@ -402 +397 @@
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
 
-%.h: %.ag
-        $(AUTOGEN) probe $< >$<.probe.c
-        $(CC_AUTOGEN) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
-        $(AUTOGEN) generate $< <$<.probe.s >$@
+%.ag.h %.ag.s %.ag.c %.ag.d: %.h
+        CC="$(CC)" CFLAGS="$(CFLAGS)" $(AUTOGEN) $< $@
 
 %.o: %.S | depend
@@ -441 +434 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(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: $(AUTOGENS_H)
+depend: $(AUTOGENS_AG)
 
 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)
+        -rm $(AUTOGENS_AG) $(AUTOGEN_DEPENDS) $(AUTOGENS_AG)