X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=Makefile.local;h=9e2111f5cc0dfd0961e14a3a3c24dcae9ec3b584;hb=8c7d979f5da30bfe19846527bac2f40c2cdc515a;hp=6bc78ef8e969b2d8649d68de6b590e8ded886cec;hpb=ab022657776af0bb47e72caf2517464ca59e7d48;p=notmuch diff --git a/Makefile.local b/Makefile.local index 6bc78ef8..9e2111f5 100644 --- a/Makefile.local +++ b/Makefile.local @@ -182,14 +182,14 @@ verify-newer: # user how to enable verbose compiles. ifeq ($(V),) quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n" -quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//')) +quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$(1) $(or $(2),$@)\n"; $($(word 1, $(1))) endif # The user has explicitly enabled quiet compilation. ifeq ($(V),0) -quiet = @printf "$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//')) +quiet = @printf "$(1) $(or $(2),$@)\n"; $($(word 1, $(1))) endif # Otherwise, print the full command line. -quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) +quiet ?= $($(word 1, $(1))) %.o: %.cc $(global_deps) @mkdir -p $(patsubst %/.,%,.deps/$(@D)) @@ -201,7 +201,7 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) .PHONY : clean clean: - rm -rf $(CLEAN); rm -rf .deps + rm -rf $(CLEAN) .PHONY: distclean distclean: clean @@ -225,6 +225,7 @@ notmuch_client_srcs = \ notmuch-dump.c \ notmuch-insert.c \ notmuch-new.c \ + notmuch-reindex.c \ notmuch-reply.c \ notmuch-restore.c \ notmuch-search.c \ @@ -279,6 +280,7 @@ endif SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp +CLEAN := $(CLEAN) .deps DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config