We need to rebuild objfiles.txt when one of the subdirectories' objfiles.txt

petere · petere · commit e7115a224a3f · 2008-03-17T18:24:56.000Z
changed in case a new file got added.
diff --git 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)))

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Common make rules for backend`
`3`	`3`	`#`
`4`		`-# $PostgreSQL: pgsql/src/backend/common.mk,v 1.6 2008/02/29 10:34:51 petere Exp $`
	`4`	`+# $PostgreSQL: pgsql/src/backend/common.mk,v 1.7 2008/03/17 18:24:56 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`# When including this file, set OBJS to the object files created in`
`@@ -27,8 +27,8 @@ SUBSYS.o: $(SUBDIROBJS) $(OBJS)`
`27`	`27`	`$(LD) $(LDREL) $(LDOUT) $@ $^`
`28`	`28`
`29`	`29`	`objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS)`
`30`		`-# Only rebuild the list if it does not exist or the Makefile has changed.`
`31`		`- $(if $(filter $<,$?),( $(if $(SUBDIROBJS),cat $(SUBDIROBJS); )echo $(addprefix $(subdir)/,$(OBJS)) ) >$@,touch $@)`
	`30`	`+# Don't rebuild the list if only the OBJS have changed.`
	`31`	`+ $(if $(filter-out $(OBJS),$?),( $(if $(SUBDIROBJS),cat $(SUBDIROBJS); )echo $(addprefix $(subdir)/,$(OBJS)) ) >$@,touch $@)`
`32`	`32`
`33`	`33`	`# make function to expand objfiles.txt contents`
`34`	`34`	`expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file)))`