← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/clamav/jaunty-backports

« back to all changes in this revision

Viewing changes to clamconf/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-05-20 22:09:21 UTC
  • mfrom: (1.44.1 upstream) (10.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20100520220921-flsp1pbntitvwc59
Tags: 0.96.1+dfsg-0ubuntu1
* New upstream release
  - Remove non-free libclamunrar directory and repack +dfsg tarball
  - Remove win32/ for size reasons since the tarball is repacked already and
    adjust Makefile.in/am
  - Add support for new TestDatabases option in debian/clamav-
    freshclam.postinst.in (match upstream default of yes)
  - Add VirusAction option to debian/clamav-milter.postinst.in
  - Drop powerpc clamd fix, incorporated upstream
  - Drop diff in docs/man/clamd.conf.5.in, incorporated upstream
  - Drop addition of COPYING.llvm, incorporated upstream
* Remaining differences from Debian:
  - Drop initial signature definitions from clamav-base
  - Drop build-dep on electric-fence (in Universe)
  - Add apparmor profiles for clamd and freshclam along with maintainer
    script changes
  - Detect incorrect value for clamav-freshclam/NotifyClamd and set it to true

Show diffs side-by-side

added added

removed removed

Lines of Context:
clamconf/Makefile.am
28
28
    clamconf.c
29
29
 
30
30
DEFS = @DEFS@ -DCL_NOTHREADS
31
 
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
32
 
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
 
31
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
 
32
              -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
 
33
              -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
 
34
              -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
 
35
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
33
36
CLEANFILES=*.gcda *.gcno