Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e7115a2

Browse files
committed
We need to rebuild objfiles.txt when one of the subdirectories' objfiles.txt
changed in case a new file got added.
1 parent f09f055 commit e7115a2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/backend/common.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Common make rules for backend
33
#
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 $
55
#
66

77
# When including this file, set OBJS to the object files created in
@@ -27,8 +27,8 @@ SUBSYS.o: $(SUBDIROBJS) $(OBJS)
2727
$(LD) $(LDREL) $(LDOUT) $@ $^
2828

2929
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 $@)
3232

3333
# make function to expand objfiles.txt contents
3434
expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file)))

0 commit comments

Comments
 (0)