Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

diff --cc images/color.c
Simple merge

diff --cc lib/Makefile
index 9133c739d50d28191ef6cfd3320361d21fafaeba,a4c53f6796e8493692044782261a0f74adf1b329..37a1e7fc9417daf3719117e5a0a96d1162659b7e
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -76,9 -74,7 +76,9 @@@ ifdef CONFIG_OWN_GETOP
  include $(s)/lib/getopt/Makefile
  endif
  
- LIBUCW=$(o)/lib/libucw.$(LS)
 +include $(s)/lib/sorter/Makefile
 +
+ LIBUCW=$(o)/lib/libucw.pc
  LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
  
  $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
@@@ -114,18 -110,16 +114,22 @@@ $(o)/lib/slists.test: $(o)/lib/slists-
  $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
  $(o)/lib/bbuf.test: $(o)/lib/bbuf-t
  $(o)/lib/getopt.test: $(o)/lib/getopt-t
 +$(o)/lib/fastbuf.test: $(o)/lib/fb-file-t $(o)/lib/fb-grow-t $(o)/lib/fb-pool-t
 +
 +ifdef CONFIG_UCW_THREADS
 +TESTS+=$(addprefix $(o)/lib/,asio.test)
 +$(o)/lib/asio.test: $(o)/lib/asio-t
 +endif
  
- INCLUDES+=$(o)/lib/.include-stamp
+ API_LIBS+=libucw
+ API_INCLUDES+=$(o)/lib/.include-stamp
  $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-       $(s)/build/install-includes $(s)/lib run/include/lib $(?F)
-       $(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
-       touch $(o)/lib/.include-stamp
+       $(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+       # XXX: We do not have a dependency on autoconf.h, but it is generated by configure
+       # before make ever starts, so this is safe.
+       $(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
+       $(Q)touch $@
+ run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc
  
  ifdef CONFIG_UCW_PERL
  include $(s)/lib/perl/Makefile

diff --cc lib/config.h
Simple merge

diff --cc lib/perl/Filelock/Makefile
index 691ba718bc4b619bc3ec6f9559ccab23f808f37b,e4e18c5f1a2c71622b114d95ae066f5530b097e7..873f09a6ef2fbff1676f256d0bec7f6ee548d429
--- 1/lib/perl/Filelock/Makefile
--- 2/lib/perl/Filelock/Makefile
+++ b/lib/perl/Filelock/Makefile
@@@ -8,15 -8,16 +8,17 @@@ PROGS+=$(o)/lib/perl/Filelock/Filelock.
  extras:: $(o)/lib/perl/Filelock/arch/auto/Sherlock/Filelock/Filelock.$(SOEXT)
  
  $(o)/lib/perl/Filelock/arch/auto/Sherlock/Filelock/Filelock.$(SOEXT): $(o)/$(FILELOCK_DIR)/Filelock.xs $(o)/$(FILELOCK_DIR)/Filelock.pm $(o)/$(FILELOCK_DIR)/Makefile
-       cd $(o)/$(FILELOCK_DIR) && $(MAKE) -f Makefile
-       touch $@
-       cp $@ run/$(DATADIR)/
+       $(M)MAKE $@
+       $(Q)cd $(o)/$(FILELOCK_DIR) && $(MAKE) -f Makefile $(MAKESILENT)
++      $(Q)touch $@
+       $(Q)cp $@ run/$(DATADIR)/
  
  $(o)/$(FILELOCK_DIR)/Makefile: $(o)/$(FILELOCK_DIR)/Makefile.PL
-       cd $(o)/$(FILELOCK_DIR) && perl Makefile.PL
+       $(M)PREPARE $@
+       $(Q)cd $(o)/$(FILELOCK_DIR) && perl Makefile.PL
  
  $(o)/$(FILELOCK_DIR)/Filelock.xs: $(s)/$(FILELOCK_DIR)/Filelock.xs
-       cp $^ $@
+       $(Q)cp $^ $@
  
  $(o)/$(FILELOCK_DIR)/Makefile.PL: $(s)/$(FILELOCK_DIR)/Makefile.PL
-       cp $^ $@
+       $(Q)cp $^ $@

diff --cc lib/perl/Ulimit/Makefile
index 9ccca08550da4839ea411260882afa216eed2e74,b4a54dbf91303dba1d708cb7bc2cc01f70507078..65dc66235b5096622ec4cf91ba2d9659b8df3820
--- 1/lib/perl/Ulimit/Makefile
--- 2/lib/perl/Ulimit/Makefile
+++ b/lib/perl/Ulimit/Makefile
@@@ -8,15 -8,16 +8,17 @@@ PROGS+=$(o)/lib/perl/Ulimit/Ulimit.p
  extras:: $(o)/lib/perl/Ulimit/arch/auto/Sherlock/Ulimit/Ulimit.$(SOEXT)
  
  $(o)/lib/perl/Ulimit/arch/auto/Sherlock/Ulimit/Ulimit.$(SOEXT): $(o)/$(ULIMIT_DIR)/Ulimit.xs $(o)/$(ULIMIT_DIR)/Ulimit.pm $(o)/$(ULIMIT_DIR)/Makefile
-       cd $(o)/$(ULIMIT_DIR) && $(MAKE) -f Makefile
-       touch $@
-       cp $@ run/$(DATADIR)/
+       $(M)MAKE $@
+       $(Q)cd $(o)/$(ULIMIT_DIR) && $(MAKE) -f Makefile $(MAKESILENT)
++      $(Q)touch $@
+       $(Q)cp $@ run/$(DATADIR)/
  
  $(o)/$(ULIMIT_DIR)/Makefile: $(o)/$(ULIMIT_DIR)/Makefile.PL
-       cd $(o)/$(ULIMIT_DIR) && perl Makefile.PL
+       $(M)PREPARE $@
+       $(Q)cd $(o)/$(ULIMIT_DIR) && perl Makefile.PL
  
  $(o)/$(ULIMIT_DIR)/Ulimit.xs: $(s)/$(ULIMIT_DIR)/Ulimit.xs
-       cp $^ $@
+       $(Q)cp $^ $@
  
  $(o)/$(ULIMIT_DIR)/Makefile.PL: $(s)/$(ULIMIT_DIR)/Makefile.PL
-       cp $^ $@
+       $(Q)cp $^ $@