mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 17:17:06 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: Makefile: add the quiet mode to a few more targets

Browse Source 
The various install-* and *-tar targets are now launched with $(Q). The
install argument "-v" was added to install commands to see what is copied
where.
This commit is contained in:
Willy Tarreau 2018-11-19 07:51:04 +01:00
parent b42233a19d
commit 4ab5d030c7
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -981,16 +981,16 @@ src/dlmalloc.o: $(DLMALLOC_SRC) $(DEP)
$(CC) $(COPTS) -DDEFAULT_MMAP_THRESHOLD=$(DLMALLOC_THRES) -c -o $@ $< $(CC) $(COPTS) -DDEFAULT_MMAP_THRESHOLD=$(DLMALLOC_THRES) -c -o $@ $<
install-man: install-man:
install -d "$(DESTDIR)$(MANDIR)"/man1 $(Q)install -v -d "$(DESTDIR)$(MANDIR)"/man1
install -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1 $(Q)install -v -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1
EXCLUDE_DOCUMENTATION = lgpl gpl coding-style EXCLUDE_DOCUMENTATION = lgpl gpl coding-style
DOCUMENTATION = $(filter-out $(EXCLUDE_DOCUMENTATION),$(patsubst doc/%.txt,%,$(wildcard doc/*.txt))) DOCUMENTATION = $(filter-out $(EXCLUDE_DOCUMENTATION),$(patsubst doc/%.txt,%,$(wildcard doc/*.txt)))
install-doc: install-doc:
install -d "$(DESTDIR)$(DOCDIR)" $(Q)install -v -d "$(DESTDIR)$(DOCDIR)"
for x in $(DOCUMENTATION); do \ $(Q)for x in $(DOCUMENTATION); do \
install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \ install -v -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
done done
install-bin: install-bin:
@ -1000,18 +1000,18 @@ install-bin:
exit 1; \ exit 1; \
fi; \ fi; \
done done
install -d "$(DESTDIR)$(SBINDIR)" $(Q)install -v -d "$(DESTDIR)$(SBINDIR)"
install haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)" $(Q)install -v haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
install: install-bin install-man install-doc install: install-bin install-man install-doc
uninstall: uninstall:
rm -f "$(DESTDIR)$(MANDIR)"/man1/haproxy.1 $(Q)rm -f "$(DESTDIR)$(MANDIR)"/man1/haproxy.1
for x in $(DOCUMENTATION); do \ $(Q)for x in $(DOCUMENTATION); do \
rm -f "$(DESTDIR)$(DOCDIR)"/$$x.txt ; \ rm -f "$(DESTDIR)$(DOCDIR)"/$$x.txt ; \
done done
-rmdir "$(DESTDIR)$(DOCDIR)" $(Q)-rmdir "$(DESTDIR)$(DOCDIR)"
rm -f "$(DESTDIR)$(SBINDIR)"/haproxy $(Q)rm -f "$(DESTDIR)$(SBINDIR)"/haproxy
clean: clean:
rm -f *.[oas] src/*.[oas] ebtree/*.[oas] haproxy test .build_opts .build_opts.new rm -f *.[oas] src/*.[oas] ebtree/*.[oas] haproxy test .build_opts .build_opts.new
@ -1027,15 +1027,17 @@ cscope:
find src include -name "*.[ch]" -print | cscope -q -b -i - find src include -name "*.[ch]" -print | cscope -q -b -i -
tar: clean tar: clean
ln -s . haproxy-$(VERSION)$(SUBVERS) $(Q)ln -s . haproxy-$(VERSION)$(SUBVERS)
tar --exclude=haproxy-$(VERSION)$(SUBVERS)/.git \ $(Q)tar --exclude=haproxy-$(VERSION)$(SUBVERS)/.git \
--exclude=haproxy-$(VERSION)$(SUBVERS)/haproxy-$(VERSION)$(SUBVERS) \ --exclude=haproxy-$(VERSION)$(SUBVERS)/haproxy-$(VERSION)$(SUBVERS) \
--exclude=haproxy-$(VERSION)$(SUBVERS)/haproxy-$(VERSION)$(SUBVERS).tar.gz \ --exclude=haproxy-$(VERSION)$(SUBVERS)/haproxy-$(VERSION)$(SUBVERS).tar.gz \
-cf - haproxy-$(VERSION)$(SUBVERS)/* | gzip -c9 >haproxy-$(VERSION)$(SUBVERS).tar.gz -cf - haproxy-$(VERSION)$(SUBVERS)/* | gzip -c9 >haproxy-$(VERSION)$(SUBVERS).tar.gz
rm -f haproxy-$(VERSION)$(SUBVERS) $(Q)echo haproxy-$(VERSION)$(SUBVERS).tar.gz
$(Q)rm -f haproxy-$(VERSION)$(SUBVERS)
git-tar: git-tar:
git archive --format=tar --prefix="haproxy-$(VERSION)$(SUBVERS)/" HEAD | gzip -9 > haproxy-$(VERSION)$(SUBVERS).tar.gz $(Q)git archive --format=tar --prefix="haproxy-$(VERSION)$(SUBVERS)/" HEAD | gzip -9 > haproxy-$(VERSION)$(SUBVERS).tar.gz
$(Q)echo haproxy-$(VERSION)$(SUBVERS).tar.gz
version: version:
@echo "VERSION: $(VERSION)" @echo "VERSION: $(VERSION)"