diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-02-27 20:31:01 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-02-27 20:31:01 +0000 |
| commit | b8eef28353e42e260e9b640c165773b4ea71aa8d (patch) | |
| tree | f752cbf02f42e2847ad8918cdfe14f7c7e2e7ca5 | |
| parent | 1743778d04cfbbdd7fc89f1130979658fa9fae4f (diff) | |
| download | postgresql-b8eef28353e42e260e9b640c165773b4ea71aa8d.tar.gz postgresql-b8eef28353e42e260e9b640c165773b4ea71aa8d.zip | |
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.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/common.mk b/src/backend/common.mk index f3e48a69fca..56e1f17b535 100644 --- 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) ; |