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

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild changes from Michal Marek:
 - fix for handling dependencies of *-objs targets by Masahiro Yamada
 - lots of cleanups in the kbuild machinery, also by Masahiro
 - fixes for the kconfig build to use an UTF-8 capable ncurses library
   if possible and to build on not-so-standard installs
 - some more minor fixes

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Do not reference *-n variables in the Makefile
  kbuild: simplify build, clean, modbuiltin shorthands
  kbuild: arm: Do not define "comma" twice
  kbuild: remove obj-n and lib-n handling
  kbuild: remove unnecessary variable initializaions
  kbuild: remove unnecessary "obj- := dummy.o" trick
  kbuild: handle C=... and M=... after entering into build directory
  kbuild: use $(Q) for sub-make target
  kbuild: fake the "Entering directory ..." message more simply
  kconfig/lxdialog: get ncurses CFLAGS with pkg-config
  kconfig: nconfig: fix multi-byte UTF handling
  kconfig: lxdialog: fix spelling
  kbuild: Make scripts executable
  kbuild: remove redundant clean-files from scripts/kconfig/Makefile
  kbuild: refactor script/kconfig/Makefile
  kbuild: handle the dependency of multi-objs hostprogs appropriately
  kbuild: handle multi-objs dependency appropriately
parents 1b5a5f59 30142230

Makefile

+40 −48
Original line number Diff line number Diff line
@@ -10,11 +10,9 @@ NAME = Shuffling Zombie Juror 
# Comments in this file are targeted only to the developer, do not

# expect to learn how to build the kernel reading this file.



# Do not:

# o  use make's built-in rules and variables

# Do not use make's built-in rules and variables

# (this increases performance and avoids hard-to-debug behaviour);

# o  print "Entering directory ...";

MAKEFLAGS += -rR --no-print-directory

MAKEFLAGS += -rR



# Avoid funny character set dependencies

unexport LC_ALL
@@ -97,34 +95,6 @@ endif 


export quiet Q KBUILD_VERBOSE



# Call a source code checker (by default, "sparse") as part of the

# C compilation.

#

# Use 'make C=1' to enable checking of only re-compiled files.

# Use 'make C=2' to enable checking of *all* source files, regardless

# of whether they are re-compiled or not.

#

# See the file "Documentation/sparse.txt" for more details, including

# where to get the "sparse" utility.



ifeq ("$(origin C)", "command line")

  KBUILD_CHECKSRC = $(C)

endif

ifndef KBUILD_CHECKSRC

  KBUILD_CHECKSRC = 0

endif



# Use make M=dir to specify directory of external module to build

# Old syntax make ... SUBDIRS=$PWD is still supported

# Setting the environment variable KBUILD_EXTMOD take precedence

ifdef SUBDIRS

  KBUILD_EXTMOD ?= $(SUBDIRS)

endif



ifeq ("$(origin M)", "command line")

  KBUILD_EXTMOD := $(M)

endif



# kbuild supports saving output files in a separate directory.

# To locate output files in a separate directory two syntaxes are supported.

# In both cases the working directory must be the root of the kernel src.
@@ -140,7 +110,6 @@ endif 
# The O= assignment takes precedence over the KBUILD_OUTPUT environment

# variable.





# KBUILD_SRC is set on invocation of make in OBJ directory

# KBUILD_SRC is not intended to be used by the regular user (for now)

ifeq ($(KBUILD_SRC),)
@@ -172,17 +141,9 @@ PHONY += $(MAKECMDGOALS) sub-make 
$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

	@:



# Fake the "Entering directory" message once, so that IDEs/editors are

# able to understand relative filenames.

       echodir := @echo

 quiet_echodir := @echo

silent_echodir := @:

sub-make: FORCE

	$($(quiet)echodir) "make[1]: Entering directory \`$(KBUILD_OUTPUT)'"

	$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \

	KBUILD_SRC=$(CURDIR) \

	KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \

	$(filter-out _all sub-make,$(MAKECMDGOALS))

	$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \

	-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))



# Leave processing to above invocation of make

skip-makefile := 1
@@ -192,6 +153,39 @@ endif # ifeq ($(KBUILD_SRC),) 
# We process the rest of the Makefile if this is the final invocation of make

ifeq ($(skip-makefile),)



# Do not print "Entering directory ...",

# but we want to display it when entering to the output directory

# so that IDEs/editors are able to understand relative filenames.

MAKEFLAGS += --no-print-directory



# Call a source code checker (by default, "sparse") as part of the

# C compilation.

#

# Use 'make C=1' to enable checking of only re-compiled files.

# Use 'make C=2' to enable checking of *all* source files, regardless

# of whether they are re-compiled or not.

#

# See the file "Documentation/sparse.txt" for more details, including

# where to get the "sparse" utility.



ifeq ("$(origin C)", "command line")

  KBUILD_CHECKSRC = $(C)

endif

ifndef KBUILD_CHECKSRC

  KBUILD_CHECKSRC = 0

endif



# Use make M=dir to specify directory of external module to build

# Old syntax make ... SUBDIRS=$PWD is still supported

# Setting the environment variable KBUILD_EXTMOD take precedence

ifdef SUBDIRS

  KBUILD_EXTMOD ?= $(SUBDIRS)

endif



ifeq ("$(origin M)", "command line")

  KBUILD_EXTMOD := $(M)

endif



# If building an external module we do not care about the all: rule

# but instead _all depend on modules

PHONY += all
@@ -889,9 +883,7 @@ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 
		     $(net-y) $(net-m) $(libs-y) $(libs-m)))



vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \

		     $(init-n) $(init-) \

		     $(core-n) $(core-) $(drivers-n) $(drivers-) \

		     $(net-n)  $(net-)  $(libs-n)    $(libs-))))

		     $(init-) $(core-) $(drivers-) $(net-) $(libs-))))



init-y		:= $(patsubst %/, %/built-in.o, $(init-y))

core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
@@ -1591,7 +1583,7 @@ endif 
# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir

# Usage:

# $(Q)$(MAKE) $(clean)=dir

clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj

clean := -f $(srctree)/scripts/Makefile.clean obj



endif	# skip-makefile

arch/arm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ AS += -EL 
LD		+= -EL

endif



comma = ,



# This selects which instruction set is used.

# Note that GCC does not numerically define an architecture version

# macro, but instead defines a whole series of macros which makes

arch/arm/mach-at91/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
#



obj-y		:= gpio.o setup.o sysirq_mask.o

obj-m		:=

obj-n		:=

obj-		:=



obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

arch/arm/mach-ebsa110/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -5,6 +5,3 @@ 
# Object file lists.



obj-y			:= core.o io.o leds.o
 
obj-m			:=

obj-n			:=

obj-			:=

arch/arm/mach-ep93xx/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
# Makefile for the linux kernel.

#

obj-y			:= core.o clock.o

obj-m			:=

obj-n			:=

obj-			:=



obj-$(CONFIG_EP93XX_DMA)	+= dma.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE