Change expand_subsys function so that it preserves the relative order of

petere · petere · commit b8eef28353e4 · 2008-02-27T20:31:01.000Z
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
@@ -1,7 +1,7 @@
 #
 # Common make rules for backend
 #
-# $PostgreSQL: pgsql/src/backend/common.mk,v 1.4 2008/02/26 08:23:31 petere Exp $
+# $PostgreSQL: pgsql/src/backend/common.mk,v 1.5 2008/02/27 20:31:01 petere Exp $
 #
 
 # When including this file, set OBJS to the object files created in
@@ -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) ;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Common make rules for backend`
`3`	`3`	`#`
`4`		`-# $PostgreSQL: pgsql/src/backend/common.mk,v 1.4 2008/02/26 08:23:31 petere Exp $`
	`4`	`+# $PostgreSQL: pgsql/src/backend/common.mk,v 1.5 2008/02/27 20:31:01 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`# When including this file, set OBJS to the object files created in`
`@@ -33,7 +33,7 @@ objfiles.txt:: $(SUBDIROBJS) $(OBJS)`
`33`	`33`	`touch $@`
`34`	`34`
`35`	`35`	`# make function to expand objfiles.txt contents`
`36`		`-expand_subsys = $(foreach file,$(filter %/objfiles.txt,$(1)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file))))) $(filter-out %/objfiles.txt,$(1))`
	`36`	`+expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file)))`
`37`	`37`
`38`	`38`	`# Parallel make trickery`
`39`	`39`	`$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;`