Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset db6e419 in mainline for kernel/Makefile


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/Makefile

    re0e922d rdb6e419  
    5959REAL_MAP = generic/src/debug/real_map
    6060
     61ABI_INCLUDE = generic/include/abi
    6162ARCH_INCLUDE = generic/include/arch
    6263GENARCH_INCLUDE = generic/include/genarch
     
    7576
    7677clean:
    77         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h
     78        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h
    7879        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
    7980
     
    432433        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    433434
    434 $(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
     435$(DEPEND): $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
    435436        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
    436437        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
    437438
     439$(ABI_INCLUDE): ../abi/include/
     440        ln -sfn ../../$< $@
     441
    438442$(ARCH_INCLUDE): arch/$(KARCH)/include/
    439443        ln -sfn ../../$< $@
Note: See TracChangeset for help on using the changeset viewer.