summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2008-02-27 20:31:01 +0000
committerPeter Eisentraut2008-02-27 20:31:01 +0000
commitb73c2722351469812e7f178b89a6d4eb2c4e8549 (patch)
treee737dacac117f1a3094ee17b4de89b8df5f51328
parent5986421bdec93e14b1f94654c4b5e40f3edc5bfc (diff)
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.
-rw-r--r--src/backend/common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/common.mk b/src/backend/common.mk
index 1ae6f54d53..fef03728af 100644
--- 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) ;