Another attempt to do the fix right

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 430977eb28ea4afdd2109101b052f37df227f1f6..484de74553f76f2b21e560a5244e39a108491991 100644 (file)
--- 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 71e2817bcfafb45f03a7df3663fbb3ce650aea69..90e28b2da99cd8c9a0483dfacc2651cbed998bb6 100644 (file)
--- 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 ec34ce7e1193ed094ad8d8f5843058c99b968992..038c6e751c2cfa230383fb7de448acf103313e07 100644 (file)
--- 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 */