kbuild: Silence kbuild with make V=0

With make version 3.80 kbuild echo'ed the fixdep command
executed each time a c file was compiled.
This has been tracked down to a bug in version 3.80 of make.
Avoiding newlines in canned command sequences avoid this problem.

At the same time consolidated similar code in Makefile.build,
and avoiding a few ifdef/endif pairs resulting in a more readable makefile.

scripts/Makefile.build

@@ -71,55 +71,7 @@ ifneq ($(KBUILD_CHECKSRC),0)
 quiet_cmd_checksrc = CHECK   $<
       cmd_checksrc = $(CHECK) $(c_flags) $< ;
 endif
- 
-# Module versioning
-# ---------------------------------------------------------------------------
-
-ifdef CONFIG_MODVERSIONS
-
-# $(call if_changed_rule,vcc_o_c) does essentially the same as the
-# normal $(call if_changed_dep,cc_o_c), i.e. compile an object file
-# from a C file, keeping track of the command line and dependencies.
-#
-# However, actually it does:
-# o compile a .tmp_<file>.o from <file>.c
-# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
-#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
-#   are done.
-# o otherwise, we calculate symbol versions using the good old
-#   genksyms on the preprocessed source and postprocess them in a way
-#   that they are usable as a linker script
-# o generate <file>.o from .tmp_<file>.o using the linker to
-#   replace the unresolved symbols __crc_exported_symbol with
-#   the actual value of the checksum generated by genksyms
 
-quiet_cmd_vcc_o_c = CC $(quiet_modtag)  $@
-cmd_vcc_o_c       = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
-
-define rule_vcc_o_c
-	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)	      \
-	$(cmd_checksrc)							      \
-	$(if $($(quiet)cmd_vcc_o_c),echo '  $($(quiet)cmd_vcc_o_c)';)	      \
-	$(cmd_vcc_o_c);							      \
-									      \
-	if ! $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	      \
-		mv $(@D)/.tmp_$(@F) $@;					      \
-	else								      \
-		$(CPP) -D__GENKSYMS__ $(c_flags) $<			      \
-		| $(GENKSYMS)						      \
-		> $(@D)/.tmp_$(@F:.o=.ver);				      \
-									      \
-		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		      \
-			-T $(@D)/.tmp_$(@F:.o=.ver);			      \
-		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	      \
-	fi;			
-					      \
-	scripts/fixdep $(depfile) $@ '$(cmd_vcc_o_c)' > $(@D)/.$(@F).tmp;     \
-	rm -f $(depfile);						      \
-	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
-endef
-
-endif
 
 # Compile C sources (.c)
 # ---------------------------------------------------------------------------
@@ -164,35 +116,63 @@ cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
 %.i: %.c FORCE
 	$(call if_changed_dep,cc_i_c)
 
+# C (.c) files
+# The C file is compiled and updated dependency information is generated.
+# (See cmd_cc_o_c + relevant part of rule_cc_o_c)
+
 quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
-cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $<
+
+ifndef CONFIG_MODVERSIONS
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
+
+else
+# When module versioning is enabled the following steps are executed:
+# o compile a .tmp_<file>.o from <file>.c
+# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
+#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
+#   are done.
+# o otherwise, we calculate symbol versions using the good old
+#   genksyms on the preprocessed source and postprocess them in a way
+#   that they are usable as a linker script
+# o generate <file>.o from .tmp_<file>.o using the linker to
+#   replace the unresolved symbols __crc_exported_symbol with
+#   the actual value of the checksum generated by genksyms
+
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
+cmd_modversions =							\
+	if ! $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	\
+		mv $(@D)/.tmp_$(@F) $@;					\
+	else								\
+		$(CPP) -D__GENKSYMS__ $(c_flags) $<			\
+		| $(GENKSYMS)						\
+		> $(@D)/.tmp_$(@F:.o=.ver);				\
+									\
+		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
+			-T $(@D)/.tmp_$(@F:.o=.ver);			\
+		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	\
+	fi;
+endif
+
 define rule_cc_o_c
-	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)	      \
-	$(cmd_checksrc)							      \
-	$(if $($(quiet)cmd_cc_o_c),echo '  $($(quiet)cmd_cc_o_c)';)	      \
-	$(cmd_cc_o_c);							      \
-	scripts/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp;      \
-	rm -f $(depfile);						      \
+	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)   \
+	$(cmd_checksrc)							  \
+	$(if $($(quiet)cmd_cc_o_c),echo '  $($(quiet)cmd_cc_o_c)';)	  \
+	$(cmd_cc_o_c);							  \
+	$(cmd_modversions)						  \
+	scripts/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp;  \
+	rm -f $(depfile);						  \
 	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
 endef
 
 # Built-in and composite module parts
 
 %.o: %.c FORCE
-ifdef CONFIG_MODVERSIONS
-	$(call if_changed_rule,vcc_o_c)
-else
 	$(call if_changed_rule,cc_o_c)
-endif
 
 # Single-part modules are special since we need to mark them in $(MODVERDIR)
 
 $(single-used-m): %.o: %.c FORCE
-ifdef CONFIG_MODVERSIONS
-	$(call if_changed_rule,vcc_o_c)
-else
 	$(call if_changed_rule,cc_o_c)
-endif
 	$(touch-module)
 
 quiet_cmd_cc_lst_c = MKLST   $@