Need more dependencies to get the build order right when objfiles.txt

petere · petere · commit d391bdac50a5 · 2008-02-26T08:23:31.000Z
doesn't exist yet.
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.3 2008/02/26 07:20:38 petere Exp $
+# $PostgreSQL: pgsql/src/backend/common.mk,v 1.4 2008/02/26 08:23:31 petere Exp $
 #
 
 # When including this file, set OBJS to the object files created in
@@ -26,7 +26,7 @@ endif
 SUBSYS.o: $(SUBDIROBJS) $(OBJS)
 	$(LD) $(LDREL) $(LDOUT) $@ $^
 
-objfiles.txt:: $(MAKEFILE_LIST)
+objfiles.txt:: $(MAKEFILE_LIST) | $(SUBDIROBJS) $(OBJS)
 	( $(if $(SUBDIROBJS),cat $(SUBDIROBJS); )echo $(addprefix $(subdir)/,$(OBJS)) ) >$@
 
 objfiles.txt:: $(SUBDIROBJS) $(OBJS)

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.3 2008/02/26 07:20:38 petere Exp $`
	`4`	`+# $PostgreSQL: pgsql/src/backend/common.mk,v 1.4 2008/02/26 08:23:31 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`# When including this file, set OBJS to the object files created in`
`@@ -26,7 +26,7 @@ endif`
`26`	`26`	`SUBSYS.o: $(SUBDIROBJS) $(OBJS)`
`27`	`27`	`$(LD) $(LDREL) $(LDOUT) $@ $^`
`28`	`28`
`29`		`-objfiles.txt:: $(MAKEFILE_LIST)`
	`29`	`+objfiles.txt:: $(MAKEFILE_LIST) \| $(SUBDIROBJS) $(OBJS)`
`30`	`30`	`( $(if $(SUBDIROBJS),cat $(SUBDIROBJS); )echo $(addprefix $(subdir)/,$(OBJS)) ) >$@`
`31`	`31`
`32`	`32`	`objfiles.txt:: $(SUBDIROBJS) $(OBJS)`