Skip to content

Commit 60641aa

Browse files
sravnborgsravnborg
committed
include: replace unifdef-y with header-y
unifdef-y and header-y has same semantic. So there is no need to have both. Drop the unifdef-y variant and sort all lines again Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
1 parent c29c08b commit 60641aa

15 files changed

Lines changed: 321 additions & 325 deletions

File tree

‎include/asm-generic/Kbuild‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ header-y += bitsperlong.h
33
header-y += errno-base.h
44
header-y += errno.h
55
header-y += fcntl.h
6+
header-y += int-l64.h
7+
header-y += int-ll64.h
68
header-y += ioctl.h
79
header-y += ioctls.h
810
header-y += ipcbuf.h
@@ -12,10 +14,12 @@ header-y += msgbuf.h
1214
header-y += param.h
1315
header-y += poll.h
1416
header-y += posix_types.h
17+
header-y += resource.h
1518
header-y += sembuf.h
1619
header-y += setup.h
1720
header-y += shmbuf.h
1821
header-y += shmparam.h
22+
header-y += siginfo.h
1923
header-y += signal-defs.h
2024
header-y += signal.h
2125
header-y += socket.h
@@ -28,8 +32,3 @@ header-y += termios.h
2832
header-y += types.h
2933
header-y += ucontext.h
3034
header-y += unistd.h
31-
32-
unifdef-y += int-l64.h
33-
unifdef-y += int-ll64.h
34-
unifdef-y += resource.h
35-
unifdef-y += siginfo.h

‎include/asm-generic/Kbuild.asm‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
2-
$(srctree)/include/asm-$(SRCARCH)/kvm.h),)
2+
$(srctree)/include/asm-$(SRCARCH)/kvm.h),)
33
header-y += kvm.h
44
endif
55

@@ -9,36 +9,37 @@ header-y += kvm_para.h
99
endif
1010

1111
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
12-
$(srctree)/include/asm-$(SRCARCH)/a.out.h),)
13-
unifdef-y += a.out.h
12+
$(srctree)/include/asm-$(SRCARCH)/a.out.h),)
13+
header-y += a.out.h
1414
endif
15-
unifdef-y += auxvec.h
16-
unifdef-y += byteorder.h
17-
unifdef-y += bitsperlong.h
18-
unifdef-y += errno.h
19-
unifdef-y += fcntl.h
20-
unifdef-y += ioctl.h
21-
unifdef-y += ioctls.h
22-
unifdef-y += ipcbuf.h
23-
unifdef-y += mman.h
24-
unifdef-y += msgbuf.h
25-
unifdef-y += param.h
26-
unifdef-y += poll.h
27-
unifdef-y += posix_types.h
28-
unifdef-y += ptrace.h
29-
unifdef-y += resource.h
30-
unifdef-y += sembuf.h
31-
unifdef-y += setup.h
32-
unifdef-y += shmbuf.h
33-
unifdef-y += sigcontext.h
34-
unifdef-y += siginfo.h
35-
unifdef-y += signal.h
36-
unifdef-y += socket.h
37-
unifdef-y += sockios.h
38-
unifdef-y += stat.h
39-
unifdef-y += statfs.h
40-
unifdef-y += swab.h
41-
unifdef-y += termbits.h
42-
unifdef-y += termios.h
43-
unifdef-y += types.h
44-
unifdef-y += unistd.h
15+
16+
header-y += auxvec.h
17+
header-y += bitsperlong.h
18+
header-y += byteorder.h
19+
header-y += errno.h
20+
header-y += fcntl.h
21+
header-y += ioctl.h
22+
header-y += ioctls.h
23+
header-y += ipcbuf.h
24+
header-y += mman.h
25+
header-y += msgbuf.h
26+
header-y += param.h
27+
header-y += poll.h
28+
header-y += posix_types.h
29+
header-y += ptrace.h
30+
header-y += resource.h
31+
header-y += sembuf.h
32+
header-y += setup.h
33+
header-y += shmbuf.h
34+
header-y += sigcontext.h
35+
header-y += siginfo.h
36+
header-y += signal.h
37+
header-y += socket.h
38+
header-y += sockios.h
39+
header-y += stat.h
40+
header-y += statfs.h
41+
header-y += swab.h
42+
header-y += termbits.h
43+
header-y += termios.h
44+
header-y += types.h
45+
header-y += unistd.h

‎include/drm/Kbuild‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
unifdef-y += drm.h drm_sarea.h drm_mode.h
2-
unifdef-y += i810_drm.h
3-
unifdef-y += i830_drm.h
4-
unifdef-y += i915_drm.h
5-
unifdef-y += mga_drm.h
6-
unifdef-y += r128_drm.h
7-
unifdef-y += radeon_drm.h
8-
unifdef-y += sis_drm.h
9-
unifdef-y += savage_drm.h
10-
unifdef-y += vmwgfx_drm.h
11-
unifdef-y += via_drm.h
12-
unifdef-y += nouveau_drm.h
1+
header-y += drm.h
2+
header-y += drm_mode.h
3+
header-y += drm_sarea.h
4+
header-y += i810_drm.h
5+
header-y += i830_drm.h
6+
header-y += i915_drm.h
7+
header-y += mga_drm.h
8+
header-y += nouveau_drm.h
9+
header-y += r128_drm.h
10+
header-y += radeon_drm.h
11+
header-y += savage_drm.h
12+
header-y += sis_drm.h
13+
header-y += via_drm.h
14+
header-y += vmwgfx_drm.h

0 commit comments

Comments
 (0)