Browse code

Revert "build system: fix clamav-milter makefile"

This reverts commit 20b7235a9e932150f60c77f7f5703bbd6f0d203e.

Conflicts:

win32/clamav-config.h

Török Edvin authored on 2011/04/16 23:41:31
Showing 3 changed files
... ...
@@ -38,6 +38,6 @@ endif
38 38
 endif
39 39
 
40 40
 DEFS = @DEFS@ -DCL_NOLIBCLAMAV
41
-LIBS = $(top_builddir)/shared/libshared_minimal_threads.la $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
41
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la $(top_builddir)/shared/libshared_minimal_threads.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
42 42
 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
43 43
 CLEANFILES=*.gcda *.gcno
... ...
@@ -210,7 +210,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
210 210
 LIBLTDL = @LIBLTDL@
211 211
 LIBM = @LIBM@
212 212
 LIBOBJS = @LIBOBJS@
213
-LIBS = $(top_builddir)/shared/libshared_minimal_threads.la $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
213
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la $(top_builddir)/shared/libshared_minimal_threads.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
214 214
 LIBTOOL = @LIBTOOL@
215 215
 LIPO = @LIPO@
216 216
 LN_S = @LN_S@
... ...
@@ -508,7 +508,7 @@
508 508
 /* #undef USE_SYSLOG */
509 509
 
510 510
 /* Version number of package */
511
-#define VERSION "devel-clamav-0.97-105-ge1d23d8"
511
+#define VERSION "devel-clamav-0.97-79-g404d30a"
512 512
 
513 513
 /* Version suffix for package */
514 514
 #define VERSION_SUFFIX ""