1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00

make: Fix pofile and .d file generation.

Use builddir not srcdir with make pofile.

Append 'incfile:' lines to %.d files to handle newly-missing dependencies
without 'make clean' after a file is moved or deleted.
This commit is contained in:
Alasdair G Kergon 2014-07-02 00:48:50 +01:00
parent 70551eec59
commit c77197c688
3 changed files with 8 additions and 4 deletions

View File

@ -1,5 +1,7 @@
Version 2.02.108 - Version 2.02.108 -
================================= =================================
Change makefile %.d generation to handle filename changes without make clean.
Fix use of buildir in make pofile.
Enhance private volumes UUIDs with suffixed for easier detection. Enhance private volumes UUIDs with suffixed for easier detection.
Do not use reserved _[tc]meta volumes for temporary LVs. Do not use reserved _[tc]meta volumes for temporary LVs.
Leave backup pool metadata with _meta%d suffix instead of reserved _tmeta%d. Leave backup pool metadata with _meta%d suffix instead of reserved _tmeta%d.

View File

@ -362,7 +362,7 @@ $(TARGETS): $(OBJECTS)
$(CC) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ $(CC) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
%.pot: %.c Makefile %.pot: %.c Makefile
$(CC) -E $(INCLUDES) -include $(top_srcdir)/include/pogen.h \ $(CC) -E $(INCLUDES) -include $(top_builddir)/include/pogen.h \
$(DEFS) $(WFLAGS) $(CFLAGS) $< > $@ $(DEFS) $(WFLAGS) $(CFLAGS) $< > $@
%.so: %.o %.so: %.o
@ -413,6 +413,8 @@ $(LIB_STATIC): $(OBJECTS)
DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \
$(CC) -MM $(INCLUDES) $(DEFS) -o $@ $<; \ $(CC) -MM $(INCLUDES) $(DEFS) -o $@ $<; \
sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ 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) $@ [ -s $@ ] || $(RM) $@
%.mo: %.po %.mo: %.po

View File

@ -19,10 +19,10 @@ LANGS=de
TARGETS=$(LANGS:%=lvm2_%.mo) $(LANGS:%=dm_%.mo) TARGETS=$(LANGS:%=lvm2_%.mo) $(LANGS:%=dm_%.mo)
DM_POSOURCES = $(top_srcdir)/dmsetup/*.pot $(top_srcdir)/libdm/*.pot \ DM_POSOURCES = $(top_builddir)/tools/dmsetup.pot $(top_builddir)/libdm/*.pot \
$(top_srcdir)/libdm/*/*.pot $(top_builddir)/libdm/*/*.pot
LVM_POSOURCES = $(top_srcdir)/tools/*.pot $(top_srcdir)/lib/*/*.pot LVM_POSOURCES = $(top_builddir)/tools/*.pot $(top_builddir)/lib/*/*.pot
include $(top_builddir)/make.tmpl include $(top_builddir)/make.tmpl