From e7115a224a3f43764ce31fc4ed4dcb19d73b668f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 17 Mar 2008 18:24:56 +0000 Subject: [PATCH] We need to rebuild objfiles.txt when one of the subdirectories' objfiles.txt changed in case a new file got added. --- src/backend/common.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/common.mk b/src/backend/common.mk index c076722a934..82a9ab6fc10 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.6 2008/02/29 10:34:51 petere Exp $ +# $PostgreSQL: pgsql/src/backend/common.mk,v 1.7 2008/03/17 18:24:56 petere Exp $ # # When including this file, set OBJS to the object files created in @@ -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))) -- 2.39.5