Changeset 0798689 in mainline for boot/Makefile.build

Timestamp:

2017-10-27T18:24:48Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

9b642f92

Parents:

d4da860

Message:

Reference boot arch headers directly, instead of via symlinks.

This change was previously done in kernel and uspace, but not in boot.
In addition to better consistency, this also fixes an issue with
make dependency tracking.

File:

• boot/Makefile.build (modified) (4 diffs)

boot/Makefile.build

@@ -31 +31 @@
 include Makefile.common
 
-INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
+INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/include
 OPTIMIZATION = 3
 
@@ -76 +76 @@
 
 clean:
-        rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
+        rm -f $(RAW) $(MAP)
 
 -include $(DEPENDS)
@@ -109 +109 @@
 endif
 
-depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(PRE_DEPEND)
+depend: $(PRE_DEPEND)
 
 $(COMPS).s: $(COMPS).zip
@@ -128 +128 @@
 include Makefile.initrd
 
-$(ARCH_INCLUDE) $(ARCH_INCLUDE)/%.h: arch/$(KARCH)/include/
-        ln -sfn ../../$< $@
-
-$(GENARCH_INCLUDE) $(GENARCH_INCLUDE)/%.h: genarch/include/
-        ln -sfn ../../$< $@