Fix kmp-test in libs-only distribution

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 7ee57edd82dafd311d62264d26637537f93acbe8..6135235d0b05cd907da24a0a1122c43f335648b5 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -18,6 +18,13 @@ include $(BUILDSYS)/Maketop
 # Install the build system
 include $(BUILDSYS)/Makefile
 
+ifndef CONFIG_UCW_ONLY
+# Set up names of common libraries (to avoid forward references in rules)
+LIBCHARSET=$(o)/charset/libcharset.pc
+LIBSH=$(o)/sherlock/libsh.pc
+LIBSHXML=$(o)/sherlock/xml/libshxml.pc
+endif
+
 # The UCW library
 include $(s)/ucw/Makefile
 
@@ -35,11 +42,6 @@ install-configs:
        install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
        install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
-# Set up names of common libraries (to avoid forward references in rules)
-LIBCHARSET=$(o)/charset/libcharset.pc
-LIBSH=$(o)/sherlock/libsh.pc
-LIBSHXML=$(o)/sherlock/xml/libshxml.pc
-
 # Include makefiles of libraries we wish to use
 include $(s)/charset/Makefile
 include $(s)/sherlock/Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index 6e7ca42c29de794234545a49ab82779baf8cd798..71e2817bcfafb45f03a7df3663fbb3ce650aea69 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -94,15 +94,11 @@ $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
 $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
 
 TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
-    slists.test bbuf.test getopt.test ff-unicode.test eltpool.test \
+    slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test eltpool.test \
     fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
     redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
     fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test url.test)
 
-ifdef LIBCHARSET
-TESTS+=$(o)/ucw/kmp-test.test
-endif
-
 $(o)/ucw/regex.test: $(o)/ucw/regex-t
 $(o)/ucw/unicode.test: $(o)/ucw/unicode-t
 $(o)/ucw/hash-test.test: $(o)/ucw/hash-test