Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 18:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename "shared" library to "common"

Browse source 
The named "shared" is confusing, especially now that these features are
built as a static library instead of being directly compiled into the
various applications.
This commit is contained in:
Micah Snyder 2021-03-04 19:39:50 -08:00
parent 5d30d08d50
commit c025afd683
103 changed files with 118 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -779,7 +779,7 @@ endif()
add_subdirectory( libclamav ) add_subdirectory( libclamav )
if(NOT ENABLE_LIBCLAMAV_ONLY) if(NOT ENABLE_LIBCLAMAV_ONLY)
add_subdirectory( shared ) add_subdirectory( common )
add_subdirectory( libfreshclam ) add_subdirectory( libfreshclam )

4
Makefile.am
View file

@ -25,8 +25,8 @@ SUBDIRS = libclamav
bin_SCRIPTS=clamav-config bin_SCRIPTS=clamav-config
else else
SUBDIRS = libltdl libclamav shared libfreshclam clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests SUBDIRS = libltdl libclamav common libfreshclam clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
EXTRA_DIST = examples shared libclamav.pc.in COPYING.txt COPYING platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.cmake.md INSTALL.autotools.md NEWS.md README.md cmake CMakeLists.txt CMakeOptions.cmake $(top_srcdir)/**/CMakeLists.txt libclammspack/config.h.in.cmake clamav-config.h.cmake.in target.h.cmake.in autogen.sh EXTRA_DIST = examples common libclamav.pc.in COPYING.txt COPYING platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.cmake.md INSTALL.autotools.md NEWS.md README.md cmake CMakeLists.txt CMakeOptions.cmake $(top_srcdir)/**/CMakeLists.txt libclammspack/config.h.in.cmake clamav-config.h.cmake.in target.h.cmake.in autogen.sh
bin_SCRIPTS=clamav-config bin_SCRIPTS=clamav-config

4
clam-format
View file

@ -35,8 +35,8 @@ clang-format -i -verbose libclamunrar_iface/*.cpp
clang-format -i -verbose libclamunrar_iface/*.h clang-format -i -verbose libclamunrar_iface/*.h
clang-format -i -verbose libfreshclam/*.c clang-format -i -verbose libfreshclam/*.c
clang-format -i -verbose libfreshclam/*.h clang-format -i -verbose libfreshclam/*.h
clang-format -i -verbose shared/*.c clang-format -i -verbose common/*.c
clang-format -i -verbose shared/*.h clang-format -i -verbose common/*.h
clang-format -i -verbose sigtool/*.c clang-format -i -verbose sigtool/*.c
clang-format -i -verbose sigtool/*.h clang-format -i -verbose sigtool/*.h
clang-format -i -verbose clamonacc/*.c clang-format -i -verbose clamonacc/*.c

2
clamav-milter/CMakeLists.txt
View file

@ -20,6 +20,6 @@ set_target_properties( clamav-milter PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamav-milter target_link_libraries( clamav-milter
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ClamAV::common
Sendmail::milter ) Sendmail::milter )
install(TARGETS clamav-milter DESTINATION ${CMAKE_INSTALL_SBINDIR}) install(TARGETS clamav-milter DESTINATION ${CMAKE_INSTALL_SBINDIR})

4
clamav-milter/Makefile.am
View file

@ -37,6 +37,6 @@ AM_CFLAGS=@WERR_CFLAGS_MILTER@
endif endif
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/common -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
clamav-milter/clamav-milter.c
View file

@ -41,7 +41,7 @@
#include "clamav.h" #include "clamav.h"
#include "default.h" #include "default.h"
// shared // common
#include "output.h" #include "output.h"
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
clamav-milter/clamfi.c
View file

@ -38,7 +38,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamav-milter/netcode.c
View file

@ -49,7 +49,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "output.h" #include "output.h"
#include "optparser.h" #include "optparser.h"

2
clamav-milter/whitelist.c
View file

@ -30,7 +30,7 @@
// libclamav // libclamav
#include "regex/regex.h" #include "regex/regex.h"
// shared // common
#include "output.h" #include "output.h"
#include "whitelist.h" #include "whitelist.h"

2
clambc/CMakeLists.txt
View file

@ -25,7 +25,7 @@ set_target_properties( clambc PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clambc target_link_libraries( clambc
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS clambc DESTINATION .) install(TARGETS clambc DESTINATION .)
else() else()

4
clambc/Makefile.am
View file

@ -3,6 +3,6 @@ clambc_SOURCES = \
bcrun.c bcrun.c
AM_CFLAGS=@WERR_CFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CFLAGS=@WERR_CFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @THREAD_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @THREAD_LIBS@
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
clambc/bcrun.c
View file

@ -35,7 +35,7 @@
#include "bytecode.h" #include "bytecode.h"
#include "bytecode_priv.h" #include "bytecode_priv.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
clamconf/CMakeLists.txt
View file

@ -25,7 +25,7 @@ set_target_properties( clamconf PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamconf target_link_libraries( clamconf
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS clamconf DESTINATION .) install(TARGETS clamconf DESTINATION .)
else() else()

4
clamconf/Makefile.am
View file

@ -26,10 +26,10 @@ clamconf_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@ @SSL_CPPFLAGS@ AM_CFLAGS=@WERR_CFLAGS@ @SSL_CPPFLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \ AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \
@ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@\ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@\
-DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\ -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
-DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\ -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
-DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\"" -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
clamconf/clamconf.c
View file

@ -49,7 +49,7 @@
#include "bytecode_detect.h" #include "bytecode_detect.h"
#include "fpu.h" #include "fpu.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
clamd/CMakeLists.txt
View file

@ -40,7 +40,7 @@ set_target_properties( clamd PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamd target_link_libraries( clamd
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS clamd DESTINATION .) install(TARGETS clamd DESTINATION .)
else() else()

4
clamd/Makefile.am
View file

@ -44,8 +44,8 @@ if INSTALL_SYSTEMD_UNITS
systemdsystemunit_DATA = clamav-daemon.socket clamav-daemon.service systemdsystemunit_DATA = clamav-daemon.socket clamav-daemon.service
endif endif
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMD_LIBS@ @THREAD_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMD_LIBS@ @THREAD_LIBS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
# it does support --help and --version but with the default config file # it does support --help and --version but with the default config file
# it outputs an error message which tells us to edit the config files # it outputs an error message which tells us to edit the config files

2
clamd/clamd.c
View file

@ -63,7 +63,7 @@
#include "matcher-ac.h" #include "matcher-ac.h"
#include "readdb.h" #include "readdb.h"
// shared // common
#include "output.h" #include "output.h"
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
clamd/clamd_others.c
View file

@ -73,7 +73,7 @@
#include "scanners.h" #include "scanners.h"
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamd/localserver.c
View file

@ -40,7 +40,7 @@
#include "clamav.h" #include "clamav.h"
#include "str.h" #include "str.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamd/scanner.c
View file

@ -51,7 +51,7 @@
#include "others.h" #include "others.h"
#include "scanners.h" #include "scanners.h"
// shared // common
#include "idmef_logging.h" #include "idmef_logging.h"
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamd/scanner.h
View file

@ -28,7 +28,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "thrmgr.h" #include "thrmgr.h"

2
clamd/server-th.c
View file

@ -51,7 +51,7 @@
#include "others.h" #include "others.h"
#include "readdb.h" #include "readdb.h"
// shared // common
#include "output.h" #include "output.h"
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
clamd/server.h
View file

@ -29,7 +29,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "thrmgr.h" #include "thrmgr.h"

2
clamd/session.c
View file

@ -55,7 +55,7 @@
#include "str.h" #include "str.h"
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamd/session.h
View file

@ -52,7 +52,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "server.h" #include "server.h"

2
clamd/tcpserver.c
View file

@ -40,7 +40,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamd/thrmgr.c
View file

@ -35,7 +35,7 @@
#include "others.h" #include "others.h"
#include "mpool.h" #include "mpool.h"
// shared // common
#include "output.h" #include "output.h"
#include "thrmgr.h" #include "thrmgr.h"

2
clamdscan/CMakeLists.txt
View file

@ -29,7 +29,7 @@ set_target_properties( clamdscan PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamdscan target_link_libraries( clamdscan
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS clamdscan DESTINATION .) install(TARGETS clamdscan DESTINATION .)
else() else()

4
clamdscan/Makefile.am
View file

@ -28,8 +28,8 @@ clamdscan_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
LIBS = $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la @CLAMDSCAN_LIBS@ @THREAD_LIBS@ LIBS = $(top_builddir)/common/libcommon.la $(top_builddir)/libclamav/libclamav.la @CLAMDSCAN_LIBS@ @THREAD_LIBS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT) AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
clamdscan/clamdscan.c
View file

@ -38,7 +38,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"
#include "optparser.h" #include "optparser.h"

2
clamdscan/client.c
View file

@ -58,7 +58,7 @@
#include "str.h" #include "str.h"
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamdscan/proto.c
View file

@ -56,7 +56,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "actions.h" #include "actions.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamdtop/CMakeLists.txt
View file

@ -25,7 +25,7 @@ set_target_properties( clamdtop PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamdtop target_link_libraries( clamdtop
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ClamAV::common
Curses::curses ) Curses::curses )
if(WIN32) if(WIN32)
install(TARGETS clamdtop DESTINATION .) install(TARGETS clamdtop DESTINATION .)

4
clamdtop/Makefile.am
View file

@ -5,8 +5,8 @@ clamdtop_SOURCES = \
clamdtop.c clamdtop.c
AM_CFLAGS=@WERR_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
clamdtop_LDADD = @SSL_LDFLAGS@ @SSL_LIBS@ @CURSES_LIBS@ @THREAD_LIBS@ $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la clamdtop_LDADD = @SSL_LDFLAGS@ @SSL_LIBS@ @CURSES_LIBS@ @THREAD_LIBS@ $(top_builddir)/common/libcommon.la $(top_builddir)/libclamav/libclamav.la
endif endif
DEFS = @DEFS@ DEFS = @DEFS@

2
clamdtop/clamdtop.c
View file

@ -65,7 +65,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
clamonacc/CMakeLists.txt
View file

@ -47,7 +47,7 @@ set_target_properties( clamonacc PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamonacc target_link_libraries( clamonacc
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ClamAV::common
CURL::libcurl ) CURL::libcurl )
install(TARGETS clamonacc DESTINATION ${CMAKE_INSTALL_SBINDIR}) install(TARGETS clamonacc DESTINATION ${CMAKE_INSTALL_SBINDIR})

4
clamonacc/Makefile.am
View file

@ -58,8 +58,8 @@ if INSTALL_SYSTEMD_UNITS
systemdsystemunit_DATA = clamav-clamonacc.service systemdsystemunit_DATA = clamav-clamonacc.service
endif endif
LIBS = $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@ LIBS = $(top_builddir)/common/libcommon.la $(top_builddir)/libclamav/libclamav.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamonacc -I$(top_srcdir)/shared -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamonacc -I$(top_srcdir)/common -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamonacc$(EXEEXT) AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamonacc$(EXEEXT)
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
clamonacc/clamonacc.c
View file

@ -46,7 +46,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"
#include "optparser.h" #include "optparser.h"

2
clamonacc/client/client.c
View file

@ -57,7 +57,7 @@
#include "str.h" #include "str.h"
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamonacc/client/protocol.c
View file

@ -57,7 +57,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "actions.h" #include "actions.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
clamonacc/fanotif/fanotif.c
View file

@ -40,7 +40,7 @@
#include "clamav.h" #include "clamav.h"
#include "scanners.h" #include "scanners.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamonacc/inotif/hash.c
View file

@ -42,7 +42,7 @@
#include "scanners.h" #include "scanners.h"
#include "str.h" #include "str.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamonacc/inotif/inotif.c
View file

@ -43,7 +43,7 @@
#include "clamav.h" #include "clamav.h"
#include "scanners.h" #include "scanners.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamonacc/inotif/inotif.h
View file

@ -26,7 +26,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "clamonacc.h" #include "clamonacc.h"

2
clamonacc/misc/utils.c
View file

@ -34,7 +34,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamonacc/misc/utils.h
View file

@ -24,7 +24,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "../clamonacc.h" #include "../clamonacc.h"

2
clamonacc/scan/onas_queue.c
View file

@ -35,7 +35,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamonacc/scan/thread.c
View file

@ -37,7 +37,7 @@
// libclamav // libclamav
#include "others.h" #include "others.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"

2
clamonacc/scan/thread.h
View file

@ -28,7 +28,7 @@
// libclamav // libclamav
#include "clamav.h" #include "clamav.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#define ONAS_SCTH_B_DIR 0x01 #define ONAS_SCTH_B_DIR 0x01

2
clamscan/CMakeLists.txt
View file

@ -28,7 +28,7 @@ set_target_properties( clamscan PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamscan target_link_libraries( clamscan
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS clamscan DESTINATION .) install(TARGETS clamscan DESTINATION .)
else() else()

4
clamscan/Makefile.am
View file

@ -30,7 +30,7 @@ clamscan_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @THREAD_LIBS@ @CLAMSCAN_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
clamscan/clamscan.c
View file

@ -45,7 +45,7 @@
#include "others.h" #include "others.h"
#include "str.h" #include "str.h"
// shared // common
#include "misc.h" #include "misc.h"
#include "output.h" #include "output.h"
#include "actions.h" #include "actions.h"

2
clamscan/manager.c
View file

@ -57,7 +57,7 @@
#include "str.h" #include "str.h"
#include "readdb.h" #include "readdb.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "actions.h" #include "actions.h"
#include "output.h" #include "output.h"

2
clamsubmit/CMakeLists.txt
View file

@ -25,7 +25,7 @@ set_target_properties( clamsubmit PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( clamsubmit target_link_libraries( clamsubmit
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ClamAV::common
JSONC::jsonc JSONC::jsonc
CURL::libcurl ) CURL::libcurl )
if(APPLE) if(APPLE)

4
clamsubmit/Makefile.am
View file

@ -23,8 +23,8 @@ clamsubmit_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@ @SSL_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@ @SSL_LIBS@
if MACOS if MACOS
AM_LDFLAGS = -framework CoreFoundation -framework Security AM_LDFLAGS = -framework CoreFoundation -framework Security

2
clamsubmit/clamsubmit.c
View file

@ -45,7 +45,7 @@
#include "clamav.h" #include "clamav.h"
#include "others.h" #include "others.h"
// shared // common
#include "misc.h" #include "misc.h"
#include "getopt.h" #include "getopt.h"
#include "cert_util.h" #include "cert_util.h"

38
shared/CMakeLists.txt → common/CMakeLists.txt
View file

@ -10,9 +10,9 @@ if(WIN32)
include_directories(${CMAKE_SOURCE_DIR}/win32/compat) include_directories(${CMAKE_SOURCE_DIR}/win32/compat)
endif() endif()
# The shared object library # The "common" object library
add_library( shared_obj OBJECT ) add_library( common_obj OBJECT )
target_sources( shared_obj target_sources( common_obj
PRIVATE PRIVATE
cert_util.c cert_util.c
cdiff.c cdiff.c
@ -38,24 +38,24 @@ target_sources( shared_obj
optparser.h optparser.h
output.h output.h
tar.h ) tar.h )
target_include_directories( shared_obj target_include_directories( common_obj
PRIVATE ${CMAKE_BINARY_DIR} PRIVATE ${CMAKE_BINARY_DIR}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
if(FOUND_SYSTEMD) if(FOUND_SYSTEMD)
target_include_directories( shared_obj target_include_directories( common_obj
PRIVATE ${SYSTEMD_INCLUDE_DIRS} ) PRIVATE ${SYSTEMD_INCLUDE_DIRS} )
endif() endif()
set_target_properties( shared_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" ) set_target_properties( common_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
if(APPLE) if(APPLE)
target_sources( shared_obj PRIVATE mac/cert_util_mac.m ) target_sources( common_obj PRIVATE mac/cert_util_mac.m )
elseif(WIN32) elseif(WIN32)
target_sources( shared_obj PRIVATE win/cert_util_win.c ) target_sources( common_obj PRIVATE win/cert_util_win.c )
else() else()
target_sources( shared_obj PRIVATE linux/cert_util_linux.c ) target_sources( common_obj PRIVATE linux/cert_util_linux.c )
endif() endif()
target_link_libraries( shared_obj target_link_libraries( common_obj
PUBLIC PUBLIC
ClamAV::libclamav ClamAV::libclamav
ZLIB::ZLIB ZLIB::ZLIB
@ -63,26 +63,26 @@ target_link_libraries( shared_obj
OpenSSL::SSL OpenSSL::SSL
OpenSSL::Crypto ) OpenSSL::Crypto )
if(WIN32) if(WIN32)
target_link_libraries( shared_obj target_link_libraries( common_obj
PUBLIC PUBLIC
crypt32 ) crypt32 )
endif() endif()
if(HAVE_SYSTEMD) if(HAVE_SYSTEMD)
target_link_libraries( shared_obj target_link_libraries( common_obj
PRIVATE PRIVATE
SYSTEMD::systemd ) SYSTEMD::systemd )
endif() endif()
# The shared static library. # The "common" static library.
add_library( shared STATIC ) add_library( common STATIC )
target_link_libraries( shared target_link_libraries( common
PUBLIC PUBLIC
shared_obj ) common_obj )
set_target_properties( shared PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" ) set_target_properties( common PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
if(WIN32) if(WIN32)
set_target_properties(shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) set_target_properties(common PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif() endif()
add_library( ClamAV::shared ALIAS shared ) add_library( ClamAV::common ALIAS common )

10
shared/Makefile.am → common/Makefile.am
View file

@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libclamav -I$(top_builddir)/libcla
LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ LIBS = @SSL_LDFLAGS@ @SSL_LIBS@
AM_LIBTOOLFLAGS = --tag CC AM_LIBTOOLFLAGS = --tag CC
libshared_la_SOURCES= \ libcommon_la_SOURCES= \
actions.c \ actions.c \
actions.h \ actions.h \
cdiff.c \ cdiff.c \
@ -29,19 +29,19 @@ libshared_la_SOURCES= \
tar.h tar.h
if MACOS if MACOS
libshared_la_SOURCES += \ libcommon_la_SOURCES += \
mac/cert_util_mac.m \ mac/cert_util_mac.m \
cert_util.h cert_util.h
endif endif
if WINDOWS if WINDOWS
libshared_la_SOURCES += \ libcommon_la_SOURCES += \
win/cert_util_win.c \ win/cert_util_win.c \
cert_util.h cert_util.h
endif endif
if LINUX if LINUX
libshared_la_SOURCES += \ libcommon_la_SOURCES += \
linux/cert_util_linux.c \ linux/cert_util_linux.c \
cert_util.h cert_util.h
endif endif
noinst_LTLIBRARIES=libshared.la noinst_LTLIBRARIES=libcommon.la

0
shared/actions.c → common/actions.c
View file

0
shared/actions.h → common/actions.h
View file

2
shared/cdiff.c → common/cdiff.c
View file

@ -39,7 +39,7 @@
#include "dsig.h" #include "dsig.h"
#include "others.h" #include "others.h"
// shared // common
#include "misc.h" #include "misc.h"
#include "output.h" #include "output.h"
#include "cdiff.h" #include "cdiff.h"

0
shared/cdiff.h → common/cdiff.h
View file

0
shared/cert_util.c → common/cert_util.c
View file

0
shared/cert_util.h → common/cert_util.h
View file

0
shared/cert_util_internal.h → common/cert_util_internal.h
View file

0
shared/clamdcom.c → common/clamdcom.c
View file

0
shared/clamdcom.h → common/clamdcom.h
View file

0
shared/fdpassing.h → common/fdpassing.h
View file

0
shared/getopt.c → common/getopt.c
View file

0
shared/getopt.h → common/getopt.h
View file

0
shared/hostid.c → common/hostid.c
View file

0
shared/hostid.h → common/hostid.h
View file

0
shared/idmef_logging.c → common/idmef_logging.c
View file

0
shared/idmef_logging.h → common/idmef_logging.h
View file

0
shared/linux/cert_util_linux.c → common/linux/cert_util_linux.c
View file

0
shared/mac/cert_util_mac.m → common/mac/cert_util_mac.m
View file

0
shared/misc.c → common/misc.c
View file

0
shared/misc.h → common/misc.h
View file

0
shared/optparser.c → common/optparser.c
View file

0
shared/optparser.h → common/optparser.h
View file

0
shared/output.c → common/output.c
View file

0
shared/output.h → common/output.h
View file

0
shared/tar.c → common/tar.c
View file

0
shared/tar.h → common/tar.h
View file

0
shared/win/cert_util_win.c → common/win/cert_util_win.c
View file

4
configure.ac
View file

@ -185,7 +185,6 @@ AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"]) AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
AM_CONDITIONAL([MACOS], [test "$build_mac" = "yes"]) AM_CONDITIONAL([MACOS], [test "$build_mac" = "yes"])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
clamav-config clamav-config
@ -198,7 +197,7 @@ if test "x$enable_libclamav_only" != "xyes"; then
clamscan/Makefile clamscan/Makefile
database/Makefile database/Makefile
docs/Makefile docs/Makefile
shared/Makefile common/Makefile
clamd/Makefile clamd/Makefile
clamd/clamav-daemon.service clamd/clamav-daemon.service
clamd/clamav-daemon.socket clamd/clamav-daemon.socket
@ -321,6 +320,7 @@ if test "x$enable_debug" = "xyes"; then
else else
CL_MSG_STATUS([release mode],[yes],[yes]) CL_MSG_STATUS([release mode],[yes],[yes])
fi fi
have_jit="no" have_jit="no"
if test "$subdirfailed" = "no"; then if test "$subdirfailed" = "no"; then
have_jit="yes" have_jit="yes"

2
freshclam/CMakeLists.txt
View file

@ -27,7 +27,7 @@ target_link_libraries(freshclam-bin
PRIVATE PRIVATE
ClamAV::libfreshclam ClamAV::libfreshclam
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS freshclam-bin DESTINATION .) install(TARGETS freshclam-bin DESTINATION .)
else() else()

2
freshclam/Makefile.am
View file

@ -34,7 +34,7 @@ endif
AM_CFLAGS=@WERR_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ @CURL_LDFLAGS@ @CURL_LIBS@ $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libfreshclam/libfreshclam.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @THREAD_LIBS@ LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ @CURL_LDFLAGS@ @CURL_LIBS@ $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libfreshclam/libfreshclam.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @THREAD_LIBS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT) AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)

2
freshclam/freshclam.c
View file

@ -55,7 +55,7 @@
#include "others.h" #include "others.h"
#include "str.h" #include "str.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
fuzz/Makefile.am
View file

@ -14,7 +14,7 @@ LIB_FUZZING_ENGINE_DEPRECATED ?= libstandalone_fuzz_target_runner.a
AM_CPPFLAGS = \ AM_CPPFLAGS = \
@SSL_CPPFLAGS@ \ @SSL_CPPFLAGS@ \
-I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \ -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \
-std=c++11 -stdlib=libc++ -std=c++11 -stdlib=libc++
AM_LDFLAGS = \ AM_LDFLAGS = \

2
libclamunrar_iface/Doxyfile
View file

@ -19,4 +19,4 @@ MAX_DOT_GRAPH_DEPTH=3
EXTRACT_ALL=YES EXTRACT_ALL=YES
INPUT = . \ INPUT = . \
../shared ../common

5
libfreshclam/CMakeLists.txt
View file

@ -22,12 +22,13 @@ target_sources( libfreshclam_obj
PUBLIC PUBLIC
libfreshclam.h ) libfreshclam.h )
target_include_directories( libfreshclam_obj target_include_directories( libfreshclam_obj
PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h PRIVATE
${CMAKE_BINARY_DIR} # For clamav-config.h
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
set_target_properties( libfreshclam_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" ) set_target_properties( libfreshclam_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( libfreshclam_obj target_link_libraries( libfreshclam_obj
PUBLIC PUBLIC
ClamAV::shared ClamAV::common
CURL::libcurl CURL::libcurl
OpenSSL::SSL OpenSSL::SSL
OpenSSL::Crypto ) OpenSSL::Crypto )

4
libfreshclam/Makefile.am
View file

@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA. # MA 02110-1301, USA.
libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@ libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@
libfreshclam_la_DEPENDENCIES = @LTDLDEPS@ libfreshclam_la_DEPENDENCIES = @LTDLDEPS@
libfreshclam_la_LDFLAGS = @CURL_LDFLAGS@ @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ @LIBICONV@ $(XML_LIBS) -version-info @LIBFRESHCLAM_VERSION@ -no-undefined libfreshclam_la_LDFLAGS = @CURL_LDFLAGS@ @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ @LIBICONV@ $(XML_LIBS) -version-info @LIBFRESHCLAM_VERSION@ -no-undefined
@ -46,6 +46,6 @@ lib_LTLIBRARIES = libfreshclam.la
AM_CFLAGS=@WERR_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
libfreshclam/libfreshclam.c
View file

@ -60,7 +60,7 @@
#include "regex_list.h" #include "regex_list.h"
#include "str.h" #include "str.h"
// shared // common
#include "cert_util.h" #include "cert_util.h"
#include "output.h" #include "output.h"
#include "misc.h" #include "misc.h"

2
libfreshclam/libfreshclam_internal.c
View file

@ -77,7 +77,7 @@
#include "cvd.h" #include "cvd.h"
#include "regex_list.h" #include "regex_list.h"
// shared // common
#include "optparser.h" #include "optparser.h"
#include "output.h" #include "output.h"
#include "cdiff.h" #include "cdiff.h"

6
sigtool/CMakeLists.txt
View file

@ -21,13 +21,15 @@ if(WIN32)
target_sources( sigtool PRIVATE ${CMAKE_SOURCE_DIR}/win32/res/sigtool.rc ) target_sources( sigtool PRIVATE ${CMAKE_SOURCE_DIR}/win32/res/sigtool.rc )
endif() endif()
target_include_directories( sigtool target_include_directories( sigtool
PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h PRIVATE
${CMAKE_BINARY_DIR} # For clamav-config.h
) )
set_target_properties( sigtool PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" ) set_target_properties( sigtool PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
target_link_libraries( sigtool target_link_libraries( sigtool
PRIVATE PRIVATE
ClamAV::libclamav ClamAV::libclamav
ClamAV::shared ) ClamAV::common )
if(WIN32) if(WIN32)
install(TARGETS sigtool DESTINATION .) install(TARGETS sigtool DESTINATION .)
else() else()

4
sigtool/Makefile.am
View file

@ -27,6 +27,6 @@ sigtool_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@ AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @SIGTOOL_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @SSL_LDFLAGS@ @SSL_LIBS@ @THREAD_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @SSL_LDFLAGS@ @SSL_LIBS@ @THREAD_LIBS@
CLEANFILES=*.gcda *.gcno CLEANFILES=*.gcda *.gcno

2
sigtool/sigtool.c
View file

@ -70,7 +70,7 @@
#include "pe.h" #include "pe.h"
#include "entconv.h" #include "entconv.h"
// shared // common
#include "output.h" #include "output.h"
#include "optparser.h" #include "optparser.h"
#include "misc.h" #include "misc.h"

2
sigtool/vba.c
View file

@ -39,7 +39,7 @@
#include "ole2_extract.h" #include "ole2_extract.h"
#include "readdb.h" #include "readdb.h"
// shared // common
#include "output.h" #include "output.h"
#include "vba.h" #include "vba.h"

Some files were not shown because too many files have changed in this diff Show more