Opt: Documented opt and its interaction with conf

[libucw.git] / ucw / Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index 873f06e189b9914fc87457728687ffbf476a554a..4ac61cccd6858142cb2840f85544ab5c637ee34e 100644 (file)
--- 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 \
        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 \
 
 LIBUCW_MAIN_INCLUDES= \
        lib.h log.h threads.h time.h \


@@ -51,7 +52,7 @@ LIBUCW_MAIN_INCLUDES= \
        prime.h \
        bitops.h \
        conf.h getopt.h ipaccess.h \
        prime.h \
        bitops.h \
        conf.h getopt.h ipaccess.h \

-       fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h \
+       fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h fb-socket.h \

        url.h \
        mainloop.h \
        process.h \
        url.h \
        mainloop.h \
        process.h \


@@ -63,7 +64,9 @@ LIBUCW_MAIN_INCLUDES= \
        strtonum.h \
        resource.h trans.h \
        daemon.h \
        strtonum.h \
        resource.h trans.h \
        daemon.h \

-       signames.h
+       signames.h \
+       sighandler.h \
+       opt.h

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


@@ -86,16 +89,28 @@ include $(s)/ucw/doc/Makefile
 
 LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
 
 
 LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
 

-$(o)/ucw/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw.so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
+export LIBUCW_LIBS=
+ifdef CONFIG_UCW_THREADS
+LIBUCW_LIBS+=-lpthread
+endif
+ifdef CONFIG_UCW_PCRE
+LIBUCW_LIBS+=-lpcre
+endif
+ifdef CONFIG_UCW_MONOTONIC_CLOCK
+LIBUCW_LIBS+=-lrt
+endif
+
+$(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV)-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.0
+$(o)/ucw/libucw$(LV).so: LIBS+=$(LIBUCW_LIBS)

 
 ifdef CONFIG_STATIC_PIC
 
 ifdef CONFIG_STATIC_PIC

-$(o)/ucw/libucw.pc: $(o)/ucw/libucw-pic.a
+$(o)/ucw/libucw.pc: $(o)/ucw/libucw$(LV)-pic.a

 endif
 ifdef CONFIG_INSTALL_API
 endif
 ifdef CONFIG_INSTALL_API

-$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw,.a -pic.a .so)
+$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a .so)

 endif
 
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
 endif
 
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops


@@ -117,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)
 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 \
     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
 
 $(o)/ucw/varint.test: $(o)/ucw/varint-t
 $(o)/ucw/regex.test: $(o)/ucw/regex-t


@@ -154,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/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)
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/ucw/,asio.test)


@@ -184,20 +201,24 @@ endif
 
 CONFIGS+=libucw
 
 
 CONFIGS+=libucw
 

-INSTALL_TARGETS+=install-libucw install-libucw-api
-
-install-libucw:
+INSTALL_TARGETS+=install-libucw-lib
+install-libucw-lib:

        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)

-       install -m 644 run/lib/libucw.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so.$(UCW_ABI_VERSION)
+       install -m 644 run/lib/libucw$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0.0
+       ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0
+.PHONY: install-libucw-lib

 
 

-install-libucw-api:
+INSTALL_TARGETS+=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)
        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)

-       ln -sf libucw.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so
-       install -m 644 run/lib/libucw.a $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
-       #install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
-       #install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
-
-.PHONY: install-libucw install-libucw-api
+       ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so
+       install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-api
+
+INSTALL_TARGETS+=install-libucw-config
+install-libucw-config:
+       install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+       install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
+.PHONY: install-libucw-config