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

[libucw.git] / lib / shell / Makefile

diff --git a/lib/shell/Makefile b/lib/shell/Makefile
index 14e4901380091ff0a89941391edd07a0488d9ce9..5d6d65e338376d52ecff7e4c1f7dc1c172577fd8 100644 (file)
--- a/lib/shell/Makefile
+++ b/lib/shell/Makefile
@@ -1,7 +1,12 @@
 # Support routines for shell scripts
 
 DIRS+=lib/shell
-PROGS+=obj/lib/shell/config obj/lib/shell/logger
+PROGS+=$(o)/lib/shell/config $(o)/lib/shell/logger
+DATAFILES+=$(o)/lib/shell/libucw.sh
 
-obj/lib/shell/config: obj/lib/shell/config.o $(LIBSH)
-obj/lib/shell/logger: obj/lib/shell/logger.o $(LIBSH)
+$(o)/lib/shell/config: $(o)/lib/shell/config.o $(LIBUCW)
+$(o)/lib/shell/logger: $(o)/lib/shell/logger.o $(LIBUCW)
+
+TESTS+=$(addprefix $(o)/lib/shell/,config.test)
+
+$(o)/lib/shell/config.test: $(o)/lib/shell/config