diff options
author | Sam Ravnborg <sam@neptun.(none)> | 2007-09-30 14:34:36 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-12 15:20:32 -0400 |
commit | 836caba77c290a62743fa9c5a69ed9605ec9cb28 (patch) | |
tree | 09ac98064c9effcb9ea3f4bfdcd89b4d918ff242 | |
parent | 5e54d5e5fbc1f7237930af8466caf3cefd13b9bd (diff) |
kbuild: kill backward compatibility checks
These checks has been present for several kernel releases (> 5).
So lets just get rid of them.
With this we no longer check for use of:
EXTRA_TARGETS, O_TARGET, L_TARGET, list-multi, export-objs
There were three remaining in-tree users of O_TARGET in some
unmaintained sh64 code - mail sent to the maintainer + list.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | scripts/Makefile.build | 25 | ||||
-rw-r--r-- | scripts/Makefile.clean | 2 | ||||
-rw-r--r-- | scripts/Makefile.lib | 4 |
3 files changed, 2 insertions, 29 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index e74a837690e5..8ef1d61ec228 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
@@ -55,31 +55,6 @@ _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) | |||
55 | _dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d))) | 55 | _dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d))) |
56 | endif | 56 | endif |
57 | 57 | ||
58 | |||
59 | ifdef EXTRA_TARGETS | ||
60 | $(warning kbuild: $(obj)/Makefile - Usage of EXTRA_TARGETS is obsolete in 2.6. Please fix!) | ||
61 | endif | ||
62 | |||
63 | ifdef build-targets | ||
64 | $(warning kbuild: $(obj)/Makefile - Usage of build-targets is obsolete in 2.6. Please fix!) | ||
65 | endif | ||
66 | |||
67 | ifdef export-objs | ||
68 | $(warning kbuild: $(obj)/Makefile - Usage of export-objs is obsolete in 2.6. Please fix!) | ||
69 | endif | ||
70 | |||
71 | ifdef O_TARGET | ||
72 | $(warning kbuild: $(obj)/Makefile - Usage of O_TARGET := $(O_TARGET) is obsolete in 2.6. Please fix!) | ||
73 | endif | ||
74 | |||
75 | ifdef L_TARGET | ||
76 | $(error kbuild: $(obj)/Makefile - Use of L_TARGET is replaced by lib-y in 2.6. Please fix!) | ||
77 | endif | ||
78 | |||
79 | ifdef list-multi | ||
80 | $(warning kbuild: $(obj)/Makefile - list-multi := $(list-multi) is obsolete in 2.6. Please fix!) | ||
81 | endif | ||
82 | |||
83 | ifndef obj | 58 | ifndef obj |
84 | $(warning kbuild: Makefile.build is included improperly) | 59 | $(warning kbuild: Makefile.build is included improperly) |
85 | endif | 60 | endif |
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index cff33498fa16..2c647107c9cc 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean | |||
@@ -40,7 +40,7 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn)) | |||
40 | # build a list of files to remove, usually releative to the current | 40 | # build a list of files to remove, usually releative to the current |
41 | # directory | 41 | # directory |
42 | 42 | ||
43 | __clean-files := $(extra-y) $(EXTRA_TARGETS) $(always) \ | 43 | __clean-files := $(extra-y) $(always) \ |
44 | $(targets) $(clean-files) \ | 44 | $(targets) $(clean-files) \ |
45 | $(host-progs) \ | 45 | $(host-progs) \ |
46 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) | 46 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) |
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 03905aa620cc..e6ce7b107e49 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -1,5 +1,3 @@ | |||
1 | # Backward compatibility - to be removed... | ||
2 | extra-y += $(EXTRA_TARGETS) | ||
3 | # Figure out what we need to build from the various variables | 1 | # Figure out what we need to build from the various variables |
4 | # =========================================================================== | 2 | # =========================================================================== |
5 | 3 | ||
@@ -140,7 +138,7 @@ $(obj)/%:: $(src)/%_shipped | |||
140 | # target: source(s) FORCE | 138 | # target: source(s) FORCE |
141 | # $(if_changed,ld/objcopy/gzip) | 139 | # $(if_changed,ld/objcopy/gzip) |
142 | # | 140 | # |
143 | # and add target to EXTRA_TARGETS so that we know we have to | 141 | # and add target to extra-y so that we know we have to |
144 | # read in the saved command line | 142 | # read in the saved command line |
145 | 143 | ||
146 | # Linking | 144 | # Linking |