diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-02-29 10:34:51 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-02-29 10:34:51 +0000 |
| commit | 02504dfd0a1149c40597d8ec07ebb3eda4871f69 (patch) | |
| tree | 2853a8237b5571ad53987f79dceba04abbfac376 /src | |
| parent | ff428cdeda20b8b1cf465f8c6cd27da9b2abe9b7 (diff) | |
| download | postgresql-02504dfd0a1149c40597d8ec07ebb3eda4871f69.tar.gz postgresql-02504dfd0a1149c40597d8ec07ebb3eda4871f69.zip | |
Write the objfiles.txt rules in a way that is compatible with GNU make 3.78,
and simpler, too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/common.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/common.mk b/src/backend/common.mk index 56e1f17b535..c076722a934 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.5 2008/02/27 20:31:01 petere Exp $ +# $PostgreSQL: pgsql/src/backend/common.mk,v 1.6 2008/02/29 10:34:51 petere Exp $ # # When including this file, set OBJS to the object files created in @@ -26,11 +26,9 @@ endif SUBSYS.o: $(SUBDIROBJS) $(OBJS) $(LD) $(LDREL) $(LDOUT) $@ $^ -objfiles.txt:: $(MAKEFILE_LIST) | $(SUBDIROBJS) $(OBJS) - ( $(if $(SUBDIROBJS),cat $(SUBDIROBJS); )echo $(addprefix $(subdir)/,$(OBJS)) ) >$@ - -objfiles.txt:: $(SUBDIROBJS) $(OBJS) - touch $@ +objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS) +# Only rebuild the list if it does not exist or the Makefile has changed. + $(if $(filter $<,$?),( $(if $(SUBDIROBJS),cat $(SUBDIROBJS); )echo $(addprefix $(subdir)/,$(OBJS)) ) >$@,touch $@) # make function to expand objfiles.txt contents expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file))) |