summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2015-12-11 17:33:11 +0100
committerMichal Marek <mmarek@suse.com>2015-12-11 17:33:11 +0100
commit45538834d1f5a7b4d1e23fc4c797fa5f0b5e405b (patch)
tree879af8a5cf5c60b51250b48d791badd285074819 /Makefile
parente363ffcc82a6ad5381052c2f88ca5b5ed9298439 (diff)
parentee11b768cfaf48561684af478d1bf6342133c571 (diff)
downloadlinux-next-45538834d1f5a7b4d1e23fc4c797fa5f0b5e405b.tar.gz
Merge branch 'kbuild/kbuild' into kbuild/for-next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a3588f77812c..92bcf93a51cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1282,7 +1282,7 @@ help:
@echo ' firmware_install- Install all firmware to INSTALL_FW_PATH'
@echo ' (default: $$(INSTALL_MOD_PATH)/lib/firmware)'
@echo ' dir/ - Build all files in dir and below'
- @echo ' dir/file.[oisS] - Build specified target only'
+ @echo ' dir/file.[ois] - Build specified target only'
@echo ' dir/file.lst - Build specified mixed source/assembly target only'
@echo ' (requires a recent binutils and recent build (System.map))'
@echo ' dir/file.ko - Build module including final link'
@@ -1557,6 +1557,8 @@ endif
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.s: %.S prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+%.i: %.S prepare scripts FORCE
+ $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.o: %.S prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.symtypes: %.c prepare scripts FORCE