summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2008-03-17 18:24:56 +0000
committerPeter Eisentraut2008-03-17 18:24:56 +0000
commit9d19aeac71b9cffd65f80835a418c8ba3c63ce49 (patch)
treeb80e862ad7f2c5299378bb96e84e7bd600cae3d8
parent673dabd683496c0a2b21afc8a7a07047f1f009a9 (diff)
We need to rebuild objfiles.txt when one of the subdirectories' objfiles.txt
changed in case a new file got added.
-rw-r--r--src/backend/common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/common.mk b/src/backend/common.mk
index 0e4b54764c..cf7ff0c583 100644
--- a/src/backend/common.mk
+++ b/src/backend/common.mk
@@ -27,8 +27,8 @@ SUBSYS.o: $(SUBDIROBJS) $(OBJS)
$(LD) $(LDREL) $(LDOUT) $@ $^
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 $@)
+# Don't rebuild the list if only the OBJS have changed.
+ $(if $(filter-out $(OBJS),$?),( $(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)))