diff options
-rw-r--r-- | Makefile.in | 31 | ||||
-rw-r--r-- | dev.mk.in | 14 |
2 files changed, 26 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in index a565e64b..175e4404 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,18 +100,21 @@ files_to_distclean = Makefile config.h config.log config.status all: ccache$(EXEEXT) ccache$(EXEEXT): $(ccache_objs) $(extra_libs) - $(if $(quiet),@echo " LD $@") + $(if $(quiet),@echo " LD $@") $(Q)$(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS) ccache.1: doc/ccache.1 - cp $< $@ + $(if $(quiet),@echo " CP $@") + $(Q)cp $< $@ .PHONY: install install: ccache$(EXEEXT) @disable_man@ccache.1 - $(installcmd) -d $(DESTDIR)$(bindir) - $(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir) -@disable_man@ $(installcmd) -d $(DESTDIR)$(mandir)/man1 -@disable_man@ -$(installcmd) -m 644 ccache.1 $(DESTDIR)$(mandir)/man1/ + $(if $(quiet),@echo " INSTALL ccache$(EXEEXT)") + $(Q)$(installcmd) -d $(DESTDIR)$(bindir) + $(Q)$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir) +@disable_man@ $(if $(quiet),@echo " INSTALL ccache.1") +@disable_man@ $(Q)$(installcmd) -d $(DESTDIR)$(mandir)/man1 +@disable_man@ $(Q)-$(installcmd) -m 644 ccache.1 $(DESTDIR)$(mandir)/man1/ .PHONY: clean clean: @@ -123,9 +126,9 @@ $(zlib_objs): CPPFLAGS += -include config.h $(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@ src/zlib/libz.a: $(zlib_objs) - $(if $(quiet),@echo " AR $@") + $(if $(quiet),@echo " AR $@") $(Q)$(AR) cr $@ $(zlib_objs) - $(if $(quiet),@echo " RANLIB $@") + $(if $(quiet),@echo " RANLIB $@") $(Q)$(RANLIB) $@ .PHONY: perf @@ -134,24 +137,24 @@ perf: ccache$(EXEEXT) .PHONY: test test: ccache$(EXEEXT) unittest/run$(EXEEXT) - $(if $(quiet),@echo " TEST unittest/run$(EXEEXT)") + $(if $(quiet),@echo " TEST unittest/run$(EXEEXT)") $(Q)unittest/run$(EXEEXT) - $(if $(quiet),@echo " TEST $(srcdir)/test/run") + $(if $(quiet),@echo " TEST $(srcdir)/test/run") $(Q)CC='$(CC)' $(BASH) $(srcdir)/test/run .PHONY: unittest unittest: unittest/run$(EXEEXT) - $(if $(quiet),@echo " TEST $@") + $(if $(quiet),@echo " TEST $@") $(Q)unittest/run$(EXEEXT) unittest/run$(EXEEXT): $(base_objs) $(test_objs) $(extra_libs) - $(if $(quiet),@echo " LD $@") + $(if $(quiet),@echo " LD $@") $(Q)$(CC) $(all_cflags) -o $@ $(base_objs) $(test_objs) $(LDFLAGS) $(extra_libs) $(LIBS) unittest/main.o: unittest/suites.h unittest/suites.h: $(test_suites) Makefile - $(if $(quiet),@echo " GEN $@") + $(if $(quiet),@echo " GEN $@") $(Q)ls $^ | grep -v Makefile | xargs sed -n 's/TEST_SUITE(\(.*\))/SUITE(\1)/p' >$@ .PHONY: check @@ -167,7 +170,7 @@ installcheck: ccache$(EXEEXT) unittest/run$(EXEEXT) CCACHE=$(bindir)/ccache CC='$(CC)' $(BASH) $(srcdir)/test/run .c.o: - $(if $(quiet),@echo " CC $@") + $(if $(quiet),@echo " CC $@") $(Q)$(CC) $(all_cppflags) $(all_cflags) -c -o $@ $< @include_dev_mk@ @@ -109,8 +109,9 @@ endif src/version.o: src/version.c %_lookup.c: %.gperf - $(GPERF) $< | awk '/#ifdef __GNUC__/ { ++i; if (i == 2) { print "static"; }} {print}' >$@ - echo "static const size_t $$(echo $(notdir $*) | tr a-z A-Z)_TOTAL_KEYWORDS = $$(sed -nr 's/.*TOTAL_KEYWORDS = ([0-9]+).*/\1/p' $@);" >>$@ + $(if $(quiet),@echo " GPERF $@") + $(Q)$(GPERF) $< | awk '/#ifdef __GNUC__/ { ++i; if (i == 2) { print "static"; }} {print}' >$@ + $(Q)echo "static const size_t $$(echo $(notdir $*) | tr a-z A-Z)_TOTAL_KEYWORDS = $$(sed -nr 's/.*TOTAL_KEYWORDS = ([0-9]+).*/\1/p' $@);" >>$@ .PHONY: dist dist: $(dist_archives) @@ -168,16 +169,19 @@ docs: $(generated_docs) %.html: %.adoc @mkdir -p $(@D) - $(ASCIIDOC) -o $@ -a revnumber=$(version) -a toc -b xhtml11 $< + $(if $(quiet),@echo " ASCIIDOC $@") + $(Q)$(ASCIIDOC) -o $@ -a revnumber=$(version) -a toc -b xhtml11 $< %.xml: %.adoc @mkdir -p $(@D) # Make literals stand out as bold in the man page: - $(ASCIIDOC) -a revnumber=$(version) -d manpage -b docbook -o - $< | \ + $(if $(quiet),@echo " ASCIIDOC $@") + $(Q)$(ASCIIDOC) -a revnumber=$(version) -d manpage -b docbook -o - $< | \ perl -pe 's!<literal>(.*?)</literal>!<emphasis role="strong">\1</emphasis>!g' >$@ doc/ccache.1: doc/MANUAL.xml - $(A2X) --doctype manpage --format manpage $< + $(if $(quiet),@echo " A2X $@") + $(Q)$(A2X) --doctype manpage --format manpage $< .PHONY: update-authors update-authors: |