Download as
Browse Code »

Commit 8df4d42a5ff736a10229fb8dcf39a37a0c8f4c2d

Authored by Antonio Terceiro
1 parent 520277de
Exists in master and in 36 other branches add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_fix_automatic_group_creation_bug, gitlab-8.x, gov-user-refactoring, gov-user-refactoring-rails4, gov-user-to-organization, high_contrast, high_contrast_style, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, mezuro_spb, packaging_colab_plugins, performance, refactor_software_communities, refactor_software_communities_rails4, refactor_software_for_sisp, refactor_software_info_to_software, register_page, remove-unused-images, removing_super_archives_email, restore, signals_user_noosfero, software_as_organization, spb_minimal_env, stable-4.1, stable-4.2, stable-4.x, stable-5.0, stable-5.1, stable-devel, temp_soft_comm_refactoring, theme_header, thread_page

Support verbose build with `make V=1`

Showing 1 changed file with 21 additions and 10 deletions   Show diff stats
Makefile
  Diff comments   View file @8df4d42
... ... @@ -9,6 +9,16 @@ GENERATED += $(TARBALLS) $(RPMS)
9 9  
10 10 ARCH = $(shell uname -m)
11 11  
  12 +ifeq ("$(V)", "1")
  13 + Q :=
  14 + RPMBUILD_FLAGS :=
  15 + qecho := @true
  16 +else
  17 + Q := @
  18 + RPMBUILD_FLAGS := --quiet
  19 + qecho := @echo
  20 +endif
  21 +
12 22 all: sdist rpm
13 23  
14 24 sdist: $(TARBALLS)
... ... @@ -16,24 +26,25 @@ sdist: $(TARBALLS)
16 26 rpm: $(RPMS)
17 27  
18 28 $(TARBALLS): build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT): %
19   - @echo "TAR $@"
20   - @mkdir -p $$(dirname $@)
21   - @tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false)
  29 + $(qecho) "TAR\t$@"
  30 + $(Q)mkdir -p $$(dirname $@)
  31 + $(Q)tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false)
22 32  
23 33 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT)
24 34  
25 35 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: rpm/%.spec
26   - @echo "RPM $@"
27   - @mkdir -p ~/rpmbuild/SOURCES
28   - @component=$$(basename $< .spec) && \
  36 + $(qecho) "RPM\t$@"
  37 + $(Q)mkdir -p ~/rpmbuild/SOURCES
  38 + $(Q)component=$$(basename $< .spec) && \
29 39 ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \
30   - rpmbuild --quiet -bb $< && \
  40 + rpmbuild -bb $(RPMBUILD_FLAGS) $< && \
31 41 ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.$(ARCH).rpm $@
32 42  
33 43 %.spec: %.spec.in
34   - @echo SPEC $@
35   - @(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false)
  44 + $(qecho) "SPEC\t$@"
  45 + $(Q)(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false)
36 46 GENERATED += $(patsubst %.in,%,$(wildcard rpm/*.spec.in))
37 47  
38 48 clean:
39   - $(RM) $(GENERATED)
  49 + $(qecho) Cleaning
  50 + $(Q)$(RM) $(GENERATED)
... ...