Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8482238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  Separate out the proc- and unit-specific header directories from the general
  Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
parents 5de4c51d 2f2a2132

arch/mn10300/Makefile

+3 −37
Original line number Diff line number Diff line
@@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO 
KBUILD_AFLAGS	+= -Wa,--gdwarf2

endif



###################################################################################################

#

# juggle some symlinks in the MN10300 asm include dir

# include the appropriate processor- and unit-specific headers

#

#	Update machine proc and unit symlinks if something which affects

#	them changed.  We use .proc / .unit to indicate when they were

#	updated last, otherwise make uses the target directory mtime.

#

###################################################################################################



# processor specific definitions

include/asm-mn10300/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf

	@echo '  SYMLINK include/asm-mn10300/proc -> include/asm-mn10300/proc-$(PROCESSOR)'

ifneq ($(KBUILD_SRC),)

	$(Q)mkdir -p include/asm-mn10300

	$(Q)ln -fsn $(srctree)/include/asm-mn10300/proc-$(PROCESSOR) include/asm-mn10300/proc

else

	$(Q)ln -fsn proc-$(PROCESSOR) include/asm-mn10300/proc

endif

	@touch $@



CLEAN_FILES += include/asm-mn10300/proc include/asm-mn10300/.proc



prepare: include/asm-mn10300/.proc



# unit specific definitions

include/asm-mn10300/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf

	@echo '  SYMLINK include/asm-mn10300/unit -> include/asm-mn10300/unit-$(UNIT)'

ifneq ($(KBUILD_SRC),)

	$(Q)mkdir -p include/asm-mn10300

	$(Q)ln -fsn $(srctree)/include/asm-mn10300/unit-$(UNIT) include/asm-mn10300/unit

else

	$(Q)ln -fsn unit-$(UNIT) include/asm-mn10300/unit

endif

	@touch $@



CLEAN_FILES += include/asm-mn10300/unit include/asm-mn10300/.unit



prepare: include/asm-mn10300/.unit
 
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include

KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include