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

[libucw.git] / lib / perl / Filelock / Makefile

diff --git a/lib/perl/Filelock/Makefile b/lib/perl/Filelock/Makefile
index bf64672fc04301131939bd8c144dec56ef9086ee..873f09a6ef2fbff1676f256d0bec7f6ee548d429 100644 (file)
--- a/lib/perl/Filelock/Makefile
+++ b/lib/perl/Filelock/Makefile
@@ -4,23 +4,21 @@ DIRS+=lib/perl/Filelock/arch/auto/Sherlock/Filelock
 FILELOCK_DIR=lib/perl/Filelock
 
 PROGS+=$(o)/lib/perl/Filelock/Filelock.pm
-ifdef CONFIG_DARWIN
-SOEXT=bundle
-else
-SOEXT=so
-endif
 
 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
-       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 $^ $@