CL_NO* is all in shared/ and libclamav/, the rest don't need to define it.
Also include misc.h for misc_libclamav.c
remotes/push_mirror/cliemu_dump
Török Edvin 14 years ago
parent db2138d857
commit 93e44700c2
  1. 1
      clamav-milter/Makefile.am
  2. 2
      clamav-milter/Makefile.in
  3. 1
      clamconf/Makefile.am
  4. 2
      clamconf/Makefile.in
  5. 1
      clamdscan/Makefile.am
  6. 2
      clamdscan/Makefile.in
  7. 1
      clamdtop/Makefile.am
  8. 2
      clamdtop/Makefile.in
  9. 1
      clamscan/Makefile.am
  10. 2
      clamscan/Makefile.in
  11. 1
      freshclam/Makefile.am
  12. 2
      freshclam/Makefile.in
  13. 1
      shared/misc_libclamav.c
  14. 1
      sigtool/Makefile.am
  15. 2
      sigtool/Makefile.in

@ -37,7 +37,6 @@ AM_CFLAGS=@WERR_CFLAGS_MILTER@
endif
endif
DEFS = @DEFS@ -DCL_NOLIBCLAMAV
LIBS = $(top_builddir)/shared/libshared_minimal_threads.la $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
CLEANFILES=*.gcda *.gcno

@ -173,7 +173,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOLIBCLAMAV
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

@ -23,7 +23,6 @@ clamconf_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
-DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
-DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\

@ -140,7 +140,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

@ -31,7 +31,6 @@ AM_CFLAGS=@WERR_CFLAGS@
endif
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@

@ -143,7 +143,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

@ -8,5 +8,4 @@ AM_CFLAGS=@WERR_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
endif
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
EXTRA_DIST = clamdtop.c

@ -149,7 +149,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

@ -26,7 +26,6 @@ clamscan_SOURCES =\
manager.h
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@ -141,7 +141,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

@ -35,7 +35,6 @@ freshclam_SOURCES = \
mirman.h
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

@ -143,7 +143,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

@ -38,6 +38,7 @@
#include <ctype.h>
#include <errno.h>
#include "shared/optparser.h"
#include "shared/misc.h"
#include "libclamav/others.h" /* for cli_rmdirs() */
/* CL_NOLIBCLAMAV means to omit functions that depends on libclamav */

@ -24,7 +24,6 @@ sigtool_SOURCES = \
sigtool.c
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
CLEANFILES=*.gcda *.gcno

@ -140,7 +140,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@

Loading…
Cancel
Save