X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=4ac61cccd6858142cb2840f85544ab5c637ee34e;hb=0db6e10eac28f38bfc3b325b13ad95107c58ce1e;hp=651dea310874e68df6d63bde57e453059deec08f;hpb=362c9ff7f8aadb97d38092335ac17ad52b5e8ece;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index 651dea31..4ac61ccc 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -35,7 +35,8 @@ LIBUCW_MODS= \
 	strtonum \
 	resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
 	daemon daemon-ctrl \
-	signames
+	signames \
+	opt opt-help opt-conf
 
 LIBUCW_MAIN_INCLUDES= \
 	lib.h log.h threads.h time.h \
@@ -64,7 +65,8 @@ LIBUCW_MAIN_INCLUDES= \
 	resource.h trans.h \
 	daemon.h \
 	signames.h \
-	sighandler.h
+	sighandler.h \
+	opt.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -130,13 +132,14 @@ $(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)
+$(o)/ucw/opt-test: $(o)/ucw/opt-test.o $(LIBUCW)
 
-TESTS+=$(addprefix $(o)/ucw/,varint.test regex.test unicode.test hash-test.test mempool.test stkstring.test \
-    slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test ff-varint.test eltpool.test \
+TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.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 fb-multi.test url.test strtonum-test.test \
-    gary.test time.test crc.test signames.test md5.test bitops.test)
+    gary.test time.test crc.test signames.test md5.test bitops.test opt.test)
 
 $(o)/ucw/varint.test: $(o)/ucw/varint-t
 $(o)/ucw/regex.test: $(o)/ucw/regex-t
@@ -167,6 +170,7 @@ $(o)/ucw/time.test: $(o)/ucw/time-conf-t
 $(o)/ucw/crc.test: $(o)/ucw/crc-t
 $(o)/ucw/signames.test: $(o)/ucw/signames-t
 $(o)/ucw/md5.test: $(o)/ucw/md5-t
+$(o)/ucw/opt.test: $(o)/ucw/opt-test
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/ucw/,asio.test)
@@ -205,7 +209,7 @@ install-libucw-lib:
 .PHONY: install-libucw-lib
 
 INSTALL_TARGETS+=install-libucw-api
-install-libucw-api:
+install-libucw-api: install-ucw-sorter-api
 	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
 	install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)