Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.11

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index c204d6e664ea8cdcd22b7e4d15395b4ecf5da507..52751e11e95035c8e88d4631824df3b12f09e7c7 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -12,7 +12,7 @@ LIBUCW_MODS= \
        threads \
        alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \
        mmap pagecache partmap hashfunc \
-       lists slists simple-lists sorter bitsig \
+       lists slists simple-lists bitsig \
        log log-file proctitle \
        conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
        ipaccess \
@@ -38,7 +38,7 @@ LIBUCW_MODS= \
 LIBUCW_INCLUDES= \
        lib.h config.h threads.h \
        mempool.h pagecache.h \
-       sorter.h sorter-globals.h arraysort.h \
+       arraysort.h \
        lists.h clists.h slists.h simple-lists.h \
        unaligned.h prefetch.h \
        bbuf.h gbuf.h bitarray.h bitsig.h \
@@ -59,7 +59,7 @@ LIBUCW_INCLUDES= \
        md5.h \
        base64.h base224.h \
        qache.h \
-       kmp.h kmp-search.h \
+       kmp.h kmp-search.h binsearch.h \
        partmap.h
 
 ifdef CONFIG_UCW_THREADS
@@ -89,7 +89,6 @@ $(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 $(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
 $(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
 $(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
-$(o)/lib/sort-test: $(o)/lib/sort-test.o $(LIBUCW)
 $(o)/lib/lfs-test: $(o)/lib/lfs-test.o $(LIBUCW)
 $(o)/lib/hash-test: $(o)/lib/hash-test.o $(LIBUCW)
 $(o)/lib/str-test: $(o)/lib/str-test.o $(LIBUCW)
@@ -123,10 +122,8 @@ endif
 
 API_LIBS+=libucw
 API_INCLUDES+=$(o)/lib/.include-stamp
-# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
-# before make ever starts, so this is safe.
-$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-       $(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES)) obj/autoconf.h
+       $(Q)$(s)/build/install-includes $(<D) run/include/lib $(LIBUCW_INCLUDES)
        $(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
        $(Q)touch $@
 run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc