diff --git a/Makefile b/Makefile index ec2b7e8..b52a711 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,16 @@ GENERATED += $(TARBALLS) $(RPMS) ARCH = $(shell uname -m) +ifeq ("$(V)", "1") + Q := + RPMBUILD_FLAGS := + qecho := @true +else + Q := @ + RPMBUILD_FLAGS := --quiet + qecho := @echo +endif + all: sdist rpm sdist: $(TARBALLS) @@ -16,24 +26,25 @@ sdist: $(TARBALLS) rpm: $(RPMS) $(TARBALLS): build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT): % - @echo "TAR $@" - @mkdir -p $$(dirname $@) - @tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false) + $(qecho) "TAR\t$@" + $(Q)mkdir -p $$(dirname $@) + $(Q)tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false) $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT) $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: rpm/%.spec - @echo "RPM $@" - @mkdir -p ~/rpmbuild/SOURCES - @component=$$(basename $< .spec) && \ + $(qecho) "RPM\t$@" + $(Q)mkdir -p ~/rpmbuild/SOURCES + $(Q)component=$$(basename $< .spec) && \ ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \ - rpmbuild --quiet -bb $< && \ + rpmbuild -bb $(RPMBUILD_FLAGS) $< && \ ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.$(ARCH).rpm $@ %.spec: %.spec.in - @echo SPEC $@ - @(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false) + $(qecho) "SPEC\t$@" + $(Q)(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false) GENERATED += $(patsubst %.in,%,$(wildcard rpm/*.spec.in)) clean: - $(RM) $(GENERATED) + $(qecho) Cleaning + $(Q)$(RM) $(GENERATED) -- libgit2 0.21.2