mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Revert "Revert "build: Calculate dependencies at same time as compiling.""
This reverts commit ed837e6971
.
This commit is contained in:
parent
413488edc6
commit
02b99be57e
19
make.tmpl.in
19
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 $@ $<
|
||||
|
Loading…
Reference in New Issue
Block a user