From e52137cfe720e1d2ce9bcaa2ef76e174f5d1478d Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Wed, 10 Sep 2008 11:14:39 +0200 Subject: [PATCH] Move ucw utils to subdirectory --- ucw/Makefile | 15 +-------------- ucw/utils/Makefile | 17 +++++++++++++++++ ucw/{ => utils}/b224.c | 0 ucw/{ => utils}/basecode.c | 0 ucw/{ => utils}/daemon-helper.c | 0 ucw/{ => utils}/hex.c | 0 ucw/{ => utils}/rotate-log.pl | 0 ucw/{ => utils}/urltool.c | 0 8 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 ucw/utils/Makefile rename ucw/{ => utils}/b224.c (100%) rename ucw/{ => utils}/basecode.c (100%) rename ucw/{ => utils}/daemon-helper.c (100%) rename ucw/{ => utils}/hex.c (100%) rename ucw/{ => utils}/rotate-log.pl (100%) rename ucw/{ => utils}/urltool.c (100%) diff --git a/ucw/Makefile b/ucw/Makefile index 0f2dc39e..36ab965c 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -4,9 +4,7 @@ DIRS+=ucw LIBUCW=$(o)/ucw/libucw.pc ifdef CONFIG_UCW_UTILS -UCW_UTILS=basecode b224 rotate-log urltool daemon-helper hex - -PROGS+=$(addprefix $(o)/ucw/,$(UCW_UTILS)) +include $(s)/ucw/utils/Makefile endif LIBUCW_MODS= \ @@ -93,7 +91,6 @@ $(o)/ucw/lizard-test: $(o)/ucw/lizard-test.o $(LIBUCW) $(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW) $(LIBCHARSET) $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW) $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW) -$(o)/ucw/basecode: $(o)/ucw/basecode.o $(LIBUCW) TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \ slists.test kmp-test.test bbuf.test getopt.test ff-unicode.test eltpool.test \ @@ -144,13 +141,3 @@ endif ifdef CONFIG_UCW_SHELL_UTILS include $(s)/ucw/shell/Makefile endif - -ifdef CONFIG_UCW_UTILS -$(o)/ucw/b224: $(o)/ucw/b224.o $(LIBUCW) -$(o)/ucw/daemon-helper: $(o)/ucw/daemon-helper.o $(LIBUCW) -$(o)/ucw/urltool: $(o)/ucw/urltool.o $(LIBUCW) -$(o)/ucw/hex: $(o)/ucw/hex.o $(LIBUCW) - -TESTS+=$(o)/ucw/basecode.test -$(o)/ucw/basecode.test: $(o)/ucw/basecode -endif diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile new file mode 100644 index 00000000..e7892722 --- /dev/null +++ b/ucw/utils/Makefile @@ -0,0 +1,17 @@ +# Makefile for the UCW utilities (c) 2008 Michal Vaner + +PROGS+=$(addprefix $(o)/ucw/utils/,b224 basecode daemon-helper rotate-log urltool) +DIRS+=ucw/utils + +ifdef CONFIG_DEBUG +PROGS+=$(o)/ucw/utils/hex +endif + +$(o)/ucw/utils/b224: $(o)/ucw/utils/b224.o $(LIBUCW) +$(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/hex: $(o)/ucw/utils/hex.o $(LIBUCW) +$(o)/ucw/utils/urltool: $(o)/ucw/utils/urltool.o $(LIBUCW) + +TESTS+=$(o)/ucw/utils/basecode.test +$(o)/ucw/utils/basecode.test: $(o)/ucw/utils/basecode diff --git a/ucw/b224.c b/ucw/utils/b224.c similarity index 100% rename from ucw/b224.c rename to ucw/utils/b224.c diff --git a/ucw/basecode.c b/ucw/utils/basecode.c similarity index 100% rename from ucw/basecode.c rename to ucw/utils/basecode.c diff --git a/ucw/daemon-helper.c b/ucw/utils/daemon-helper.c similarity index 100% rename from ucw/daemon-helper.c rename to ucw/utils/daemon-helper.c diff --git a/ucw/hex.c b/ucw/utils/hex.c similarity index 100% rename from ucw/hex.c rename to ucw/utils/hex.c diff --git a/ucw/rotate-log.pl b/ucw/utils/rotate-log.pl similarity index 100% rename from ucw/rotate-log.pl rename to ucw/utils/rotate-log.pl diff --git a/ucw/urltool.c b/ucw/utils/urltool.c similarity index 100% rename from ucw/urltool.c rename to ucw/utils/urltool.c -- 2.39.2