Skip to content

Commit ff8583d

Browse files
torvaldstorvalds
committed
Merge tag 'kbuild-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada: - remove unneeded use of cc-option, cc-disable-warning, cc-ldoption - exclude tracked files from .gitignore - re-enable -Wint-in-bool-context warning - refactor samples/Makefile - stop building immediately if syncconfig fails - do not sprinkle error messages when $(CC) does not exist - move arch/alpha/defconfig to the configs subdirectory - remove crappy header search path manipulation - add comment lines to .config to clarify the end of menu blocks - check uniqueness of module names (adding new warnings intentionally) * tag 'kbuild-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (24 commits) kconfig: use 'else ifneq' for Makefile to improve readability kbuild: check uniqueness of module names kconfig: Terminate menu blocks with a comment in the generated config kbuild: add LICENSES to KBUILD_ALLDIRS kbuild: remove 'addtree' and 'flags' magic for header search paths treewide: prefix header search paths with $(srctree)/ media: prefix header search paths with $(srctree)/ media: remove unneeded header search paths alpha: move arch/alpha/defconfig to arch/alpha/configs/defconfig kbuild: terminate Kconfig when $(CC) or $(LD) is missing kbuild: turn auto.conf.cmd into a mandatory include file .gitignore: exclude .get_maintainer.ignore and .gitattributes kbuild: add all Clang-specific flags unconditionally kbuild: Don't try to add '-fcatch-undefined-behavior' flag kbuild: add some extra warning flags unconditionally kbuild: add -Wvla flag unconditionally arch: remove dangling asm-generic wrappers samples: guard sub-directories with CONFIG options kbuild: re-enable int-in-bool-context warning MAINTAINERS: kbuild: Add pattern for scripts/*vmlinux* ...
2 parents f23d871 + fc2694e commit ff8583d

File tree

74 files changed

+178
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+178
-172
lines changed

‎.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ modules.builtin
8181
/tar-install/
8282

8383
#
84-
# git files that we don't want to ignore even if they are dot-files
84+
# We don't want to ignore the following even if they are dot-files
8585
#
86+
!.clang-format
87+
!.cocciconfig
88+
!.get_maintainer.ignore
89+
!.gitattributes
8690
!.gitignore
8791
!.mailmap
88-
!.cocciconfig
89-
!.clang-format
9092

9193
#
9294
# Generated include files

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8542,6 +8542,7 @@ F: scripts/Kbuild*
85428542
F: scripts/Makefile*
85438543
F: scripts/basic/
85448544
F: scripts/mk*
8545+
F: scripts/*vmlinux*
85458546
F: scripts/mod/
85468547
F: scripts/package/
85478548

‎Makefile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ endif
537537
# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
538538
# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
539539
# and from include/config/auto.conf.cmd to detect the compiler upgrade.
540-
CC_VERSION_TEXT = $(shell $(CC) --version | head -n 1)
540+
CC_VERSION_TEXT = $(shell $(CC) --version 2>/dev/null | head -n 1)
541541

542542
ifeq ($(config-targets),1)
543543
# ===========================================================================
@@ -651,7 +651,7 @@ ifeq ($(may-sync-config),1)
651651
# Read in dependencies to all Kconfig* files, make sure to run syncconfig if
652652
# changes are detected. This should be included after arch/$(SRCARCH)/Makefile
653653
# because some architectures define CROSS_COMPILE there.
654-
-include include/config/auto.conf.cmd
654+
include include/config/auto.conf.cmd
655655

656656
$(KCONFIG_CONFIG):
657657
@echo >&2 '***'
@@ -692,7 +692,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
692692
KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
693693
KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
694694
KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
695-
KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
696695
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
697696

698697
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -732,16 +731,15 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG) := -fstack-protector-strong
732731
KBUILD_CFLAGS += $(stackp-flags-y)
733732

734733
ifdef CONFIG_CC_IS_CLANG
735-
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
736-
KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
737-
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
734+
KBUILD_CPPFLAGS += -Qunused-arguments
735+
KBUILD_CFLAGS += -Wno-format-invalid-specifier
736+
KBUILD_CFLAGS += -Wno-gnu
738737
# Quiet clang warning: comparison of unsigned expression < 0 is always false
739-
KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
738+
KBUILD_CFLAGS += -Wno-tautological-compare
740739
# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
741740
# source of a reference will be _MergedGlobals and not on of the whitelisted names.
742741
# See modpost pattern 2
743-
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
744-
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
742+
KBUILD_CFLAGS += -mno-global-merge
745743
else
746744

747745
# These warnings generated too much noise in a regular build.
@@ -842,7 +840,7 @@ NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
842840
KBUILD_CFLAGS += -Wdeclaration-after-statement
843841

844842
# Variable Length Arrays (VLAs) should not be used anywhere in the kernel
845-
KBUILD_CFLAGS += $(call cc-option,-Wvla)
843+
KBUILD_CFLAGS += -Wvla
846844

847845
# disable pointer signed / unsigned warnings in gcc 4.0
848846
KBUILD_CFLAGS += -Wno-pointer-sign
@@ -1018,7 +1016,7 @@ export KBUILD_VMLINUX_LIBS := $(libs-y1)
10181016
export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
10191017
export LDFLAGS_vmlinux
10201018
# used by scripts/package/Makefile
1021-
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch include scripts tools)
1019+
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)
10221020

10231021
vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
10241022

@@ -1290,6 +1288,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
12901288
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
12911289
@$(kecho) ' Building modules, stage 2.';
12921290
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
1291+
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh
12931292

12941293
modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
12951294
$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin

‎arch/alpha/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# Copyright (C) 1994 by Linus Torvalds
99
#
1010

11+
KBUILD_DEFCONFIG := defconfig
12+
1113
NM := $(NM) -B
1214

1315
LDFLAGS_vmlinux := -static -N #-relax

‎arch/alpha/defconfig renamed to ‎arch/alpha/configs/defconfig

File renamed without changes.

‎arch/csky/boot/dts/include/dt-bindings

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎arch/csky/include/asm/Kbuild

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
generic-y += asm-offsets.h
22
generic-y += bugs.h
3-
generic-y += clkdev.h
43
generic-y += compat.h
54
generic-y += current.h
65
generic-y += delay.h
@@ -29,15 +28,12 @@ generic-y += local64.h
2928
generic-y += mm-arch-hooks.h
3029
generic-y += mmiowb.h
3130
generic-y += module.h
32-
generic-y += mutex.h
3331
generic-y += pci.h
3432
generic-y += percpu.h
3533
generic-y += preempt.h
3634
generic-y += qrwlock.h
37-
generic-y += scatterlist.h
3835
generic-y += sections.h
3936
generic-y += serial.h
40-
generic-y += shm.h
4137
generic-y += timex.h
4238
generic-y += topology.h
4339
generic-y += trace_clock.h

‎arch/h8300/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ generic-y += pci.h
3838
generic-y += percpu.h
3939
generic-y += pgalloc.h
4040
generic-y += preempt.h
41-
generic-y += scatterlist.h
4241
generic-y += sections.h
4342
generic-y += serial.h
4443
generic-y += shmparam.h

‎arch/ia64/kernel/Makefile.gate

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ quiet_cmd_gate = GATE $@
1111
cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
1212

1313
GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
14-
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
14+
-Wl,--hash-style=sysv
1515
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
1616
$(call if_changed,gate)
1717

‎arch/mips/pnx833x/Platform

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NXP STB225
22
platform-$(CONFIG_SOC_PNX833X) += pnx833x/
3-
cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x
3+
cflags-$(CONFIG_SOC_PNX833X) += -I $(srctree)/arch/mips/include/asm/mach-pnx833x
44
load-$(CONFIG_NXP_STB220) += 0xffffffff80001000
55
load-$(CONFIG_NXP_STB225) += 0xffffffff80001000

‎arch/nds32/include/asm/Kbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ generic-y += bitops.h
44
generic-y += bug.h
55
generic-y += bugs.h
66
generic-y += checksum.h
7-
generic-y += clkdev.h
87
generic-y += cmpxchg.h
98
generic-y += compat.h
10-
generic-y += cputime.h
119
generic-y += device.h
1210
generic-y += div64.h
1311
generic-y += dma.h
@@ -26,7 +24,6 @@ generic-y += kdebug.h
2624
generic-y += kmap_types.h
2725
generic-y += kprobes.h
2826
generic-y += kvm_para.h
29-
generic-y += limits.h
3027
generic-y += local.h
3128
generic-y += local64.h
3229
generic-y += mm-arch-hooks.h

‎arch/powerpc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ endif
211211

212212
asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
213213

214-
KBUILD_CPPFLAGS += -Iarch/$(ARCH) $(asinstr)
214+
KBUILD_CPPFLAGS += -I $(srctree)/arch/$(ARCH) $(asinstr)
215215
KBUILD_AFLAGS += $(AFLAGS-y)
216216
KBUILD_CFLAGS += $(call cc-option,-msoft-float)
217217
KBUILD_CFLAGS += -pipe $(CFLAGS-y)

‎arch/riscv/include/asm/Kbuild

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
generic-y += bugs.h
22
generic-y += checksum.h
33
generic-y += compat.h
4-
generic-y += cputime.h
54
generic-y += device.h
65
generic-y += div64.h
76
generic-y += extable.h
@@ -12,7 +11,6 @@ generic-y += emergency-restart.h
1211
generic-y += exec.h
1312
generic-y += fb.h
1413
generic-y += hardirq.h
15-
generic-y += hash.h
1614
generic-y += hw_irq.h
1715
generic-y += irq_regs.h
1816
generic-y += irq_work.h
@@ -22,10 +20,8 @@ generic-y += kvm_para.h
2220
generic-y += local.h
2321
generic-y += local64.h
2422
generic-y += mm-arch-hooks.h
25-
generic-y += mutex.h
2623
generic-y += percpu.h
2724
generic-y += preempt.h
28-
generic-y += scatterlist.h
2925
generic-y += sections.h
3026
generic-y += serial.h
3127
generic-y += shmparam.h

‎arch/sh/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ cpuincdir-y += cpu-common # Must be last
191191
drivers-y += arch/sh/drivers/
192192
drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
193193

194-
cflags-y += $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \
195-
$(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
194+
cflags-y += $(foreach d, $(cpuincdir-y), -I $(srctree)/arch/sh/include/$(d)) \
195+
$(foreach d, $(machdir-y), -I $(srctree)/arch/sh/include/$(d))
196196

197197
KBUILD_CFLAGS += -pipe $(cflags-y)
198198
KBUILD_CPPFLAGS += $(cflags-y)

‎arch/sh/boot/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
zImage
22
vmlinux*
33
uImage*
4+
!vmlinux.scr

‎arch/sh/kernel/vsyscall/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ quiet_cmd_syscall = SYSCALL $@
1515

1616
export CPPFLAGS_vsyscall.lds += -P -C -Ush
1717

18-
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
19-
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
18+
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 -Wl,--hash-style=sysv
2019

2120
SYSCFLAGS_vsyscall-trapa.so = $(vsyscall-flags)
2221

‎arch/x86/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ endif
4242
# non-deterministic coverage.
4343
KCOV_INSTRUMENT := n
4444

45-
CFLAGS_irq.o := -I$(src)/../include/asm/trace
45+
CFLAGS_irq.o := -I $(srctree)/$(src)/../include/asm/trace
4646

4747
obj-y := process_$(BITS).o signal.o
4848
obj-$(CONFIG_COMPAT) += signal_compat.o

‎arch/x86/mm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CFLAGS_physaddr.o := $(nostackp)
2121
CFLAGS_setup_nx.o := $(nostackp)
2222
CFLAGS_mem_encrypt_identity.o := $(nostackp)
2323

24-
CFLAGS_fault.o := -I$(src)/../include/asm/trace
24+
CFLAGS_fault.o := -I $(srctree)/$(src)/../include/asm/trace
2525

2626
obj-$(CONFIG_X86_PAT) += pat_rbtree.o
2727

‎arch/xtensa/boot/lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ zlib := inffast.c inflate.c inftrees.c
77

88
lib-y += $(zlib:.c=.o) zmem.o
99

10-
ccflags-y := -Ilib/zlib_inflate
10+
ccflags-y := -I $(srctree)/lib/zlib_inflate
1111
ifdef CONFIG_FUNCTION_TRACER
1212
CFLAGS_REMOVE_inflate.o = -pg
1313
CFLAGS_REMOVE_zmem.o = -pg

‎arch/xtensa/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ generic-y += preempt.h
2727
generic-y += qrwlock.h
2828
generic-y += qspinlock.h
2929
generic-y += sections.h
30-
generic-y += socket.h
3130
generic-y += topology.h
3231
generic-y += trace_clock.h
3332
generic-y += vga.h

‎drivers/hid/intel-ish-hid/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ intel-ishtp-hid-objs += ishtp-hid-client.o
2323
obj-$(CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ishtp-loader.o
2424
intel-ishtp-loader-objs += ishtp-fw-loader.o
2525

26-
ccflags-y += -Idrivers/hid/intel-ish-hid/ishtp
26+
ccflags-y += -I $(srctree)/$(src)/ishtp

‎drivers/media/common/b2c2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o
44
b2c2-flexcop-objs += flexcop-hw-filter.o
55
obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
66

7-
ccflags-y += -Idrivers/media/dvb-frontends/
8-
ccflags-y += -Idrivers/media/tuners/
7+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
8+
ccflags-y += -I $(srctree)/drivers/media/tuners/

‎drivers/media/dvb-frontends/cxd2880/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ cxd2880-objs := cxd2880_common.o \
1414
cxd2880_top.o
1515

1616
obj-$(CONFIG_DVB_CXD2880) += cxd2880.o
17-
18-
ccflags-y += -Idrivers/media/dvb-frontends

‎drivers/media/i2c/smiapp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ smiapp-objs += smiapp-core.o smiapp-regs.o \
22
smiapp-quirk.o smiapp-limits.o
33
obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o
44

5-
ccflags-y += -Idrivers/media/i2c
5+
ccflags-y += -I $(srctree)/drivers/media/i2c

‎drivers/media/mmc/siano/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
22

3-
ccflags-y += -Idrivers/media/common/siano
4-
3+
ccflags-y += -I $(srctree)/drivers/media/common/siano

‎drivers/media/pci/b2c2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ endif
66
b2c2-flexcop-pci-objs += flexcop-pci.o
77
obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
88

9-
ccflags-y += -Idrivers/media/common/b2c2/
9+
ccflags-y += -I $(srctree)/drivers/media/common/b2c2/

‎drivers/media/pci/bt8xx/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
66
obj-$(CONFIG_VIDEO_BT848) += bttv.o
77
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
88

9-
ccflags-y += -Idrivers/media/dvb-frontends
10-
ccflags-y += -Idrivers/media/common
11-
ccflags-y += -Idrivers/media/tuners
9+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
10+
ccflags-y += -I $(srctree)/drivers/media/tuners

‎drivers/media/pci/cx18/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
99
obj-$(CONFIG_VIDEO_CX18) += cx18.o
1010
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
1111

12-
ccflags-y += -Idrivers/media/dvb-frontends
13-
ccflags-y += -Idrivers/media/tuners
12+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
13+
ccflags-y += -I $(srctree)/drivers/media/tuners

‎drivers/media/pci/cx23885/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \
88
obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
99
obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
1010

11-
ccflags-y += -Idrivers/media/tuners
12-
ccflags-y += -Idrivers/media/dvb-frontends
11+
ccflags-y += -I $(srctree)/drivers/media/tuners
12+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
1313

1414
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

‎drivers/media/pci/cx88/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o
1010
obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o
1111
obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
1212
obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
13-
ccflags-y += -Idrivers/media/tuners
14-
ccflags-y += -Idrivers/media/dvb-frontends
13+
ccflags-y += -I $(srctree)/drivers/media/tuners
14+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends

‎drivers/media/pci/ddbridge/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ddbridge-objs := ddbridge-main.o ddbridge-core.o ddbridge-ci.o \
99

1010
obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
1111

12-
ccflags-y += -Idrivers/media/dvb-frontends/
13-
ccflags-y += -Idrivers/media/tuners/
12+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
13+
ccflags-y += -I $(srctree)/drivers/media/tuners/

‎drivers/media/pci/dm1105/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
obj-$(CONFIG_DVB_DM1105) += dm1105.o
22

3-
ccflags-y += -Idrivers/media/dvb-frontends
3+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends

‎drivers/media/pci/mantis/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ obj-$(CONFIG_MANTIS_CORE) += mantis_core.o
2626
obj-$(CONFIG_DVB_MANTIS) += mantis.o
2727
obj-$(CONFIG_DVB_HOPPER) += hopper.o
2828

29-
ccflags-y += -Idrivers/media/dvb-frontends/
29+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/

‎drivers/media/pci/netup_unidvb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ netup-unidvb-objs += netup_unidvb_spi.o
66

77
obj-$(CONFIG_DVB_NETUP_UNIDVB) += netup-unidvb.o
88

9-
ccflags-y += -Idrivers/media/dvb-frontends
9+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends

‎drivers/media/pci/ngene/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
77

88
obj-$(CONFIG_DVB_NGENE) += ngene.o
99

10-
ccflags-y += -Idrivers/media/dvb-frontends/
11-
ccflags-y += -Idrivers/media/tuners/
10+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
11+
ccflags-y += -I $(srctree)/drivers/media/tuners/

‎drivers/media/pci/pluto2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
22

3-
ccflags-y += -Idrivers/media/dvb-frontends/
3+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/

‎drivers/media/pci/pt1/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ earth-pt1-objs := pt1.o
22

33
obj-$(CONFIG_DVB_PT1) += earth-pt1.o
44

5-
ccflags-y += -Idrivers/media/dvb-frontends
6-
ccflags-y += -Idrivers/media/tuners
5+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
6+
ccflags-y += -I $(srctree)/drivers/media/tuners

0 commit comments

Comments
 (0)