← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libclamav/c++/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:
libclamav/c++/Makefile.am
46
46
libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)
47
47
libclamavcxx_la_SOURCES = bytecode2llvm.cpp\
48
48
                          ClamBCRTChecks.cpp\
49
 
                          ClamBCModule.h
 
49
                          ClamBCModule.h\
 
50
                          ClamBCDiagnostics.h
50
51
if BUILD_X86
51
52
libclamavcxx_la_LIBADD+=libllvmx86codegen.la
52
53
libclamavcxx_la_DEPENDENCIES+=libllvmx86codegen.la
68
69
 
69
70
libclamavcxx_la_LIBADD+=libllvmcodegen.la libllvmsystem.la
70
71
 
71
 
LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros
 
72
LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings
 
73
unittest_CXXFLAGS=@NO_VARIADIC_MACROS@ @NO_MISSING_FIELD_INITIALIZERS@
72
74
 
73
75
TBLGENFILES=llvm/include/llvm/Intrinsics.gen X86GenRegisterInfo.h.inc X86GenRegisterNames.inc X86GenRegisterInfo.inc X86GenInstrNames.inc X86GenInstrInfo.inc\
74
76
    X86GenAsmWriter.inc X86GenAsmWriter1.inc X86GenAsmMatcher.inc X86GenDAGISel.inc X86GenFastISel.inc X86GenCallingConv.inc\
717
719
    llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
718
720
 
719
721
libgoogletest_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
 
722
libgoogletest_la_CXXFLAGS=$(unittest_CXXFLAGS)
720
723
libgoogletest_la_SOURCES=\
721
724
    llvm/utils/unittest/googletest/gtest-death-test.cc\
722
725
    llvm/utils/unittest/googletest/gtest-filepath.cc\
726
729
    llvm/utils/unittest/googletest/gtest.cc\
727
730
    llvm/utils/unittest/UnitTestMain/TestMain.cpp
728
731
 
729
 
#-Wno-variadic-macros
730
732
llvmunittest_ADT_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
 
733
llvmunittest_ADT_CXXFLAGS=$(unittest_CXXFLAGS)
731
734
llvmunittest_ADT_LDADD=libgoogletest.la libllvmsupport_nodups.la libllvmjit.la libllvmsystem.la
732
735
llvmunittest_ADT_SOURCES=\
733
736
    llvm/unittests/ADT/APFloatTest.cpp\
744
747
    llvm/unittests/ADT/TwineTest.cpp
745
748
 
746
749
llvmunittest_Support_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
747
 
#-Wno-variadic-macros
 
750
llvmunittest_Support_CXXFLAGS=$(unittest_CXXFLAGS)
748
751
llvmunittest_Support_LDADD=libgoogletest.la libllvmsupport_nodups.la libllvmjit.la libllvmsystem.la
749
752
llvmunittest_Support_SOURCES=\
750
753
    llvm/unittests/Support/AllocatorTest.cpp\
756
759
    llvm/unittests/Support/raw_ostream_test.cpp
757
760
 
758
761
llvmunittest_VMCore_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
759
 
#-Wno-variadic-macros
 
762
llvmunittest_VMCore_CXXFLAGS=$(unittest_CXXFLAGS)
760
763
llvmunittest_VMCore_LDADD=libgoogletest.la libllvmsupport_nodups.la libllvmjit.la libllvmsystem.la
761
764
llvmunittest_VMCore_SOURCES=\
762
765
    llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp\
767
770
    llvm/unittests/VMCore/PassManagerTest.cpp
768
771
 
769
772
llvmunittest_JIT_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
770
 
#-Wno-variadic-macros
 
773
llvmunittest_JIT_CXXFLAGS=$(unittest_CXXFLAGS)
771
774
llvmunittest_JIT_LDADD=libgoogletest.la libllvmasmparser.la $(lli_LDADD)
772
775
llvmunittest_JIT_SOURCES=\
773
776
    llvm/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp\
775
778
    llvm/unittests/ExecutionEngine/JIT/JITTest.cpp
776
779
 
777
780
llvmunittest_ExecutionEngine_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
778
 
#-Wno-variadic-macros
 
781
llvmunittest_ExecutionEngine_CXXFLAGS=$(unittest_CXXFLAGS)
779
782
llvmunittest_ExecutionEngine_LDADD=libgoogletest.la libllvminterpreter.la libllvmsupport_nodups.la $(libclamavcxx_la_LIBADD) libllvmsystem.la
780
783
llvmunittest_ExecutionEngine_SOURCES=\
781
784
    llvm/lib/CodeGen/IntrinsicLowering.cpp\
799
802
check_SCRIPTS=llvmcheck.sh
800
803
TESTS_ENVIRONMENT=export GMAKE=@GMAKE@;
801
804
TESTS=llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT
802
 
# Disable LLVM make check for now, there are some things to fix first:
803
 
#   - check python version (2.4 doesn't work, needs 2.5+)
804
 
#   - run llvm's make check after clamav's was run
805
 
#   - have a way to run only clamav's make check and not llvm's
806
805
@ifGNUmake@ TESTS+=llvmcheck.sh
807
806
 
808
807
libllvmasmprinter_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/lib/Target/X86 \
921
920
        make -C llvm dist-hook
922
921
        rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
923
922
        rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in
924
 
        rm -f $(distdir)/llvm/include/llvm/Support/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
 
923
        rm -f $(distdir)/llvm/include/llvm/System/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
925
924