Change expand_subsys function so that it preserves the relative order of

the files passed as argument.  This is desirable so that the dtrace rule
in src/backend/Makefile works.

diff --git a/src/backend/common.mk b/src/backend/common.mk
index 1ae6f54d53df885dccd06fe9a79b6e00403772e0..fef03728afb158e773ecd6a5253e39ce1e38394f 100644 (file)
--- a/src/backend/common.mk
+++ b/src/backend/common.mk
@@ -33,7 +33,7 @@ objfiles.txt:: $(SUBDIROBJS) $(OBJS)
        touch $@
 
 # make function to expand objfiles.txt contents
-expand_subsys = $(foreach file,$(filter %/objfiles.txt,$(1)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file))))) $(filter-out %/objfiles.txt,$(1))
+expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file)))
 
 # Parallel make trickery
 $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;