Improve build system: add --disable-shared support, fix library naming, conditional examples

1. Add --disable-shared and --disable-static options to configure/makefile
2. Make CMake static library output name consistent with Makefile (libhv.a)
3. Make Makefile examples target conditional based on module settings
4. Add multi-thread examples to CMakeLists.txt

Co-authored-by: ithewei <26049660+ithewei@users.noreply.github.com>

Author: Copilot

CMakeLists.txt

@@ -267,6 +267,7 @@ if(BUILD_STATIC)
     target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}
         INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
     target_link_libraries(hv_static ${LIBS})
+    set_target_properties(hv_static PROPERTIES OUTPUT_NAME hv)
     install(TARGETS hv_static
         EXPORT libhvConfig
         ARCHIVE DESTINATION lib)

Makefile

@@ -8,6 +8,9 @@ ifeq ($(WITH_KCP), yes)
 CORE_SRCDIRS += event/kcp
 endif
 
+BUILD_SHARED ?= yes
+BUILD_STATIC ?= yes
+
 LIBHV_SRCDIRS = $(CORE_SRCDIRS) util
 LIBHV_HEADERS = hv.h hconfig.h hexport.h
 LIBHV_HEADERS += $(BASE_HEADERS) $(SSL_HEADERS) $(EVENT_HEADERS) $(UTIL_HEADERS)
@@ -52,8 +55,8 @@ default: all
 all: libhv examples
 	@echo "make all done, please enjoy libhv."
 
-examples: hmain_test htimer_test hloop_test pipe_test \
-	nc nmap tinyhttpd tinyproxyd httpd curl wget wrk consul \
+EXAMPLES = hmain_test htimer_test hloop_test pipe_test \
+	nc tinyhttpd tinyproxyd \
 	tcp_client_test \
 	tcp_echo_server \
 	tcp_chat_server \
@@ -64,13 +67,29 @@ examples: hmain_test htimer_test hloop_test pipe_test \
 	multi-acceptor-processes \
 	multi-acceptor-threads \
 	one-acceptor-multi-workers \
-	http_server_test http_client_test \
-	websocket_server_test \
-	websocket_client_test \
-	mqtt_sub \
-	mqtt_pub \
-	mqtt_client_test \
 	jsonrpc
+
+ifeq ($(WITH_EVPP), yes)
+EXAMPLES += nmap
+ifeq ($(WITH_HTTP), yes)
+EXAMPLES += wrk
+ifeq ($(WITH_HTTP_SERVER), yes)
+EXAMPLES += http_server_test websocket_server_test
+endif
+ifeq ($(WITH_HTTP_CLIENT), yes)
+EXAMPLES += curl wget consul http_client_test websocket_client_test
+ifeq ($(WITH_HTTP_SERVER), yes)
+EXAMPLES += httpd
+endif
+endif
+endif
+endif
+
+ifeq ($(WITH_MQTT), yes)
+EXAMPLES += mqtt_sub mqtt_pub mqtt_client_test
+endif
+
+examples: $(EXAMPLES)
 	@echo "make examples done."
 
 clean:
@@ -84,7 +103,17 @@ prepare:
 
 libhv:
 	$(MKDIR) lib
+ifeq ($(BUILD_SHARED), yes)
+ifeq ($(BUILD_STATIC), yes)
 	$(MAKEF) TARGET=$@ TARGET_TYPE="SHARED|STATIC" SRCDIRS="$(LIBHV_SRCDIRS)"
+else
+	$(MAKEF) TARGET=$@ TARGET_TYPE="SHARED" SRCDIRS="$(LIBHV_SRCDIRS)"
+endif
+else
+ifeq ($(BUILD_STATIC), yes)
+	$(MAKEF) TARGET=$@ TARGET_TYPE="STATIC" SRCDIRS="$(LIBHV_SRCDIRS)"
+endif
+endif
 	$(MKDIR) include/hv
 	$(CP) $(LIBHV_HEADERS) include/hv
 	@echo "make libhv done."

config.ini

@@ -5,6 +5,9 @@ PREFIX=/usr/local
 INSTALL_INCDIR=$(PREFIX)/include/hv
 INSTALL_LIBDIR=$(PREFIX)/lib
 
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+
 # modules
 # include icmp dns ftp smtp
 WITH_PROTOCOL=no

config.mk

@@ -1,20 +1,40 @@
+# Don't modify this file, you should modify config.mk or
+# run ./configure --with-MODULE --enable-FEATURE
 
 PREFIX=/usr/local
 INSTALL_INCDIR=$(PREFIX)/include/hv
 INSTALL_LIBDIR=$(PREFIX)/lib
+
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+
+# modules
+# include icmp dns ftp smtp
 WITH_PROTOCOL=no
+
 WITH_EVPP=yes
 WITH_HTTP=yes
 WITH_HTTP_SERVER=yes
 WITH_HTTP_CLIENT=yes
 WITH_MQTT=no
+
+# features
+# base/hsocket.h: Unix Domain Socket
 ENABLE_UDS=no
+# base/RAII.cpp: Windows MiniDumpWriteDump
 ENABLE_WINDUMP=no
+# http/http_content.h: KeyValue,QueryParams,MultiPart
 USE_MULTIMAP=no
+
+# dependencies
+# for http/client
 WITH_CURL=no
+# for http2
 WITH_NGHTTP2=no
+# for SSL/TLS
 WITH_OPENSSL=no
 WITH_GNUTLS=no
 WITH_MBEDTLS=no
+
+# rudp
 WITH_KCP=no
-CONFIG_DATE=20220224

configure

@@ -17,6 +17,12 @@ options:
   --enable-FEATURE
   --disable-FEATURE
 
+build:
+  --enable-shared           build shared library?          (DEFAULT: $BUILD_SHARED)
+  --disable-shared          do not build shared library
+  --enable-static           build static library?          (DEFAULT: $BUILD_STATIC)
+  --disable-static          do not build static library
+
 modules:
   --with-protocol       compile protocol module?        (DEFAULT: $WITH_PROTOCOL)
   --with-evpp           compile evpp module?            (DEFAULT: $WITH_EVPP)
@@ -65,6 +71,20 @@ do
             KEY="INSTALL_LIBDIR"
             VAL=${opt:9}
             ;;
+        --enable-shared)
+            KEY="BUILD_SHARED"
+            ;;
+        --disable-shared)
+            KEY="BUILD_SHARED"
+            VAL=no
+            ;;
+        --enable-static)
+            KEY="BUILD_STATIC"
+            ;;
+        --disable-static)
+            KEY="BUILD_STATIC"
+            VAL=no
+            ;;
         --with-*)
             KEY="WITH_${opt:7}"
             ;;

examples/CMakeLists.txt

@@ -12,6 +12,9 @@ list(APPEND EXAMPLES
     udp_echo_server
     udp_proxy_server
     socks5_proxy_server
+    multi-acceptor-processes
+    multi-acceptor-threads
+    one-acceptor-multi-workers
     jsonrpc_client
     jsonrpc_server
 )
@@ -57,6 +60,15 @@ target_link_libraries(udp_proxy_server ${HV_LIBRARIES})
 add_executable(socks5_proxy_server socks5_proxy_server.c)
 target_link_libraries(socks5_proxy_server ${HV_LIBRARIES})
 
+add_executable(multi-acceptor-processes multi-thread/multi-acceptor-processes.c)
+target_link_libraries(multi-acceptor-processes ${HV_LIBRARIES})
+
+add_executable(multi-acceptor-threads multi-thread/multi-acceptor-threads.c)
+target_link_libraries(multi-acceptor-threads ${HV_LIBRARIES})
+
+add_executable(one-acceptor-multi-workers multi-thread/one-acceptor-multi-workers.c)
+target_link_libraries(one-acceptor-multi-workers ${HV_LIBRARIES})
+
 add_executable(jsonrpc_client jsonrpc/jsonrpc_client.c jsonrpc/cJSON.c)
 target_compile_definitions(jsonrpc_client PRIVATE CJSON_HIDE_SYMBOLS)
 target_link_libraries(jsonrpc_client ${HV_LIBRARIES})