net/*: do not use file globbing

net/http/CMakeLists.txt

@@ -3,9 +3,6 @@
 # @author Pere Mato, CERN
 ############################################################################
 
-ROOT_GLOB_HEADERS(headers inc/*.h)
-ROOT_GLOB_SOURCES(sources src/*.cxx civetweb/civetweb.c)
-
 find_path(FASTCGI_INCLUDE_DIR fcgiapp.h
   $ENV{FASTCGI_DIR}/include
   /usr/local/include
@@ -47,10 +44,38 @@ if(RT_LIBRARY)
 endif()
 
 ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP
-                              HEADERS ${headers}
-                              SOURCES ${sources}
-                              LIBRARIES ZLIB::ZLIB ${RT_LIBRARIES} ${FASTCGI_LIBRARY} ${CMAKE_DL_LIBS}
-                              DEPENDENCIES Thread RIO)
+  HEADERS
+    THttpCallArg.h
+    THttpEngine.h
+    THttpServer.h
+    THttpWSHandler.h
+    TRootSniffer.h
+    TRootSnifferStore.h
+  SOURCES
+    src/TCivetweb.cxx
+    src/TCivetweb.h
+    src/TFastCgi.cxx
+    src/TFastCgi.h
+    src/THttpCallArg.cxx
+    src/THttpEngine.cxx
+    src/THttpLongPollEngine.cxx
+    src/THttpLongPollEngine.h
+    src/THttpServer.cxx
+    src/THttpWSEngine.cxx
+    src/THttpWSEngine.h
+    src/THttpWSHandler.cxx
+    src/TRootSniffer.cxx
+    src/TRootSnifferStore.cxx
+    civetweb/civetweb.c
+  LIBRARIES
+    ZLIB::ZLIB
+    ${RT_LIBRARIES}
+    ${FASTCGI_LIBRARY}
+    ${CMAKE_DL_LIBS}
+  DEPENDENCIES
+    RIO
+    Thread
+)
 
 target_compile_definitions(RHTTP PUBLIC -DUSE_WEBSOCKET)
 

net/rpdutils/CMakeLists.txt

@@ -3,18 +3,8 @@
 # @author Pere Mato, CERN
 ############################################################################
 
-ROOT_GLOB_SOURCES(rpdutilsrcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}  ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
-list(REMOVE_ITEM rpdutilsrcs src/rpdpriv.cxx src/rpdconn.cxx)
+include_directories(res ../auth/res)
 
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/res
-  ${CMAKE_CURRENT_SOURCE_DIR}/../auth/res)
-
-if(MACOSX_SSL_DEPRECATED)
-  set_source_files_properties(src/rpdutils.cxx COMPILE_FLAGS "-Wno-deprecated-declarations" )
-endif()
-
-#---Authentication methods-----------------------------------------------------------------
 if(shadowpw)
   add_definitions(-DR__SHADOWPW)
 endif()
@@ -23,13 +13,25 @@ if(ssl)
   include_directories(${OPENSSL_INCLUDE_DIR})
 endif()
 
-#---static library needed for rootd and proofd --------------------------------------------
-add_library(rpdutil STATIC ${rpdutilsrcs})
+add_library(rpdutil STATIC
+  src/daemon.cxx
+  src/error.cxx
+  src/net.cxx
+  src/netpar.cxx
+  src/rpdutils.cxx
+)
+
 target_link_libraries(rpdutil INTERFACE ${CRYPTLIBS})
 set_property(TARGET rpdutil PROPERTY POSITION_INDEPENDENT_CODE ON)
 add_dependencies(rpdutil move_headers)
 
 ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx
-  LIBRARIES rpdutil rsa ${OPENSSL_LIBRARIES}
-  DEPENDENCIES Net
-  BUILTINS OPENSSL)
+  LIBRARIES
+    ${OPENSSL_LIBRARIES}
+    rpdutil
+    rsa
+  DEPENDENCIES
+    Net
+  BUILTINS
+    OPENSSL
+)