Packages: Simplified definition of install targets.

[libucw.git] / ucw / utils / Makefile

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 3227bb0a7401a302a33d63ed77c6f784aa14aab8..2a8f2b9928973bd0f0c1df028229ebeaec92e956 100644 (file)
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,19 +1,23 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 

-UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-helper rotate-log urltool)
+UCW_UTILS=$(addprefix $(o)/ucw/utils/ucw-,basecode daemon-control rotate-log urltool)

 PROGS+=$(UCW_UTILS)
 DIRS+=ucw/utils
 
 PROGS+=$(UCW_UTILS)
 DIRS+=ucw/utils
 

-$(o)/ucw/utils/basecode: $(o)/ucw/utils/basecode.o $(LIBUCW)
-$(o)/ucw/utils/daemon-helper: $(o)/ucw/utils/daemon-helper.o $(LIBUCW)
-$(o)/ucw/utils/urltool: $(o)/ucw/utils/urltool.o $(LIBUCW)
+ifdef CONFIG_UCW_OBSOLETE_DAEMON_HELPER
+PROGS+=$(o)/ucw/utils/ucw-daemon-helper
+endif
+
+$(o)/ucw/utils/ucw-basecode: $(o)/ucw/utils/ucw-basecode.o $(LIBUCW)
+$(o)/ucw/utils/ucw-daemon-helper: $(o)/ucw/utils/ucw-daemon-helper.o $(LIBUCW)
+$(o)/ucw/utils/ucw-daemon-control: $(o)/ucw/utils/ucw-daemon-control.o $(LIBUCW)
+$(o)/ucw/utils/ucw-urltool: $(o)/ucw/utils/ucw-urltool.o $(LIBUCW)

 
 TESTS+=$(o)/ucw/utils/basecode.test
 
 TESTS+=$(o)/ucw/utils/basecode.test

-$(o)/ucw/utils/basecode.test: $(o)/ucw/utils/basecode
+$(o)/ucw/utils/basecode.test: $(o)/ucw/utils/ucw-basecode

 
 

-INSTALL_TARGETS+=install-ucw-utils
+INSTALL_UTILS_TARGETS+=install-ucw-utils

 install-ucw-utils:
        install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
        install -m 755 $(UCW_UTILS) $(DESTDIR)$(INSTALL_BIN_DIR)
 install-ucw-utils:
        install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
        install -m 755 $(UCW_UTILS) $(DESTDIR)$(INSTALL_BIN_DIR)

-

 .PHONY: install-ucw-utils
 .PHONY: install-ucw-utils