- breakup lines of compile.c and add a variable to hold filter-out PHONY target.

  No functional changes.

diff --git a/Makerules b/Makerules
index 1226f05..b6a91c5 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -4,6 +4,7 @@
 
 .SUFFIXES: .c .S .o .os .oS .so .a .s .i
 
+PHONY := FORCE
 # order is important, the stripping uses STRIP_FLAGS for lib-so, but not for lib-a
 ifeq ($(HAVE_SHARED),y)
 .LIBPATTERNS: "lib%.so"
@@ -107,7 +108,7 @@ disp_t_strip   = $($(DISP)_disp_t_strip)
 disp_ar        = $($(DISP)_disp_ar)
 disp_ld        = $($(DISP)_disp_ld)
 
-any-prereq = $(filter-out FORCE,$?) $(filter-out FORCE $(wildcard $^),$^)
+any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)
 
 # True if not identical. Neither order nor whitespace nor identical flags
 # matter.
@@ -124,7 +125,13 @@ maybe_exec = $(if $(strip $(compare_flags) $(any-prereq)), \
 
 CFLAGS_gen.dep = -MT $@ -MD -MF $(dir $@).$(notdir $@).dep
 
-cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(<D)))) $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))  $(CFLAGS_gen.dep)
+cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) \
+       $(CFLAGS-$(suffix $@)) \
+       $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(<D)))) \
+       $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) \
+       $(CFLAGS-$(notdir $<)) \
+       $(CFLAGS-$(notdir $@)) \
+       $(CFLAGS_gen.dep)
 cmd_compile.i = $(cmd_compile.c:-c=-E -dD)
 cmd_compile.s = $(cmd_compile.c:-c=-S)
 cmd_compile.u = $(CC) $^ $(DEPS-$(notdir $@)) -o $@ $(CFLAGS) $(CFLAGS-$(notdir $(^D))) $(CFLAGS-$(notdir $@)) $(CFLAGS_gen.dep)
@@ -337,7 +344,7 @@ ifdef .depends.dep
 -include $(.depends.dep)
 endif
 
-.PHONY: dummy FORCE
+.PHONY: dummy $(PHONY)
 FORCE:
 
 clean: objclean-y headers_clean-y