@@ -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

@@ -590,10 +590,12 @@ libclamav_internal_utils_nothreads_la_LDFLAGS = -static

 libclamav_internal_utils_nothreads_la_CFLAGS = -DCL_NOTHREADS

 @ENABLE_LLVM_FALSE@LLVMLIBADD = libclamav_nocxx.la

 @ENABLE_LLVM_TRUE@LLVMLIBADD = c++/libclamavcxx.la -lstdc++ -lm

+@ENABLE_LLVM_FALSE@LLVMDEP = libclamav_nocxx.la

+@ENABLE_LLVM_TRUE@LLVMDEP = c++/libclamavcxx.la

 @ENABLE_LLVM_TRUE@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)

@@ -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

@@ -265,7 +265,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/..

 ACLOCAL_AMFLAGS = -I m4

 @DEBUG_BUILD_FALSE@LLVM_CONFIG = llvm/Release/bin/llvm-config

 @DEBUG_BUILD_TRUE@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