X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=CMakeLists.txt;fp=CMakeLists.txt;h=8514351b98a3c1540ac454c22dbd2e8230ef2f24;hp=8c285dcb8c8c1471628fb2fe0288ac256d924dd3;hb=25023c796a9a55cd7ec7ff364cd1229fab958679;hpb=d9513e62bf484eea8a9ca63c2bfac10f4bdb6c9f;ds=sidebyside diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c285dc..8514351 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ IF(LIBS STREQUAL "LIBS-NOTFOUND") SET(LIBS "") ENDIF() -SET(SOURCES main.c listen.c client.c utils.c file.c auth.c cgi.c relay.c proc.c plugin.c) +SET(SOURCES main.c listen.c client.c utils.c file.c auth.c cgi.c relay.c proc.c plugin.c handler.c) IF(TLS_SUPPORT) SET(SOURCES ${SOURCES} tls.c) ADD_DEFINITIONS(-DHAVE_TLS) @@ -33,7 +33,8 @@ IF(HAVE_SHADOW) ENDIF() ADD_EXECUTABLE(uhttpd ${SOURCES}) -TARGET_LINK_LIBRARIES(uhttpd ubox dl ${LIBS}) +FIND_LIBRARY(libjson NAMES json-c json) +TARGET_LINK_LIBRARIES(uhttpd ubox dl json_script blobmsg_json ${libjson} ${LIBS}) SET(PLUGINS "") IF(LUA_SUPPORT) @@ -69,7 +70,6 @@ IF(UBUS_SUPPORT) SET(PLUGINS ${PLUGINS} uhttpd_ubus) ADD_DEFINITIONS(-DHAVE_UBUS) ADD_LIBRARY(uhttpd_ubus MODULE ubus.c) - FIND_LIBRARY(libjson NAMES json-c json) TARGET_LINK_LIBRARIES(uhttpd_ubus ubus ubox blobmsg_json ${libjson}) ENDIF()