diff options
| author | Joe Thornber <ejt@redhat.com> | 2018-05-11 14:40:05 +0100 |
|---|---|---|
| committer | Joe Thornber <ejt@redhat.com> | 2018-05-11 14:40:05 +0100 |
| commit | 02b99be57eab4f55bd0db045a3873bdf5e500b92 (patch) | |
| tree | c76e9b5f19657171e3b2c0d0548504e834b8ca7f /make.tmpl.in | |
| parent | 413488edc6dd077e79517e44a8d3b9a51c5138e5 (diff) | |
| download | lvm2-02b99be57eab4f55bd0db045a3873bdf5e500b92.tar.gz | |
Revert "Revert "build: Calculate dependencies at same time as compiling.""
This reverts commit ed837e6971ee84aa5b112e021df19901ae400216.
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 9d5d36757..d3a80ef0c 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -442,12 +442,14 @@ endif .LIBPATTERNS = lib%.so lib%.a +DEPFLAGS=-MT $@ -MMD -MP -MF $*.d + # still needed in 2018 for 32bit builds DEFS+=-D_FILE_OFFSET_BITS=64 %.o: %.c @echo " [CC] $<" - $(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ %.o: %.cpp @echo " [CXX] $<" @@ -507,18 +509,9 @@ $(LIB_STATIC): $(OBJECTS) $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null -%.d: %.c $(INC_LNS) - @echo " [DEP] $<" - $(Q) $(MKDIR_P) $(dir $@); \ - set -e; \ - FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ - DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ - $(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \ - sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ - DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \ - echo $$DEPLIST | fmt -1 | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \ - [ -s $@ ] || $(RM) $@ - +%.d: $(INC_LNS) +.PRECIOUS: %.d + %.mo: %.po @echo " [MSGFMT] $<" $(Q) $(MSGFMT) -o $@ $< |