[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit f51ae7727f799dc3ce2c1fecb08e80be2a079394
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Sep 2 15:29:26 2009 +0300

    Fix dependencies: libclamav.la has to depend on libclamavcxx.la, and libclamavcxx.la has to depend on LLVM libs.

diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
index 5d01d1c..84f3838 100644
--- a/libclamav/Makefile.am
+++ b/libclamav/Makefile.am
@@ -111,15 +111,17 @@ libclamav_internal_utils_nothreads_la_CFLAGS=-DCL_NOTHREADS
 
 if ENABLE_LLVM
 LLVMLIBADD=c++/libclamavcxx.la -lstdc++ -lm
+LLVMDEP=c++/libclamavcxx.la
 SUBDIRS=c++
 else
 LLVMLIBADD=libclamav_nocxx.la
+LLVMDEP=libclamav_nocxx.la
 endif
 
 libclamav_nocxx_la_SOURCES = bytecode_nojit.c
 
 libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
-libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) libclamav_internal_utils.la
+libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
 libclamav_la_CFLAGS = -DSEARCH_LIBDIR=\"$(libdir)\"
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
 
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index 280b62e..71ade5f 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -590,10 +590,12 @@ libclamav_internal_utils_nothreads_la_LDFLAGS = -static
 libclamav_internal_utils_nothreads_la_CFLAGS = -DCL_NOTHREADS
 @ENABLE_LLVM_FALSE at LLVMLIBADD = libclamav_nocxx.la
 @ENABLE_LLVM_TRUE at LLVMLIBADD = c++/libclamavcxx.la -lstdc++ -lm
+ at ENABLE_LLVM_FALSE@LLVMDEP = libclamav_nocxx.la
+ at ENABLE_LLVM_TRUE@LLVMDEP = c++/libclamavcxx.la
 @ENABLE_LLVM_TRUE at SUBDIRS = c++
 libclamav_nocxx_la_SOURCES = bytecode_nojit.c
 libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
-libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) libclamav_internal_utils.la
+libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
 libclamav_la_CFLAGS = -DSEARCH_LIBDIR=\"$(libdir)\"
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \
 	-no-undefined $(am__append_6)
diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index 581ac30..f1061d1 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -23,7 +23,11 @@ endif
 
 $(LLVM_CONFIG): build-llvm
 
+# we know this will be built with GNU make, so its safe to use GNU make specific
+# $(shell ...)
+LLVM_DEPS=$(shell $(LLVM_CONFIG) --libfiles jit nativecodegen)
 libclamavcxx_la_CPPFLAGS = $(AM_CPPFLAGS) `$(LLVM_CONFIG) --cppflags`
+libclamavcxx_la_DEPENDENCIES = $(LLVM_DEPS)
 libclamavcxx_la_LDFLAGS = `$(LLVM_CONFIG) --ldflags --libs jit nativecodegen`
 libclamavcxx_la_SOURCES = bytecode2llvm.cpp dummy.h
 noinst_LTLIBRARIES = libclamavcxx.la
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 60722fa..944824a 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -265,7 +265,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/..
 ACLOCAL_AMFLAGS = -I m4
 @DEBUG_BUILD_FALSE at LLVM_CONFIG = llvm/Release/bin/llvm-config
 @DEBUG_BUILD_TRUE at LLVM_CONFIG = llvm/Debug/bin/llvm-config
+
+# we know this will be built with GNU make, so its safe to use GNU make specific
+# $(shell ...)
+LLVM_DEPS = $(shell $(LLVM_CONFIG) --libfiles jit nativecodegen)
 libclamavcxx_la_CPPFLAGS = $(AM_CPPFLAGS) `$(LLVM_CONFIG) --cppflags`
+libclamavcxx_la_DEPENDENCIES = $(LLVM_DEPS)
 libclamavcxx_la_LDFLAGS = `$(LLVM_CONFIG) --ldflags --libs jit nativecodegen`
 libclamavcxx_la_SOURCES = bytecode2llvm.cpp dummy.h
 noinst_LTLIBRARIES = libclamavcxx.la

-- 
Debian repository for ClamAV