mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-05 13:18:20 +03:00
makefiles: better clean
More exact clean of library exported symbols files. Also use $(firstword) test to check for empty string so 'make clean' has now cleaner condensed look. Clean also created include links.
This commit is contained in:
parent
1bed578535
commit
30c3bbcd9e
@ -20,8 +20,12 @@ include $(top_builddir)/make.tmpl
|
||||
|
||||
all: .symlinks_created
|
||||
|
||||
.symlinks_created: .symlinks
|
||||
find . -maxdepth 1 -type l -exec $(RM) \{\} \;
|
||||
LINKS := $(shell find . -maxdepth 1 -type l)
|
||||
|
||||
.symlinks_created: .symlinks
|
||||
ifneq (,$(firstword $(LINKS)))
|
||||
$(RM) $(LINKS)
|
||||
endif
|
||||
for i in `cat $<`; do $(LN_S) $$i ; done
|
||||
touch $@
|
||||
|
||||
@ -31,5 +35,5 @@ device-mapper: all
|
||||
|
||||
cflow: all
|
||||
|
||||
DISTCLEAN_TARGETS += $(shell find . -maxdepth 1 -type l)
|
||||
DISTCLEAN_TARGETS += .include_symlinks .symlinks_created .symlinks
|
||||
DISTCLEAN_TARGETS += .symlinks
|
||||
CLEAN_TARGETS += $(LINKS) .include_symlinks .symlinks_created
|
||||
|
@ -94,4 +94,4 @@ install_ioctl_static: $(LIB_STATIC)
|
||||
$(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
|
||||
|
||||
CLEAN_TARGETS += ioctl/libdevmapper.a
|
||||
DISTCLEAN_TARGETS += libdevmapper.pc .exported_symbols_generated
|
||||
DISTCLEAN_TARGETS += libdevmapper.pc
|
||||
|
@ -81,4 +81,4 @@ liblvm.cflow: $(SOURCES)
|
||||
|
||||
cflow: liblvm.cflow
|
||||
|
||||
DISTCLEAN_TARGETS += $(LIB_NAME).pc .exported_symbols_generated
|
||||
DISTCLEAN_TARGETS += $(LIB_NAME).pc
|
||||
|
20
make.tmpl.in
20
make.tmpl.in
@ -423,6 +423,8 @@ endif
|
||||
$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
|
||||
$(LN_S) -f $(<F) $@
|
||||
|
||||
CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated
|
||||
|
||||
install_lib_shared: $(LIB_SHARED)
|
||||
$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
|
||||
$(INSTALL_DIR) $(usrlibdir)
|
||||
@ -459,17 +461,23 @@ $(LIB_STATIC): $(OBJECTS)
|
||||
%.mo: %.po
|
||||
$(MSGFMT) -o $@ $<
|
||||
|
||||
CLEAN_TARGETS += \
|
||||
$(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
|
||||
$(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda) \
|
||||
$(POTFILES) $(CLEAN_CFLOW)
|
||||
|
||||
cleandir:
|
||||
test -z "$(CLEAN_DIRS)" || $(RM) -r $(CLEAN_DIRS)
|
||||
$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(CLEAN_CFLOW) $(LDDEPS) \
|
||||
$(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
|
||||
$(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda) \
|
||||
.exported_symbols_generated core
|
||||
ifneq (,$(firstword $(CLEAN_DIRS)))
|
||||
$(RM) -r $(CLEAN_DIRS)
|
||||
endif
|
||||
$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) core
|
||||
|
||||
clean: $(SUBDIRS.clean) cleandir
|
||||
|
||||
distclean: cleandir $(SUBDIRS.distclean)
|
||||
test -z "$(DISTCLEAN_DIRS)" || $(RM) -r $(DISTCLEAN_DIRS)
|
||||
ifneq (,$(firstword $(DISTCLEAN_DIRS)))
|
||||
$(RM) -r $(DISTCLEAN_DIRS)
|
||||
endif
|
||||
$(RM) $(DISTCLEAN_TARGETS) Makefile
|
||||
|
||||
.exported_symbols_generated: $(EXPORTED_HEADER) .exported_symbols $(DEPS)
|
||||
|
@ -263,12 +263,10 @@ LIB = $(LIB_SHARED) $(LIB_LOCAL) $(LIB_EXEC) $(LIB_FLAVOURS)
|
||||
$(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/thin-performance.profile
|
||||
touch $@
|
||||
|
||||
cleantest:
|
||||
test "$(srcdir)" = . || $(RM) $(RUN_BASE)
|
||||
$(RM) -r $(LVM_TEST_RESULTS)
|
||||
|
||||
clean: cleantest
|
||||
distclean: cleantest
|
||||
CLEAN_DIRS += $(LVM_TEST_RESULTS)
|
||||
ifneq (.,$(firstword $(srcdir)))
|
||||
CLEAN_TARGETS += $(RUN_BASE)
|
||||
endif
|
||||
|
||||
CLEAN_TARGETS += .lib-dir-stamp .tests-stamp $(LIB) $(addprefix lib/,$(CMDS)) \
|
||||
lib/clvmd lib/dmeventd lib/dmsetup lib/lvmetad lib/fsadm lib/vgimportclone \
|
||||
|
@ -97,7 +97,8 @@ LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \
|
||||
liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \
|
||||
liblvm2cmd-static.a dmsetup.static lvm.static
|
||||
liblvm2cmd-static.a dmsetup.static lvm.static \
|
||||
$(LDDEPS) .exported_symbols_generated
|
||||
|
||||
ifeq ("@CMDLIB@", "yes")
|
||||
TARGETS += liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
|
||||
|
Loading…
Reference in New Issue
Block a user