X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2FMakefile;h=d884ffb059ad55107f4ee98013f704243c0f9e71;hb=f635f4d406f772b54455331cdf23cc10a361392a;hp=83f2bcad409368a7eeb5327771d6262316633522;hpb=ff5257feacf559166e158afb94b65191de3c2590;p=libucw.git diff --git a/lib/Makefile b/lib/Makefile index 83f2bcad..d884ffb0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -30,12 +30,13 @@ LIBUCW_MODS= \ sync \ qache \ string \ - bbuf + bbuf \ + getopt 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 \ @@ -53,7 +54,8 @@ LIBUCW_INCLUDES= \ lizard.h \ md5.h \ base64.h base224.h \ - qache.h + qache.h \ + kmp.h kmp-search.h binsearch.h ifdef CONFIG_UCW_THREADS # Some modules require threading @@ -66,6 +68,10 @@ ifdef CONFIG_OWN_REGEX 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)) @@ -89,7 +95,9 @@ $(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) -TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.test bbuf.test) +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) + $(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 @@ -99,6 +107,7 @@ $(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))