mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-23 02:05:07 +03:00
Revert "build: Calculate dependencies at same time as compiling."
This reverts commit 0931067dc5549c443e144d599683b53220021f44. The dep files should be in the build dir, which is not necc. the src dir. Easy to fix, but reverting for now until I have time to revisit.
This commit is contained in:
parent
49db9b5e0b
commit
ed837e6971
17
make.tmpl.in
17
make.tmpl.in
@ -442,14 +442,12 @@ 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) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
|
||||
$(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
|
||||
|
||||
%.o: %.cpp
|
||||
@echo " [CXX] $<"
|
||||
@ -509,8 +507,17 @@ $(LIB_STATIC): $(OBJECTS)
|
||||
$(Q) $(RM) $@
|
||||
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
|
||||
|
||||
%.d: $(INC_LNS)
|
||||
.PRECIOUS: %.d
|
||||
%.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) $@
|
||||
|
||||
%.mo: %.po
|
||||
@echo " [MSGFMT] $<"
|
||||
|
Loading…
x
Reference in New Issue
Block a user