From: Michal Vaner <vorner@ucw.cz>
Date: Sun, 23 Nov 2008 20:14:53 +0000 (+0100)
Subject: Another attempt to do the fix right
X-Git-Tag: holmes-import~141^2~1
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8408d77089abed7c7377001a9e44db5c3f0efe73;p=libucw.git

Another attempt to do the fix right
---

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 430977eb..484de745 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -43,11 +43,11 @@ install-configs:
 	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
 	install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
+# Submakefiles of libraries
 include $(s)/sherlock/Makefile
 endif
 
 ifdef CONFIG_CHARSET
-# Include makefiles of libraries we wish to use
 include $(s)/charset/Makefile
 endif
 
diff --git a/ucw/Makefile b/ucw/Makefile
index 71e2817b..90e28b2d 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -89,7 +89,10 @@ $(o)/ucw/asort-test: $(o)/ucw/asort-test.o $(LIBUCW)
 $(o)/ucw/redblack-test: $(o)/ucw/redblack-test.o $(LIBUCW)
 $(o)/ucw/binheap-test: $(o)/ucw/binheap-test.o $(LIBUCW)
 $(o)/ucw/lizard-test: $(o)/ucw/lizard-test.o $(LIBUCW)
-$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW) $(LIBCHARSET)
+$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW)
+ifdef CONFIG_CHARSET
+$(o)/ucw/kmp-test: $(LIBCHARSET)
+endif
 $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
 $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
 
diff --git a/ucw/kmp-test.c b/ucw/kmp-test.c
index ec34ce7e..038c6e75 100644
--- a/ucw/kmp-test.c
+++ b/ucw/kmp-test.c
@@ -50,7 +50,7 @@ test1(void)
   kmp1_cleanup(&kmp);
 }
 
-#ifdef CONFIG_CHARSET		/* This one depends on LIBCHARSET */
+#ifdef CONFIG_CHARSET		/* This one depends on libcharset */
 
 /* TEST2 - various tracing */