diff --git a/ChangeLog b/ChangeLog index f5408996d..b4b1f3f5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Nov 9 19:29:40 EET 2008 (edwin) +------------------------------------ + * libclamav/Makefile.am, libclamav/Makefile.in: fix VPATH build + Sat Nov 8 05:27:43 CET 2008 (acab) ----------------------------------- * libclamav/mpool.c: slightly optimized (we're now faster and more compact diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am index 9bca004f3..49cc13d72 100644 --- a/libclamav/Makefile.am +++ b/libclamav/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = lzma . AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis -I@srcdir@/lzma -libclamav_la_LIBADD = lzma/liblzma.la $(top_srcdir)/libclamunrar_iface/libclamunrar_iface.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ +libclamav_la_LIBADD = lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in index dd9fad9a7..3617a3f5f 100644 --- a/libclamav/Makefile.in +++ b/libclamav/Makefile.in @@ -80,7 +80,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libclamav_la_DEPENDENCIES = lzma/liblzma.la \ - $(top_srcdir)/libclamunrar_iface/libclamunrar_iface.la + $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \ md5.lo others.lo readdb.lo cvd.lo dsig.lo str.lo scanners.lo \ textdet.lo filetypes.lo rtf.lo blob.lo mbox.lo message.lo \ @@ -299,7 +299,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = lzma . AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis -I@srcdir@/lzma -libclamav_la_LIBADD = lzma/liblzma.la $(top_srcdir)/libclamunrar_iface/libclamunrar_iface.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ +libclamav_la_LIBADD = lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \ -no-undefined $(am__append_1) include_HEADERS = clamav.h