diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2003-03-10 01:16:02 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2003-03-10 01:16:02 +0100 |
| commit | f94e5fd7e5d09a56a60670a9bb211a791654bba8 (patch) | |
| tree | d7b7bb2b69b850191811d6d02c91ca6cbd0871be /scripts/Makefile.build | |
| parent | 0be6a9a0863c2c1a99f0747c6283450b699dcaf9 (diff) | |
kbuild: Introduced extra-y, as replacement for EXTRA_TARGETS
EXTRA_TARGETS has been overloaded with functionality.
This is now split in two:
targets := list targets kbuild did not know of otherwise
extra-y := list targets to be build when not building modules only.
extra-y is mainly used to list .o files that is not to be included
in the fnal built-in.o file for a directory.
Diffstat (limited to 'scripts/Makefile.build')
| -rw-r--r-- | scripts/Makefile.build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 7f5fbbd1111c..d54b2dc5d1e8 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -15,6 +15,10 @@ include $(obj)/Makefile include scripts/Makefile.lib +ifdef EXTRA_TARGETS +$(warning kbuild: $(obj)/Makefile - Usage of EXTRA_TARGETS is obsolete in 2.5. Please fix!) +endif + ifdef export-objs $(warning kbuild: $(obj)/Makefile - Usage of export-objs is obsolete in 2.5. Please fix!) endif @@ -53,7 +57,7 @@ endif touch-module = @echo $(@:.o=.ko) > $(MODVERDIR)/$(@F:.o=.mod) -__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \ +__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(extra-y)) \ $(if $(KBUILD_MODULES),$(obj-m)) \ $(subdir-ym) $(build-targets) @: @@ -198,7 +202,7 @@ cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< %.o: %.S FORCE $(call if_changed_dep,as_o_S) -targets += $(real-objs-y) $(real-objs-m) $(EXTRA_TARGETS) $(MAKECMDGOALS) \ +targets += $(real-objs-y) $(real-objs-m) $(extra-y) $(MAKECMDGOALS) \ $(build-targets) # Build the compiled-in targets |