Patrik needs lib/binsearch.h in the library package.

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index e8bee413af431d2241d40eb2c3b542f22269e13f..d884ffb059ad55107f4ee98013f704243c0f9e71 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,7 +8,7 @@ endif
 
 LIBUCW_MODS= \
        threads \
 
 LIBUCW_MODS= \
        threads \

-       alloc alloc_str realloc mempool mempool-str mempool-fmt \
+       alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt \

        mmap pagecache partmap hashfunc \
        lists slists simple-lists sorter bitsig \
        log log-file proctitle \
        mmap pagecache partmap hashfunc \
        lists slists simple-lists sorter bitsig \
        log log-file proctitle \


@@ -31,12 +31,12 @@ LIBUCW_MODS= \
        qache \
        string \
        bbuf \
        qache \
        string \
        bbuf \

-       workqueue
+       getopt

 
 LIBUCW_INCLUDES= \
        lib.h config.h threads.h math.h \
        mempool.h pagecache.h \
 
 LIBUCW_INCLUDES= \
        lib.h config.h threads.h math.h \
        mempool.h pagecache.h \

-       sorter.h arraysort.h \
+       sorter.h sorter-globals.h arraysort.h \

        lists.h clists.h \
        unaligned.h prefetch.h \
        bbuf.h gbuf.h bitarray.h bitsig.h \
        lists.h clists.h \
        unaligned.h prefetch.h \
        bbuf.h gbuf.h bitarray.h bitsig.h \


@@ -55,7 +55,7 @@ LIBUCW_INCLUDES= \
        md5.h \
        base64.h base224.h \
        qache.h \
        md5.h \
        base64.h base224.h \
        qache.h \

-       workqueue.h
+       kmp.h kmp-search.h binsearch.h

 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading


@@ -68,6 +68,10 @@ ifdef CONFIG_OWN_REGEX
 include $(s)/lib/regex/Makefile
 endif
 
 include $(s)/lib/regex/Makefile
 endif
 

+ifdef CONFIG_OWN_GETOPT
+include $(s)/lib/getopt/Makefile
+endif
+

 LIBUCW=$(o)/lib/libucw.$(LS)
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
 LIBUCW=$(o)/lib/libucw.$(LS)
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 


@@ -91,18 +95,19 @@ $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
 $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 
 $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 

-$(o)/lib/workqueue-t: LIBS+=-lpthread  # FIXME
+TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test \
+    slists.test kmp-test.test bbuf.test getopt.test)

 
 

-TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.test bbuf.test)

 $(o)/lib/regex.test: $(o)/lib/regex-t
 $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
 $(o)/lib/hash-test.test: $(o)/lib/hash-test
 $(o)/lib/regex.test: $(o)/lib/regex-t
 $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
 $(o)/lib/hash-test.test: $(o)/lib/hash-test

-$(o)/lib/mempool.test: $(o)/lib/mempool-fmt-t $(o)/lib/mempool-str-t
+$(o)/lib/mempool.test: $(o)/lib/mempool-t $(o)/lib/mempool-fmt-t $(o)/lib/mempool-str-t

 $(o)/lib/stkstring.test: $(o)/lib/stkstring-t
 $(o)/lib/bitops.test: $(o)/lib/bit-ffs-t $(o)/lib/bit-fls-t
 $(o)/lib/slists.test: $(o)/lib/slists-t
 $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
 $(o)/lib/bbuf.test: $(o)/lib/bbuf-t
 $(o)/lib/stkstring.test: $(o)/lib/stkstring-t
 $(o)/lib/bitops.test: $(o)/lib/bit-ffs-t $(o)/lib/bit-fls-t
 $(o)/lib/slists.test: $(o)/lib/slists-t
 $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
 $(o)/lib/bbuf.test: $(o)/lib/bbuf-t

+$(o)/lib/getopt.test: $(o)/lib/getopt-t

 
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
 
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))