From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Thu, 19 Jul 2007 20:09:13 +0000 (+0200)
Subject: Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git
X-Git-Tag: holmes-import~506^2~13^2~93
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=54833f693e97cc4c3d5b8c28e6816e8d1ce5192e;p=libucw.git

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

54833f693e97cc4c3d5b8c28e6816e8d1ce5192e
diff --cc lib/Makefile
index 9133c739,a4c53f67..37a1e7fc
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -76,9 -74,7 +76,9 @@@ ifdef CONFIG_OWN_GETOP
  include $(s)/lib/getopt/Makefile
  endif
  
 +include $(s)/lib/sorter/Makefile
 +
- LIBUCW=$(o)/lib/libucw.$(LS)
+ 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/perl/Filelock/Makefile
index 691ba718,e4e18c5f..873f09a6
--- a/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 9ccca085,b4a54dbf..65dc6623
--- a/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 $^ $@