X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=4b2868860b787f04a840ecbf5c6a3e613b53502f;hb=c3fe49f62ac8d87e4e0ac836891792e9c10035a2;hp=d9ce3589a9877536a508c483fedf4c685693bb77;hpb=a799cc2909f47d918d1ec7171a9edba28a9f5136;p=onak.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9ce358..4b28688 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ endif()
 # Backends
 
 # These have no dependencies and can always be compiled
-set(BACKENDS "file" "fs" "stacked")
+set(BACKENDS "file" "fs" "keyring" "stacked")
 
 # DB4 backend (add check for existence)
 LIST(APPEND BACKENDS db4)
@@ -130,22 +130,31 @@ target_compile_definitions(libonak PRIVATE
 target_sources(libonak PRIVATE keydb_${DBTYPE}.c)
 target_link_libraries(libonak ${LIBONAK_LIBRARIES})
 
+# Build files that have substitutions in them
+include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+configure_file("${CMAKE_SOURCE_DIR}/build-config.h.in"
+	"${CMAKE_BINARY_DIR}/build-config.h" @ONLY)
+
+configure_file("${CMAKE_SOURCE_DIR}/onak.ini.in"
+	"${CMAKE_BINARY_DIR}/onak.ini" @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/onak.ini
+	DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+
+configure_file("${CMAKE_SOURCE_DIR}/onak-mail.pl.in"
+	"${CMAKE_BINARY_DIR}/onak-mail.pl" @ONLY)
+install(PROGRAMS ${CMAKE_BINARY_DIR}/onak-mail.pl
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/onak/)
+install(FILES onak-mail.pl.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/)
+
+# CGI directory
+add_subdirectory(cgi)
+
 # Executables start here
 
 # Swiss Army tool
 add_executable(onak onak.c)
 target_link_libraries(onak libonak)
 
-# CGI
-add_executable(add add.c)
-target_link_libraries(add libonak)
-add_executable(gpgwww gpgwww.c stats.c)
-target_link_libraries(gpgwww libonak)
-add_executable(hashquery hashquery.c)
-target_link_libraries(hashquery libonak)
-add_executable(lookup lookup.c)
-target_link_libraries(lookup libonak)
-
 # Tools that operate on the key DB
 add_executable(maxpath maxpath.c stats.c)
 target_link_libraries(maxpath libonak)
@@ -163,22 +172,6 @@ target_link_libraries(stripkey libonak)
 install(TARGETS onak splitkeys RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES onak.1 splitkeys.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
 
-# Build files that have substitutions in them
-include_directories(${CMAKE_BINARY_DIR})
-configure_file("${CMAKE_SOURCE_DIR}/build-config.h.in"
-	"${CMAKE_BINARY_DIR}/build-config.h" @ONLY)
-
-configure_file("${CMAKE_SOURCE_DIR}/onak.ini.in"
-	"${CMAKE_BINARY_DIR}/onak.ini" @ONLY)
-install(FILES ${CMAKE_BINARY_DIR}/onak.ini
-	DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-
-configure_file("${CMAKE_SOURCE_DIR}/onak-mail.pl.in"
-	"${CMAKE_BINARY_DIR}/onak-mail.pl" @ONLY)
-install(PROGRAMS ${CMAKE_BINARY_DIR}/onak-mail.pl
-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/onak/)
-install(FILES onak-mail.pl.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/)
-
 # Basic unit tests
 enable_testing()
 add_test(NAME syntaxtest COMMAND perl -cw ${CMAKE_BINARY_DIR}/onak-mail.pl)