Browse code

build system: use automake subdir-objects (bb #2369)

This required introduced various libshared*.la, because otherwise the
object files in shared would overwrite eachother.

This is not for 0.97.1

Török Edvin authored on 2011/04/14 20:54:21
Showing 35 changed files
... ...
@@ -18,7 +18,7 @@
18 18
 
19 19
 ACLOCAL_AMFLAGS=-I m4
20 20
 
21
-SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
21
+SUBDIRS = libltdl libclamav shared clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
22 22
 EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
23 23
 
24 24
 bin_SCRIPTS=clamav-config
... ...
@@ -344,7 +344,7 @@ top_build_prefix = @top_build_prefix@
344 344
 top_builddir = @top_builddir@
345 345
 top_srcdir = @top_srcdir@
346 346
 ACLOCAL_AMFLAGS = -I m4
347
-SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
347
+SUBDIRS = libltdl libclamav shared clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
348 348
 EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
349 349
 bin_SCRIPTS = clamav-config
350 350
 pkgconfigdir = $(libdir)/pkgconfig
... ...
@@ -22,14 +22,6 @@ if HAVE_MILTER
22 22
 sbin_PROGRAMS = clamav-milter
23 23
 
24 24
 clamav_milter_SOURCES = \
25
-    $(top_srcdir)/shared/optparser.c \
26
-    $(top_srcdir)/shared/optparser.h \
27
-    $(top_srcdir)/shared/output.c \
28
-    $(top_srcdir)/shared/output.h \
29
-    $(top_srcdir)/shared/getopt.c \
30
-    $(top_srcdir)/shared/getopt.h \
31
-    $(top_srcdir)/shared/misc.c \
32
-    $(top_srcdir)/shared/misc.h \
33 25
     whitelist.c \
34 26
     whitelist.h \
35 27
     connpool.c \
... ...
@@ -46,6 +38,6 @@ endif
46 46
 endif
47 47
 
48 48
 DEFS = @DEFS@ -DCL_NOLIBCLAMAV
49
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
49
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la $(top_builddir)/shared/libshared_minimal_threads.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
50 50
 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
51 51
 CLEANFILES=*.gcda *.gcno
... ...
@@ -77,18 +77,10 @@ CONFIG_CLEAN_FILES =
77 77
 CONFIG_CLEAN_VPATH_FILES =
78 78
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
79 79
 PROGRAMS = $(sbin_PROGRAMS)
80
-am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/optparser.c \
81
-	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/output.c \
82
-	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/getopt.c \
83
-	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/misc.c \
84
-	$(top_srcdir)/shared/misc.h whitelist.c whitelist.h connpool.c \
80
+am__clamav_milter_SOURCES_DIST = whitelist.c whitelist.h connpool.c \
85 81
 	connpool.h netcode.c netcode.h clamfi.c clamfi.h \
86 82
 	clamav-milter.c
87 83
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am_clamav_milter_OBJECTS =  \
88
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	optparser.$(OBJEXT) \
89
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	output.$(OBJEXT) \
90
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	getopt.$(OBJEXT) \
91
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	misc.$(OBJEXT) \
92 84
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	whitelist.$(OBJEXT) \
93 85
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	connpool.$(OBJEXT) \
94 86
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	netcode.$(OBJEXT) \
... ...
@@ -217,7 +209,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
217 217
 LIBLTDL = @LIBLTDL@
218 218
 LIBM = @LIBM@
219 219
 LIBOBJS = @LIBOBJS@
220
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
220
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la $(top_builddir)/shared/libshared_minimal_threads.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
221 221
 LIBTOOL = @LIBTOOL@
222 222
 LIPO = @LIPO@
223 223
 LN_S = @LN_S@
... ...
@@ -318,14 +310,6 @@ top_build_prefix = @top_build_prefix@
318 318
 top_builddir = @top_builddir@
319 319
 top_srcdir = @top_srcdir@
320 320
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = \
321
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.c \
322
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.h \
323
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/output.c \
324
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/output.h \
325
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/getopt.c \
326
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/getopt.h \
327
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/misc.c \
328
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/misc.h \
329 321
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    whitelist.c \
330 322
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    whitelist.h \
331 323
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    connpool.c \
... ...
@@ -446,101 +430,36 @@ distclean-compile:
446 446
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav-milter.Po@am__quote@
447 447
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamfi.Po@am__quote@
448 448
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connpool.Po@am__quote@
449
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
450
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
451 449
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netcode.Po@am__quote@
452
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
453
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
454 450
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whitelist.Po@am__quote@
455 451
 
456 452
 .c.o:
457
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
458
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
453
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
454
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
455
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
459 456
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
460 457
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
461 458
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
462
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
459
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
463 460
 
464 461
 .c.obj:
465
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
466
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
462
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
463
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
464
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
467 465
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
468 466
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
469 467
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
470
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
468
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
471 469
 
472 470
 .c.lo:
473
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
474
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
471
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
472
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
473
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
475 474
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
476 475
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
477 476
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
478 477
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
479 478
 
480
-optparser.o: $(top_srcdir)/shared/optparser.c
481
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
482
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
483
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
484
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
485
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
486
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
487
-
488
-optparser.obj: $(top_srcdir)/shared/optparser.c
489
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
490
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
491
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
492
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
493
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
494
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
495
-
496
-output.o: $(top_srcdir)/shared/output.c
497
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
498
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
499
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
500
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
501
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
502
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
503
-
504
-output.obj: $(top_srcdir)/shared/output.c
505
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.obj -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
506
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
507
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
508
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
509
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
510
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
511
-
512
-getopt.o: $(top_srcdir)/shared/getopt.c
513
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
514
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
515
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
516
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
517
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
518
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
519
-
520
-getopt.obj: $(top_srcdir)/shared/getopt.c
521
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
522
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
523
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
524
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
525
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
526
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
527
-
528
-misc.o: $(top_srcdir)/shared/misc.c
529
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
530
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
531
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
532
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
533
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
534
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
535
-
536
-misc.obj: $(top_srcdir)/shared/misc.c
537
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
538
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
539
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
540
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
541
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
542
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
543
-
544 479
 mostlyclean-libtool:
545 480
 	-rm -f *.lo
546 481
 
... ...
@@ -1,14 +1,8 @@
1 1
 bin_PROGRAMS = clambc
2 2
 clambc_SOURCES = \
3
-    $(top_srcdir)/shared/optparser.c \
4
-    $(top_srcdir)/shared/optparser.h \
5
-    $(top_srcdir)/shared/getopt.c \
6
-    $(top_srcdir)/shared/getopt.h \
7
-    $(top_srcdir)/shared/misc.c \
8
-    $(top_srcdir)/shared/misc.h \
9 3
     bcrun.c
10 4
 
11 5
 AM_CFLAGS=@WERR_CFLAGS@
12 6
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
13
-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
7
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
14 8
 CLEANFILES=*.gcda *.gcno
... ...
@@ -58,8 +58,7 @@ CONFIG_CLEAN_FILES =
58 58
 CONFIG_CLEAN_VPATH_FILES =
59 59
 am__installdirs = "$(DESTDIR)$(bindir)"
60 60
 PROGRAMS = $(bin_PROGRAMS)
61
-am_clambc_OBJECTS = optparser.$(OBJEXT) getopt.$(OBJEXT) \
62
-	misc.$(OBJEXT) bcrun.$(OBJEXT)
61
+am_clambc_OBJECTS = bcrun.$(OBJEXT)
63 62
 clambc_OBJECTS = $(am_clambc_OBJECTS)
64 63
 clambc_LDADD = $(LDADD)
65 64
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -159,7 +158,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
159 159
 LIBLTDL = @LIBLTDL@
160 160
 LIBM = @LIBM@
161 161
 LIBOBJS = @LIBOBJS@
162
-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
162
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
163 163
 LIBTOOL = @LIBTOOL@
164 164
 LIPO = @LIPO@
165 165
 LN_S = @LN_S@
... ...
@@ -260,12 +259,6 @@ top_build_prefix = @top_build_prefix@
260 260
 top_builddir = @top_builddir@
261 261
 top_srcdir = @top_srcdir@
262 262
 clambc_SOURCES = \
263
-    $(top_srcdir)/shared/optparser.c \
264
-    $(top_srcdir)/shared/optparser.h \
265
-    $(top_srcdir)/shared/getopt.c \
266
-    $(top_srcdir)/shared/getopt.h \
267
-    $(top_srcdir)/shared/misc.c \
268
-    $(top_srcdir)/shared/misc.h \
269 263
     bcrun.c
270 264
 
271 265
 AM_CFLAGS = @WERR_CFLAGS@
... ...
@@ -375,82 +368,34 @@ distclean-compile:
375 375
 	-rm -f *.tab.c
376 376
 
377 377
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bcrun.Po@am__quote@
378
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
379
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
380
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
381 378
 
382 379
 .c.o:
383
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
384
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
380
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
381
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
382
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
385 383
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
386 384
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
387 385
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
388
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
386
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
389 387
 
390 388
 .c.obj:
391
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
392
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
389
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
390
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
391
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
393 392
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
394 393
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
395 394
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
396
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
395
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
397 396
 
398 397
 .c.lo:
399
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
400
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
398
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
399
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
400
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
401 401
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
402 402
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
403 403
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
404 404
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
405 405
 
406
-optparser.o: $(top_srcdir)/shared/optparser.c
407
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
408
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
409
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
410
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
411
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
412
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
413
-
414
-optparser.obj: $(top_srcdir)/shared/optparser.c
415
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
416
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
417
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
418
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
419
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
420
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
421
-
422
-getopt.o: $(top_srcdir)/shared/getopt.c
423
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
424
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
425
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
426
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
427
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
428
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
429
-
430
-getopt.obj: $(top_srcdir)/shared/getopt.c
431
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
432
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
433
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
434
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
435
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
436
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
437
-
438
-misc.o: $(top_srcdir)/shared/misc.c
439
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
440
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
441
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
442
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
443
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
444
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
445
-
446
-misc.obj: $(top_srcdir)/shared/misc.c
447
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
448
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
449
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
450
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
451
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
452
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
453
-
454 406
 mostlyclean-libtool:
455 407
 	-rm -f *.lo
456 408
 
... ...
@@ -19,12 +19,6 @@
19 19
 bin_PROGRAMS = clamconf
20 20
 
21 21
 clamconf_SOURCES = \
22
-    $(top_srcdir)/shared/optparser.c \
23
-    $(top_srcdir)/shared/optparser.h \
24
-    $(top_srcdir)/shared/getopt.c \
25
-    $(top_srcdir)/shared/getopt.h \
26
-    $(top_srcdir)/shared/misc.c \
27
-    $(top_srcdir)/shared/misc.h \
28 22
     clamconf.c
29 23
 
30 24
 AM_CFLAGS=@WERR_CFLAGS@
... ...
@@ -34,5 +28,5 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
34 34
 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
35 35
 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
36 36
 	      -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
37
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
37
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
38 38
 CLEANFILES=*.gcda *.gcno
... ...
@@ -76,8 +76,7 @@ CONFIG_CLEAN_FILES =
76 76
 CONFIG_CLEAN_VPATH_FILES =
77 77
 am__installdirs = "$(DESTDIR)$(bindir)"
78 78
 PROGRAMS = $(bin_PROGRAMS)
79
-am_clamconf_OBJECTS = optparser.$(OBJEXT) getopt.$(OBJEXT) \
80
-	misc.$(OBJEXT) clamconf.$(OBJEXT)
79
+am_clamconf_OBJECTS = clamconf.$(OBJEXT)
81 80
 clamconf_OBJECTS = $(am_clamconf_OBJECTS)
82 81
 clamconf_LDADD = $(LDADD)
83 82
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -177,7 +176,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
177 177
 LIBLTDL = @LIBLTDL@
178 178
 LIBM = @LIBM@
179 179
 LIBOBJS = @LIBOBJS@
180
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
180
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
181 181
 LIBTOOL = @LIBTOOL@
182 182
 LIPO = @LIPO@
183 183
 LN_S = @LN_S@
... ...
@@ -278,12 +277,6 @@ top_build_prefix = @top_build_prefix@
278 278
 top_builddir = @top_builddir@
279 279
 top_srcdir = @top_srcdir@
280 280
 clamconf_SOURCES = \
281
-    $(top_srcdir)/shared/optparser.c \
282
-    $(top_srcdir)/shared/optparser.h \
283
-    $(top_srcdir)/shared/getopt.c \
284
-    $(top_srcdir)/shared/getopt.h \
285
-    $(top_srcdir)/shared/misc.c \
286
-    $(top_srcdir)/shared/misc.h \
287 281
     clamconf.c
288 282
 
289 283
 AM_CFLAGS = @WERR_CFLAGS@
... ...
@@ -397,82 +390,34 @@ distclean-compile:
397 397
 	-rm -f *.tab.c
398 398
 
399 399
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamconf.Po@am__quote@
400
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
401
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
402
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
403 400
 
404 401
 .c.o:
405
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
406
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
402
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
403
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
404
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
407 405
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
408 406
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
409 407
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
410
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
408
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
411 409
 
412 410
 .c.obj:
413
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
414
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
411
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
412
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
413
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
415 414
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
416 415
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
417 416
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
418
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
417
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
419 418
 
420 419
 .c.lo:
421
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
422
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
420
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
421
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
422
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
423 423
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
424 424
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
425 425
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
426 426
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
427 427
 
428
-optparser.o: $(top_srcdir)/shared/optparser.c
429
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
430
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
431
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
432
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
433
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
434
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
435
-
436
-optparser.obj: $(top_srcdir)/shared/optparser.c
437
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
438
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
439
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
440
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
441
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
442
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
443
-
444
-getopt.o: $(top_srcdir)/shared/getopt.c
445
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
446
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
447
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
448
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
449
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
450
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
451
-
452
-getopt.obj: $(top_srcdir)/shared/getopt.c
453
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
454
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
455
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
456
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
457
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
458
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
459
-
460
-misc.o: $(top_srcdir)/shared/misc.c
461
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
462
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
463
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
464
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
465
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
466
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
467
-
468
-misc.obj: $(top_srcdir)/shared/misc.c
469
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
470
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
471
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
472
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
473
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
474
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
475
-
476 428
 mostlyclean-libtool:
477 429
 	-rm -f *.lo
478 430
 
... ...
@@ -21,14 +21,6 @@ if BUILD_CLAMD
21 21
 sbin_PROGRAMS = clamd
22 22
 
23 23
 clamd_SOURCES = \
24
-    $(top_srcdir)/shared/output.c \
25
-    $(top_srcdir)/shared/output.h \
26
-    $(top_srcdir)/shared/optparser.c \
27
-    $(top_srcdir)/shared/optparser.h \
28
-    $(top_srcdir)/shared/getopt.c \
29
-    $(top_srcdir)/shared/getopt.h \
30
-    $(top_srcdir)/shared/misc.c \
31
-    $(top_srcdir)/shared/misc.h \
32 24
     clamd.c \
33 25
     tcpserver.c \
34 26
     tcpserver.h \
... ...
@@ -62,7 +54,7 @@ AM_CFLAGS=@WERR_CFLAGS@
62 62
 
63 63
 endif
64 64
 
65
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
65
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_threads.la @CLAMD_LIBS@ @THREAD_LIBS@
66 66
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
67 67
 
68 68
 # it does support --help and --version but with the default config file
... ...
@@ -76,19 +76,13 @@ CONFIG_CLEAN_FILES =
76 76
 CONFIG_CLEAN_VPATH_FILES =
77 77
 am__installdirs = "$(DESTDIR)$(sbindir)"
78 78
 PROGRAMS = $(sbin_PROGRAMS)
79
-am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \
80
-	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/optparser.c \
81
-	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/getopt.c \
82
-	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/misc.c \
83
-	$(top_srcdir)/shared/misc.h clamd.c tcpserver.c tcpserver.h \
84
-	localserver.c localserver.h session.c session.h thrmgr.c \
85
-	thrmgr.h server-th.c server.h scanner.c scanner.h others.c \
86
-	others.h clamuko.c clamuko.h clamukofs.c clamukofs.h \
79
+am__clamd_SOURCES_DIST = clamd.c tcpserver.c tcpserver.h localserver.c \
80
+	localserver.h session.c session.h thrmgr.c thrmgr.h \
81
+	server-th.c server.h scanner.c scanner.h others.c others.h \
82
+	clamuko.c clamuko.h clamukofs.c clamukofs.h \
87 83
 	dazukoio_compat12.c dazukoio_compat12.h dazukoio.c dazukoio.h \
88 84
 	dazuko_xp.h dazukoio_xp.h dazukofs.c dazukofs.h shared.h
89
-@BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \
90
-@BUILD_CLAMD_TRUE@	optparser.$(OBJEXT) getopt.$(OBJEXT) \
91
-@BUILD_CLAMD_TRUE@	misc.$(OBJEXT) clamd.$(OBJEXT) \
85
+@BUILD_CLAMD_TRUE@am_clamd_OBJECTS = clamd.$(OBJEXT) \
92 86
 @BUILD_CLAMD_TRUE@	tcpserver.$(OBJEXT) localserver.$(OBJEXT) \
93 87
 @BUILD_CLAMD_TRUE@	session.$(OBJEXT) thrmgr.$(OBJEXT) \
94 88
 @BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \
... ...
@@ -195,7 +189,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
195 195
 LIBLTDL = @LIBLTDL@
196 196
 LIBM = @LIBM@
197 197
 LIBOBJS = @LIBOBJS@
198
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
198
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_threads.la @CLAMD_LIBS@ @THREAD_LIBS@
199 199
 LIBTOOL = @LIBTOOL@
200 200
 LIPO = @LIPO@
201 201
 LN_S = @LN_S@
... ...
@@ -296,14 +290,6 @@ top_build_prefix = @top_build_prefix@
296 296
 top_builddir = @top_builddir@
297 297
 top_srcdir = @top_srcdir@
298 298
 @BUILD_CLAMD_TRUE@clamd_SOURCES = \
299
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \
300
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \
301
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.c \
302
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.h \
303
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.c \
304
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \
305
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.c \
306
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.h \
307 299
 @BUILD_CLAMD_TRUE@    clamd.c \
308 300
 @BUILD_CLAMD_TRUE@    tcpserver.c \
309 301
 @BUILD_CLAMD_TRUE@    tcpserver.h \
... ...
@@ -449,12 +435,8 @@ distclean-compile:
449 449
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukofs.Po@am__quote@
450 450
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio.Po@am__quote@
451 451
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio_compat12.Po@am__quote@
452
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
453 452
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localserver.Po@am__quote@
454
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
455
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
456 453
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Po@am__quote@
457
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
458 454
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner.Po@am__quote@
459 455
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server-th.Po@am__quote@
460 456
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@
... ...
@@ -462,93 +444,32 @@ distclean-compile:
462 462
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrmgr.Po@am__quote@
463 463
 
464 464
 .c.o:
465
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
466
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
465
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
466
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
467
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
467 468
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
468 469
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
469 470
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
470
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
471
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
471 472
 
472 473
 .c.obj:
473
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
474
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
474
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
475
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
476
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
475 477
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
476 478
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
477 479
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
478
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
480
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
479 481
 
480 482
 .c.lo:
481
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
482
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
483
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
484
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
485
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
483 486
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
484 487
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
485 488
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
486 489
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
487 490
 
488
-output.o: $(top_srcdir)/shared/output.c
489
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
490
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
491
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
492
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
493
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
494
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
495
-
496
-output.obj: $(top_srcdir)/shared/output.c
497
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.obj -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
498
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
499
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
500
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
501
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
502
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
503
-
504
-optparser.o: $(top_srcdir)/shared/optparser.c
505
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
506
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
507
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
508
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
509
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
510
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
511
-
512
-optparser.obj: $(top_srcdir)/shared/optparser.c
513
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
514
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
515
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
516
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
517
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
518
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
519
-
520
-getopt.o: $(top_srcdir)/shared/getopt.c
521
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
522
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
523
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
524
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
525
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
526
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
527
-
528
-getopt.obj: $(top_srcdir)/shared/getopt.c
529
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
530
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
531
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
532
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
533
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
534
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
535
-
536
-misc.o: $(top_srcdir)/shared/misc.c
537
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
538
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
539
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
540
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
541
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
542
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
543
-
544
-misc.obj: $(top_srcdir)/shared/misc.c
545
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
546
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
547
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
548
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
549
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
550
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
551
-
552 491
 mostlyclean-libtool:
553 492
 	-rm -f *.lo
554 493
 
... ...
@@ -21,18 +21,6 @@ if BUILD_CLAMD
21 21
 bin_PROGRAMS = clamdscan
22 22
 
23 23
 clamdscan_SOURCES = \
24
-    $(top_srcdir)/shared/output.c \
25
-    $(top_srcdir)/shared/output.h \
26
-    $(top_srcdir)/shared/optparser.c \
27
-    $(top_srcdir)/shared/optparser.h \
28
-    $(top_srcdir)/shared/misc.c \
29
-    $(top_srcdir)/shared/misc.h \
30
-    $(top_srcdir)/shared/getopt.c \
31
-    $(top_srcdir)/shared/getopt.h \
32
-    $(top_srcdir)/shared/actions.c \
33
-    $(top_srcdir)/shared/actions.h \
34
-    $(top_srcdir)/shared/clamdcom.c \
35
-    $(top_srcdir)/shared/clamdcom.h \
36 24
     clamdscan.c \
37 25
     proto.c \
38 26
     proto.h \
... ...
@@ -45,7 +33,7 @@ endif
45 45
 
46 46
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
47 47
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
48
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @CLAMDSCAN_LIBS@
48
+LIBS = $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@
49 49
 
50 50
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
51 51
 CLEANFILES=*.gcda *.gcno
... ...
@@ -76,18 +76,9 @@ CONFIG_CLEAN_FILES =
76 76
 CONFIG_CLEAN_VPATH_FILES =
77 77
 am__installdirs = "$(DESTDIR)$(bindir)"
78 78
 PROGRAMS = $(bin_PROGRAMS)
79
-am__clamdscan_SOURCES_DIST = $(top_srcdir)/shared/output.c \
80
-	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/optparser.c \
81
-	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/misc.c \
82
-	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/getopt.c \
83
-	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/actions.c \
84
-	$(top_srcdir)/shared/actions.h $(top_srcdir)/shared/clamdcom.c \
85
-	$(top_srcdir)/shared/clamdcom.h clamdscan.c proto.c proto.h \
86
-	client.c client.h
87
-@BUILD_CLAMD_TRUE@am_clamdscan_OBJECTS = output.$(OBJEXT) \
88
-@BUILD_CLAMD_TRUE@	optparser.$(OBJEXT) misc.$(OBJEXT) \
89
-@BUILD_CLAMD_TRUE@	getopt.$(OBJEXT) actions.$(OBJEXT) \
90
-@BUILD_CLAMD_TRUE@	clamdcom.$(OBJEXT) clamdscan.$(OBJEXT) \
79
+am__clamdscan_SOURCES_DIST = clamdscan.c proto.c proto.h client.c \
80
+	client.h
81
+@BUILD_CLAMD_TRUE@am_clamdscan_OBJECTS = clamdscan.$(OBJEXT) \
91 82
 @BUILD_CLAMD_TRUE@	proto.$(OBJEXT) client.$(OBJEXT)
92 83
 clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)
93 84
 clamdscan_LDADD = $(LDADD)
... ...
@@ -188,7 +179,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
188 188
 LIBLTDL = @LIBLTDL@
189 189
 LIBM = @LIBM@
190 190
 LIBOBJS = @LIBOBJS@
191
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @CLAMDSCAN_LIBS@
191
+LIBS = $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@
192 192
 LIBTOOL = @LIBTOOL@
193 193
 LIPO = @LIPO@
194 194
 LN_S = @LN_S@
... ...
@@ -289,18 +280,6 @@ top_build_prefix = @top_build_prefix@
289 289
 top_builddir = @top_builddir@
290 290
 top_srcdir = @top_srcdir@
291 291
 @BUILD_CLAMD_TRUE@clamdscan_SOURCES = \
292
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \
293
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \
294
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.c \
295
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.h \
296
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.c \
297
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.h \
298
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.c \
299
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \
300
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.c \
301
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.h \
302
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/clamdcom.c \
303
-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/clamdcom.h \
304 292
 @BUILD_CLAMD_TRUE@    clamdscan.c \
305 293
 @BUILD_CLAMD_TRUE@    proto.c \
306 294
 @BUILD_CLAMD_TRUE@    proto.h \
... ...
@@ -414,136 +393,37 @@ mostlyclean-compile:
414 414
 distclean-compile:
415 415
 	-rm -f *.tab.c
416 416
 
417
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@
418
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdcom.Po@am__quote@
419 417
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdscan.Po@am__quote@
420 418
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@
421
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
422
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
423
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
424
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
425 419
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto.Po@am__quote@
426 420
 
427 421
 .c.o:
428
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
429
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
422
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
423
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
424
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
430 425
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
431 426
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
432 427
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
433
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
428
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
434 429
 
435 430
 .c.obj:
436
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
437
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
431
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
432
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
433
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
438 434
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
439 435
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
440 436
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
441
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
437
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
442 438
 
443 439
 .c.lo:
444
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
445
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
440
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
441
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
442
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
446 443
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
447 444
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
448 445
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
449 446
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
450 447
 
451
-output.o: $(top_srcdir)/shared/output.c
452
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
453
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
454
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
455
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
456
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
457
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
458
-
459
-output.obj: $(top_srcdir)/shared/output.c
460
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.obj -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
461
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
462
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
463
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
464
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
465
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
466
-
467
-optparser.o: $(top_srcdir)/shared/optparser.c
468
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
469
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
470
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
471
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
472
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
473
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
474
-
475
-optparser.obj: $(top_srcdir)/shared/optparser.c
476
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
477
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
478
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
479
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
480
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
481
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
482
-
483
-misc.o: $(top_srcdir)/shared/misc.c
484
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
485
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
486
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
487
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
488
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
489
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
490
-
491
-misc.obj: $(top_srcdir)/shared/misc.c
492
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
493
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
494
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
495
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
496
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
497
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
498
-
499
-getopt.o: $(top_srcdir)/shared/getopt.c
500
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
501
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
502
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
503
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
504
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
505
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
506
-
507
-getopt.obj: $(top_srcdir)/shared/getopt.c
508
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
509
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
510
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
511
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
512
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
513
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
514
-
515
-actions.o: $(top_srcdir)/shared/actions.c
516
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT actions.o -MD -MP -MF $(DEPDIR)/actions.Tpo -c -o actions.o `test -f '$(top_srcdir)/shared/actions.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/actions.c
517
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
518
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
519
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.o' libtool=no @AMDEPBACKSLASH@
520
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
521
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o actions.o `test -f '$(top_srcdir)/shared/actions.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/actions.c
522
-
523
-actions.obj: $(top_srcdir)/shared/actions.c
524
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT actions.obj -MD -MP -MF $(DEPDIR)/actions.Tpo -c -o actions.obj `if test -f '$(top_srcdir)/shared/actions.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/actions.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/actions.c'; fi`
525
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
526
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
527
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.obj' libtool=no @AMDEPBACKSLASH@
528
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
529
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o actions.obj `if test -f '$(top_srcdir)/shared/actions.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/actions.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/actions.c'; fi`
530
-
531
-clamdcom.o: $(top_srcdir)/shared/clamdcom.c
532
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.o -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c
533
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
534
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
535
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.o' libtool=no @AMDEPBACKSLASH@
536
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
537
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c
538
-
539
-clamdcom.obj: $(top_srcdir)/shared/clamdcom.c
540
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.obj -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`
541
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
542
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
543
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.obj' libtool=no @AMDEPBACKSLASH@
544
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
545
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`
546
-
547 448
 mostlyclean-libtool:
548 449
 	-rm -f *.lo
549 450
 
... ...
@@ -2,17 +2,11 @@ if HAVE_CURSES
2 2
 bin_PROGRAMS = clamdtop
3 3
 man_MANS = $(top_builddir)/docs/man/clamdtop.1
4 4
 clamdtop_SOURCES = \
5
-    $(top_srcdir)/shared/optparser.c \
6
-    $(top_srcdir)/shared/optparser.h \
7
-    $(top_srcdir)/shared/getopt.c \
8
-    $(top_srcdir)/shared/getopt.h \
9
-    $(top_srcdir)/shared/misc.c \
10
-    $(top_srcdir)/shared/misc.h \
11 5
     clamdtop.c
12 6
 
13 7
 AM_CFLAGS=@WERR_CFLAGS@
14 8
 AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
15
-clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
9
+clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
16 10
 endif
17 11
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
18 12
 EXTRA_DIST = clamdtop.c
... ...
@@ -58,15 +58,12 @@ CONFIG_CLEAN_FILES =
58 58
 CONFIG_CLEAN_VPATH_FILES =
59 59
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
60 60
 PROGRAMS = $(bin_PROGRAMS)
61
-am__clamdtop_SOURCES_DIST = $(top_srcdir)/shared/optparser.c \
62
-	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/getopt.c \
63
-	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/misc.c \
64
-	$(top_srcdir)/shared/misc.h clamdtop.c
65
-@HAVE_CURSES_TRUE@am_clamdtop_OBJECTS = optparser.$(OBJEXT) \
66
-@HAVE_CURSES_TRUE@	getopt.$(OBJEXT) misc.$(OBJEXT) \
67
-@HAVE_CURSES_TRUE@	clamdtop.$(OBJEXT)
61
+am__clamdtop_SOURCES_DIST = clamdtop.c
62
+@HAVE_CURSES_TRUE@am_clamdtop_OBJECTS = clamdtop.$(OBJEXT)
68 63
 clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
69
-@HAVE_CURSES_TRUE@clamdtop_DEPENDENCIES = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
64
+@HAVE_CURSES_TRUE@clamdtop_DEPENDENCIES =  \
65
+@HAVE_CURSES_TRUE@	$(top_builddir)/shared/libshared_minimal.la \
66
+@HAVE_CURSES_TRUE@	$(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
70 67
 AM_V_lt = $(am__v_lt_$(V))
71 68
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
72 69
 am__v_lt_0 = --silent
... ...
@@ -290,17 +287,11 @@ top_builddir = @top_builddir@
290 290
 top_srcdir = @top_srcdir@
291 291
 @HAVE_CURSES_TRUE@man_MANS = $(top_builddir)/docs/man/clamdtop.1
292 292
 @HAVE_CURSES_TRUE@clamdtop_SOURCES = \
293
-@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/optparser.c \
294
-@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/optparser.h \
295
-@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/getopt.c \
296
-@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/getopt.h \
297
-@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/misc.c \
298
-@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/misc.h \
299 293
 @HAVE_CURSES_TRUE@    clamdtop.c
300 294
 
301 295
 @HAVE_CURSES_TRUE@AM_CFLAGS = @WERR_CFLAGS@
302 296
 @HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
303
-@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
297
+@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
304 298
 EXTRA_DIST = clamdtop.c
305 299
 all: all-am
306 300
 
... ...
@@ -406,82 +397,34 @@ distclean-compile:
406 406
 	-rm -f *.tab.c
407 407
 
408 408
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdtop.Po@am__quote@
409
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
410
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
411
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
412 409
 
413 410
 .c.o:
414
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
415
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
411
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
412
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
413
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
416 414
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
417 415
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
418 416
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
419
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
417
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
420 418
 
421 419
 .c.obj:
422
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
423
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
420
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
421
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
422
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
424 423
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
425 424
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
426 425
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
427
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
426
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
428 427
 
429 428
 .c.lo:
430
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
431
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
429
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
430
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
431
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
432 432
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
433 433
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
434 434
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
435 435
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
436 436
 
437
-optparser.o: $(top_srcdir)/shared/optparser.c
438
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
439
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
440
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
441
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
442
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
443
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
444
-
445
-optparser.obj: $(top_srcdir)/shared/optparser.c
446
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
447
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
448
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
449
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
450
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
451
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
452
-
453
-getopt.o: $(top_srcdir)/shared/getopt.c
454
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
455
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
456
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
457
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
458
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
459
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
460
-
461
-getopt.obj: $(top_srcdir)/shared/getopt.c
462
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
463
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
464
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
465
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
466
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
467
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
468
-
469
-misc.o: $(top_srcdir)/shared/misc.c
470
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
471
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
472
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
473
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
474
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
475
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
476
-
477
-misc.obj: $(top_srcdir)/shared/misc.c
478
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
479
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
480
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
481
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
482
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
483
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
484
-
485 437
 mostlyclean-libtool:
486 438
 	-rm -f *.lo
487 439
 
... ...
@@ -19,17 +19,7 @@
19 19
 
20 20
 bin_PROGRAMS = clamscan
21 21
 
22
-clamscan_SOURCES = \
23
-    $(top_srcdir)/shared/output.c \
24
-    $(top_srcdir)/shared/output.h \
25
-    $(top_srcdir)/shared/getopt.c \
26
-    $(top_srcdir)/shared/getopt.h \
27
-    $(top_srcdir)/shared/optparser.c \
28
-    $(top_srcdir)/shared/optparser.h \
29
-    $(top_srcdir)/shared/actions.c \
30
-    $(top_srcdir)/shared/actions.h \
31
-    $(top_srcdir)/shared/misc.c \
32
-    $(top_srcdir)/shared/misc.h \
22
+clamscan_SOURCES =\
33 23
     clamscan.c \
34 24
     global.h \
35 25
     manager.c \
... ...
@@ -37,7 +27,7 @@ clamscan_SOURCES = \
37 37
 
38 38
 AM_CFLAGS=@WERR_CFLAGS@
39 39
 DEFS = @DEFS@ -DCL_NOTHREADS
40
-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
40
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
41 41
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
42 42
 
43 43
 CLEANFILES=*.gcda *.gcno
... ...
@@ -77,9 +77,7 @@ CONFIG_CLEAN_FILES =
77 77
 CONFIG_CLEAN_VPATH_FILES =
78 78
 am__installdirs = "$(DESTDIR)$(bindir)"
79 79
 PROGRAMS = $(bin_PROGRAMS)
80
-am_clamscan_OBJECTS = output.$(OBJEXT) getopt.$(OBJEXT) \
81
-	optparser.$(OBJEXT) actions.$(OBJEXT) misc.$(OBJEXT) \
82
-	clamscan.$(OBJEXT) manager.$(OBJEXT)
80
+am_clamscan_OBJECTS = clamscan.$(OBJEXT) manager.$(OBJEXT)
83 81
 clamscan_OBJECTS = $(am_clamscan_OBJECTS)
84 82
 clamscan_LDADD = $(LDADD)
85 83
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -179,7 +177,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
179 179
 LIBLTDL = @LIBLTDL@
180 180
 LIBM = @LIBM@
181 181
 LIBOBJS = @LIBOBJS@
182
-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
182
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
183 183
 LIBTOOL = @LIBTOOL@
184 184
 LIPO = @LIPO@
185 185
 LN_S = @LN_S@
... ...
@@ -280,16 +278,6 @@ top_build_prefix = @top_build_prefix@
280 280
 top_builddir = @top_builddir@
281 281
 top_srcdir = @top_srcdir@
282 282
 clamscan_SOURCES = \
283
-    $(top_srcdir)/shared/output.c \
284
-    $(top_srcdir)/shared/output.h \
285
-    $(top_srcdir)/shared/getopt.c \
286
-    $(top_srcdir)/shared/getopt.h \
287
-    $(top_srcdir)/shared/optparser.c \
288
-    $(top_srcdir)/shared/optparser.h \
289
-    $(top_srcdir)/shared/actions.c \
290
-    $(top_srcdir)/shared/actions.h \
291
-    $(top_srcdir)/shared/misc.c \
292
-    $(top_srcdir)/shared/misc.h \
293 283
     clamscan.c \
294 284
     global.h \
295 285
     manager.c \
... ...
@@ -401,118 +389,36 @@ mostlyclean-compile:
401 401
 distclean-compile:
402 402
 	-rm -f *.tab.c
403 403
 
404
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@
405 404
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamscan.Po@am__quote@
406
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
407 405
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Po@am__quote@
408
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
409
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
410
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
411 406
 
412 407
 .c.o:
413
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
414
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
408
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
409
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
410
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
415 411
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
416 412
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
417 413
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
418
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
414
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
419 415
 
420 416
 .c.obj:
421
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
422
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
417
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
418
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
419
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
423 420
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
424 421
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
425 422
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
426
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
423
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
427 424
 
428 425
 .c.lo:
429
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
430
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
426
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
427
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
428
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
431 429
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
432 430
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
433 431
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
434 432
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
435 433
 
436
-output.o: $(top_srcdir)/shared/output.c
437
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
438
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
439
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
440
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
441
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
442
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
443
-
444
-output.obj: $(top_srcdir)/shared/output.c
445
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.obj -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
446
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
447
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
448
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
449
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
450
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
451
-
452
-getopt.o: $(top_srcdir)/shared/getopt.c
453
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
454
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
455
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
456
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
457
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
458
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
459
-
460
-getopt.obj: $(top_srcdir)/shared/getopt.c
461
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
462
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
463
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
464
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
465
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
466
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
467
-
468
-optparser.o: $(top_srcdir)/shared/optparser.c
469
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
470
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
471
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
472
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
473
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
474
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
475
-
476
-optparser.obj: $(top_srcdir)/shared/optparser.c
477
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
478
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
479
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
480
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
481
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
482
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
483
-
484
-actions.o: $(top_srcdir)/shared/actions.c
485
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT actions.o -MD -MP -MF $(DEPDIR)/actions.Tpo -c -o actions.o `test -f '$(top_srcdir)/shared/actions.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/actions.c
486
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
487
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
488
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.o' libtool=no @AMDEPBACKSLASH@
489
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
490
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o actions.o `test -f '$(top_srcdir)/shared/actions.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/actions.c
491
-
492
-actions.obj: $(top_srcdir)/shared/actions.c
493
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT actions.obj -MD -MP -MF $(DEPDIR)/actions.Tpo -c -o actions.obj `if test -f '$(top_srcdir)/shared/actions.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/actions.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/actions.c'; fi`
494
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
495
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
496
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.obj' libtool=no @AMDEPBACKSLASH@
497
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
498
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o actions.obj `if test -f '$(top_srcdir)/shared/actions.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/actions.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/actions.c'; fi`
499
-
500
-misc.o: $(top_srcdir)/shared/misc.c
501
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
502
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
503
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
504
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
505
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
506
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
507
-
508
-misc.obj: $(top_srcdir)/shared/misc.c
509
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
510
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
511
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
512
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
513
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
514
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
515
-
516 434
 mostlyclean-libtool:
517 435
 	-rm -f *.lo
518 436
 
... ...
@@ -20046,7 +20046,7 @@ $as_echo "#define HAVE__INTERNAL__SHA_COLLECT 1" >>confdefs.h
20046 20046
 
20047 20047
 fi
20048 20048
 
20049
-ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
20049
+ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile shared/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
20050 20050
 
20051 20051
 cat >confcache <<\_ACEOF
20052 20052
 # This file is a shell script that caches the results of configure
... ...
@@ -21094,6 +21094,7 @@ do
21094 21094
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
21095 21095
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
21096 21096
     "freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;;
21097
+    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
21097 21098
     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;
21098 21099
     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;
21099 21100
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
... ...
@@ -23694,6 +23695,7 @@ do
23694 23694
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
23695 23695
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
23696 23696
     "freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;;
23697
+    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
23697 23698
     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;
23698 23699
     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;
23699 23700
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
... ...
@@ -34,7 +34,9 @@ AC_CREATE_TARGET_H([target.h])
34 34
 
35 35
 dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
36 36
 dnl enable stealth builds and psychedelic tests
37
-AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])
37
+AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override -Werror std-options
38
+		  foreign dist-bzip2 no-define color-tests parallel-tests
39
+		  tar-ustar subdir-objects])
38 40
 AM_SILENT_RULES([yes])
39 41
 
40 42
 dnl we told automake to not define these, since we want to include
... ...
@@ -1624,6 +1626,7 @@ clamd/Makefile
1624 1624
 clamdscan/Makefile
1625 1625
 clamav-milter/Makefile
1626 1626
 freshclam/Makefile
1627
+shared/Makefile
1627 1628
 sigtool/Makefile
1628 1629
 clamconf/Makefile
1629 1630
 etc/Makefile
... ...
@@ -20,20 +20,6 @@
20 20
 bin_PROGRAMS = freshclam
21 21
 
22 22
 freshclam_SOURCES = \
23
-    $(top_srcdir)/shared/output.c \
24
-    $(top_srcdir)/shared/output.h \
25
-    $(top_srcdir)/shared/optparser.c \
26
-    $(top_srcdir)/shared/optparser.h \
27
-    $(top_srcdir)/shared/getopt.c \
28
-    $(top_srcdir)/shared/getopt.h \
29
-    $(top_srcdir)/shared/misc.c \
30
-    $(top_srcdir)/shared/misc.h \
31
-    $(top_srcdir)/shared/cdiff.c \
32
-    $(top_srcdir)/shared/cdiff.h \
33
-    $(top_srcdir)/shared/tar.c \
34
-    $(top_srcdir)/shared/tar.h \
35
-    $(top_srcdir)/shared/clamdcom.c \
36
-    $(top_srcdir)/shared/clamdcom.h \
37 23
     freshclam.c \
38 24
     manager.c \
39 25
     manager.h \
... ...
@@ -51,7 +37,7 @@ freshclam_SOURCES = \
51 51
 AM_CFLAGS=@WERR_CFLAGS@
52 52
 DEFS = @DEFS@ -DCL_NOTHREADS
53 53
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
54
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
54
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
55 55
 
56 56
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)
57 57
 CLEANFILES=*.gcda *.gcno
... ...
@@ -77,9 +77,7 @@ CONFIG_CLEAN_FILES =
77 77
 CONFIG_CLEAN_VPATH_FILES =
78 78
 am__installdirs = "$(DESTDIR)$(bindir)"
79 79
 PROGRAMS = $(bin_PROGRAMS)
80
-am_freshclam_OBJECTS = output.$(OBJEXT) optparser.$(OBJEXT) \
81
-	getopt.$(OBJEXT) misc.$(OBJEXT) cdiff.$(OBJEXT) tar.$(OBJEXT) \
82
-	clamdcom.$(OBJEXT) freshclam.$(OBJEXT) manager.$(OBJEXT) \
80
+am_freshclam_OBJECTS = freshclam.$(OBJEXT) manager.$(OBJEXT) \
83 81
 	notify.$(OBJEXT) dns.$(OBJEXT) execute.$(OBJEXT) \
84 82
 	nonblock.$(OBJEXT) mirman.$(OBJEXT)
85 83
 freshclam_OBJECTS = $(am_freshclam_OBJECTS)
... ...
@@ -181,7 +179,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
181 181
 LIBLTDL = @LIBLTDL@
182 182
 LIBM = @LIBM@
183 183
 LIBOBJS = @LIBOBJS@
184
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
184
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
185 185
 LIBTOOL = @LIBTOOL@
186 186
 LIPO = @LIPO@
187 187
 LN_S = @LN_S@
... ...
@@ -282,20 +280,6 @@ top_build_prefix = @top_build_prefix@
282 282
 top_builddir = @top_builddir@
283 283
 top_srcdir = @top_srcdir@
284 284
 freshclam_SOURCES = \
285
-    $(top_srcdir)/shared/output.c \
286
-    $(top_srcdir)/shared/output.h \
287
-    $(top_srcdir)/shared/optparser.c \
288
-    $(top_srcdir)/shared/optparser.h \
289
-    $(top_srcdir)/shared/getopt.c \
290
-    $(top_srcdir)/shared/getopt.h \
291
-    $(top_srcdir)/shared/misc.c \
292
-    $(top_srcdir)/shared/misc.h \
293
-    $(top_srcdir)/shared/cdiff.c \
294
-    $(top_srcdir)/shared/cdiff.h \
295
-    $(top_srcdir)/shared/tar.c \
296
-    $(top_srcdir)/shared/tar.h \
297
-    $(top_srcdir)/shared/clamdcom.c \
298
-    $(top_srcdir)/shared/clamdcom.h \
299 285
     freshclam.c \
300 286
     manager.c \
301 287
     manager.h \
... ...
@@ -417,157 +401,41 @@ mostlyclean-compile:
417 417
 distclean-compile:
418 418
 	-rm -f *.tab.c
419 419
 
420
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiff.Po@am__quote@
421
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdcom.Po@am__quote@
422 420
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
423 421
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/execute.Po@am__quote@
424 422
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freshclam.Po@am__quote@
425
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
426 423
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Po@am__quote@
427 424
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mirman.Po@am__quote@
428
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
429 425
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nonblock.Po@am__quote@
430 426
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify.Po@am__quote@
431
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
432
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
433
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tar.Po@am__quote@
434 427
 
435 428
 .c.o:
436
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
437
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
429
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
430
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
431
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
438 432
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
439 433
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
440 434
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
441
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
435
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
442 436
 
443 437
 .c.obj:
444
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
445
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
438
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
439
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
440
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
446 441
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
447 442
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
448 443
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
449
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
444
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
450 445
 
451 446
 .c.lo:
452
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
453
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
447
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
448
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
449
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
454 450
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
455 451
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
456 452
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
457 453
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
458 454
 
459
-output.o: $(top_srcdir)/shared/output.c
460
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
461
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
462
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
463
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
464
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
465
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
466
-
467
-output.obj: $(top_srcdir)/shared/output.c
468
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.obj -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
469
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
470
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
471
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
472
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
473
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
474
-
475
-optparser.o: $(top_srcdir)/shared/optparser.c
476
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
477
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
478
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
479
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
480
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
481
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
482
-
483
-optparser.obj: $(top_srcdir)/shared/optparser.c
484
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
485
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
486
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
487
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
488
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
489
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
490
-
491
-getopt.o: $(top_srcdir)/shared/getopt.c
492
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
493
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
494
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
495
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
496
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
497
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
498
-
499
-getopt.obj: $(top_srcdir)/shared/getopt.c
500
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
501
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
502
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
503
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
504
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
505
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
506
-
507
-misc.o: $(top_srcdir)/shared/misc.c
508
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
509
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
510
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
511
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
512
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
513
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
514
-
515
-misc.obj: $(top_srcdir)/shared/misc.c
516
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
517
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
518
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
519
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
520
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
521
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
522
-
523
-cdiff.o: $(top_srcdir)/shared/cdiff.c
524
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdiff.o -MD -MP -MF $(DEPDIR)/cdiff.Tpo -c -o cdiff.o `test -f '$(top_srcdir)/shared/cdiff.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cdiff.c
525
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
526
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
527
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.o' libtool=no @AMDEPBACKSLASH@
528
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
529
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdiff.o `test -f '$(top_srcdir)/shared/cdiff.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cdiff.c
530
-
531
-cdiff.obj: $(top_srcdir)/shared/cdiff.c
532
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdiff.obj -MD -MP -MF $(DEPDIR)/cdiff.Tpo -c -o cdiff.obj `if test -f '$(top_srcdir)/shared/cdiff.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cdiff.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cdiff.c'; fi`
533
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
534
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
535
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.obj' libtool=no @AMDEPBACKSLASH@
536
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
537
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdiff.obj `if test -f '$(top_srcdir)/shared/cdiff.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cdiff.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cdiff.c'; fi`
538
-
539
-tar.o: $(top_srcdir)/shared/tar.c
540
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tar.o -MD -MP -MF $(DEPDIR)/tar.Tpo -c -o tar.o `test -f '$(top_srcdir)/shared/tar.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/tar.c
541
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
542
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
543
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.o' libtool=no @AMDEPBACKSLASH@
544
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
545
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tar.o `test -f '$(top_srcdir)/shared/tar.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/tar.c
546
-
547
-tar.obj: $(top_srcdir)/shared/tar.c
548
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tar.obj -MD -MP -MF $(DEPDIR)/tar.Tpo -c -o tar.obj `if test -f '$(top_srcdir)/shared/tar.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/tar.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/tar.c'; fi`
549
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
550
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
551
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.obj' libtool=no @AMDEPBACKSLASH@
552
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
553
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tar.obj `if test -f '$(top_srcdir)/shared/tar.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/tar.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/tar.c'; fi`
554
-
555
-clamdcom.o: $(top_srcdir)/shared/clamdcom.c
556
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.o -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c
557
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
558
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
559
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.o' libtool=no @AMDEPBACKSLASH@
560
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
561
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c
562
-
563
-clamdcom.obj: $(top_srcdir)/shared/clamdcom.c
564
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.obj -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`
565
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
566
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
567
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.obj' libtool=no @AMDEPBACKSLASH@
568
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
569
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`
570
-
571 455
 mostlyclean-libtool:
572 456
 	-rm -f *.lo
573 457
 
... ...
@@ -159,6 +159,7 @@ am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \
159 159
 	bytecode_hooks.h cache.c cache.h bytecode_detect.c \
160 160
 	bytecode_detect.h builtin_bytecodes.h events.c events.h swf.c \
161 161
 	swf.h jpeg.c jpeg.h png.c png.h bignum.c bignum_class.h
162
+am__dirstamp = $(am__leading_dot)dirstamp
162 163
 @LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo
163 164
 am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
164 165
 	libclamav_la-matcher-bm.lo libclamav_la-matcher-hash.lo \
... ...
@@ -182,8 +183,8 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
182 182
 	libclamav_la-special.lo libclamav_la-binhex.lo \
183 183
 	libclamav_la-is_tar.lo libclamav_la-tnef.lo \
184 184
 	libclamav_la-autoit.lo libclamav_la-unarj.lo \
185
-	libclamav_la-bzlib.lo libclamav_la-nulsft.lo \
186
-	libclamav_la-infblock.lo libclamav_la-pdf.lo \
185
+	nsis/libclamav_la-bzlib.lo nsis/libclamav_la-nulsft.lo \
186
+	nsis/libclamav_la-infblock.lo libclamav_la-pdf.lo \
187 187
 	libclamav_la-spin.lo libclamav_la-yc.lo libclamav_la-elf.lo \
188 188
 	libclamav_la-sis.lo libclamav_la-uuencode.lo \
189 189
 	libclamav_la-phishcheck.lo \
... ...
@@ -192,15 +193,18 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
192 192
 	libclamav_la-regex_suffix.lo libclamav_la-mspack.lo \
193 193
 	libclamav_la-cab.lo libclamav_la-entconv.lo \
194 194
 	libclamav_la-hashtab.lo libclamav_la-dconf.lo \
195
-	libclamav_la-LzmaDec.lo libclamav_la-lzma_iface.lo \
196
-	libclamav_la-7z.lo libclamav_la-7zFile.lo \
197
-	libclamav_la-7zStream.lo libclamav_la-7zCrc.lo \
198
-	libclamav_la-7zBuf.lo libclamav_la-Bcj2.lo libclamav_la-Bra.lo \
199
-	libclamav_la-Bra86.lo libclamav_la-7zIn.lo \
200
-	libclamav_la-7zDecode.lo libclamav_la-7zItem.lo \
201
-	libclamav_la-7zHeader.lo libclamav_la-7zExtract.lo \
195
+	7z/libclamav_la-LzmaDec.lo libclamav_la-lzma_iface.lo \
196
+	libclamav_la-7z.lo 7z/libclamav_la-7zFile.lo \
197
+	7z/libclamav_la-7zStream.lo 7z/libclamav_la-7zCrc.lo \
198
+	7z/libclamav_la-7zBuf.lo 7z/libclamav_la-Bcj2.lo \
199
+	7z/libclamav_la-Bra.lo 7z/libclamav_la-Bra86.lo \
200
+	7z/Archive/7z/libclamav_la-7zIn.lo \
201
+	7z/Archive/7z/libclamav_la-7zDecode.lo \
202
+	7z/Archive/7z/libclamav_la-7zItem.lo \
203
+	7z/Archive/7z/libclamav_la-7zHeader.lo \
204
+	7z/Archive/7z/libclamav_la-7zExtract.lo \
202 205
 	libclamav_la-explode.lo libclamav_la-textnorm.lo \
203
-	libclamav_la-dlp.lo libclamav_la-js-norm.lo \
206
+	libclamav_la-dlp.lo jsparse/libclamav_la-js-norm.lo \
204 207
 	libclamav_la-uniq.lo libclamav_la-version.lo \
205 208
 	libclamav_la-mpool.lo libclamav_la-filtering.lo \
206 209
 	libclamav_la-fmap.lo libclamav_la-perflogging.lo \
... ...
@@ -225,11 +229,11 @@ am_libclamav_internal_utils_la_OBJECTS =  \
225 225
 	libclamav_internal_utils_la-md5.lo \
226 226
 	libclamav_internal_utils_la-others_common.lo \
227 227
 	libclamav_internal_utils_la-qsort.lo \
228
-	libclamav_internal_utils_la-strlcpy.lo \
229
-	libclamav_internal_utils_la-regcomp.lo \
230
-	libclamav_internal_utils_la-regerror.lo \
231
-	libclamav_internal_utils_la-regexec.lo \
232
-	libclamav_internal_utils_la-regfree.lo
228
+	regex/libclamav_internal_utils_la-strlcpy.lo \
229
+	regex/libclamav_internal_utils_la-regcomp.lo \
230
+	regex/libclamav_internal_utils_la-regerror.lo \
231
+	regex/libclamav_internal_utils_la-regexec.lo \
232
+	regex/libclamav_internal_utils_la-regfree.lo
233 233
 libclamav_internal_utils_la_OBJECTS =  \
234 234
 	$(am_libclamav_internal_utils_la_OBJECTS)
235 235
 libclamav_internal_utils_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
... ...
@@ -242,11 +246,11 @@ am_libclamav_internal_utils_nothreads_la_OBJECTS =  \
242 242
 	libclamav_internal_utils_nothreads_la-md5.lo \
243 243
 	libclamav_internal_utils_nothreads_la-others_common.lo \
244 244
 	libclamav_internal_utils_nothreads_la-qsort.lo \
245
-	libclamav_internal_utils_nothreads_la-strlcpy.lo \
246
-	libclamav_internal_utils_nothreads_la-regcomp.lo \
247
-	libclamav_internal_utils_nothreads_la-regerror.lo \
248
-	libclamav_internal_utils_nothreads_la-regexec.lo \
249
-	libclamav_internal_utils_nothreads_la-regfree.lo
245
+	regex/libclamav_internal_utils_nothreads_la-strlcpy.lo \
246
+	regex/libclamav_internal_utils_nothreads_la-regcomp.lo \
247
+	regex/libclamav_internal_utils_nothreads_la-regerror.lo \
248
+	regex/libclamav_internal_utils_nothreads_la-regexec.lo \
249
+	regex/libclamav_internal_utils_nothreads_la-regfree.lo
250 250
 libclamav_internal_utils_nothreads_la_OBJECTS =  \
251 251
 	$(am_libclamav_internal_utils_nothreads_la_OBJECTS)
252 252
 libclamav_internal_utils_nothreads_la_LINK = $(LIBTOOL) $(AM_V_lt) \
... ...
@@ -267,9 +271,15 @@ am__libclamunrar_la_SOURCES_DIST = ../libclamunrar/unrar15.c \
267 267
 	../libclamunrar/unrarfilter.c ../libclamunrar/unrarppm.h \
268 268
 	../libclamunrar/unrarvm.h ../libclamunrar/unrarhlp.c \
269 269
 	../libclamunrar/unrarhlp.h
270
-@ENABLE_UNRAR_TRUE@am_libclamunrar_la_OBJECTS = unrar15.lo unrar.lo \
271
-@ENABLE_UNRAR_TRUE@	unrar20.lo unrarppm.lo unrarvm.lo \
272
-@ENABLE_UNRAR_TRUE@	unrarcmd.lo unrarfilter.lo unrarhlp.lo
270
+@ENABLE_UNRAR_TRUE@am_libclamunrar_la_OBJECTS =  \
271
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrar15.lo \
272
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrar.lo \
273
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrar20.lo \
274
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarppm.lo \
275
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarvm.lo \
276
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarcmd.lo \
277
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarfilter.lo \
278
+@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarhlp.lo
273 279
 libclamunrar_la_OBJECTS = $(am_libclamunrar_la_OBJECTS)
274 280
 libclamunrar_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
275 281
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
... ...
@@ -281,7 +291,8 @@ libclamunrar_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
281 281
 am__libclamunrar_iface_la_SOURCES_DIST =  \
282 282
 	../libclamunrar_iface/unrar_iface.c \
283 283
 	../libclamunrar_iface/unrar_iface.h
284
-@ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_OBJECTS = unrar_iface.lo
284
+@ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_OBJECTS =  \
285
+@ENABLE_UNRAR_TRUE@	../libclamunrar_iface/unrar_iface.lo
285 286
 libclamunrar_iface_la_OBJECTS = $(am_libclamunrar_iface_la_OBJECTS)
286 287
 libclamunrar_iface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
287 288
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
... ...
@@ -750,58 +761,232 @@ clean-noinstLTLIBRARIES:
750 750
 	  echo "rm -f \"$${dir}/so_locations\""; \
751 751
 	  rm -f "$${dir}/so_locations"; \
752 752
 	done
753
+nsis/$(am__dirstamp):
754
+	@$(MKDIR_P) nsis
755
+	@: > nsis/$(am__dirstamp)
756
+nsis/$(DEPDIR)/$(am__dirstamp):
757
+	@$(MKDIR_P) nsis/$(DEPDIR)
758
+	@: > nsis/$(DEPDIR)/$(am__dirstamp)
759
+nsis/libclamav_la-bzlib.lo: nsis/$(am__dirstamp) \
760
+	nsis/$(DEPDIR)/$(am__dirstamp)
761
+nsis/libclamav_la-nulsft.lo: nsis/$(am__dirstamp) \
762
+	nsis/$(DEPDIR)/$(am__dirstamp)
763
+nsis/libclamav_la-infblock.lo: nsis/$(am__dirstamp) \
764
+	nsis/$(DEPDIR)/$(am__dirstamp)
765
+7z/$(am__dirstamp):
766
+	@$(MKDIR_P) 7z
767
+	@: > 7z/$(am__dirstamp)
768
+7z/$(DEPDIR)/$(am__dirstamp):
769
+	@$(MKDIR_P) 7z/$(DEPDIR)
770
+	@: > 7z/$(DEPDIR)/$(am__dirstamp)
771
+7z/libclamav_la-LzmaDec.lo: 7z/$(am__dirstamp) \
772
+	7z/$(DEPDIR)/$(am__dirstamp)
773
+7z/libclamav_la-7zFile.lo: 7z/$(am__dirstamp) \
774
+	7z/$(DEPDIR)/$(am__dirstamp)
775
+7z/libclamav_la-7zStream.lo: 7z/$(am__dirstamp) \
776
+	7z/$(DEPDIR)/$(am__dirstamp)
777
+7z/libclamav_la-7zCrc.lo: 7z/$(am__dirstamp) \
778
+	7z/$(DEPDIR)/$(am__dirstamp)
779
+7z/libclamav_la-7zBuf.lo: 7z/$(am__dirstamp) \
780
+	7z/$(DEPDIR)/$(am__dirstamp)
781
+7z/libclamav_la-Bcj2.lo: 7z/$(am__dirstamp) \
782
+	7z/$(DEPDIR)/$(am__dirstamp)
783
+7z/libclamav_la-Bra.lo: 7z/$(am__dirstamp) \
784
+	7z/$(DEPDIR)/$(am__dirstamp)
785
+7z/libclamav_la-Bra86.lo: 7z/$(am__dirstamp) \
786
+	7z/$(DEPDIR)/$(am__dirstamp)
787
+7z/Archive/7z/$(am__dirstamp):
788
+	@$(MKDIR_P) 7z/Archive/7z
789
+	@: > 7z/Archive/7z/$(am__dirstamp)
790
+7z/Archive/7z/$(DEPDIR)/$(am__dirstamp):
791
+	@$(MKDIR_P) 7z/Archive/7z/$(DEPDIR)
792
+	@: > 7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
793
+7z/Archive/7z/libclamav_la-7zIn.lo: 7z/Archive/7z/$(am__dirstamp) \
794
+	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
795
+7z/Archive/7z/libclamav_la-7zDecode.lo: 7z/Archive/7z/$(am__dirstamp) \
796
+	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
797
+7z/Archive/7z/libclamav_la-7zItem.lo: 7z/Archive/7z/$(am__dirstamp) \
798
+	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
799
+7z/Archive/7z/libclamav_la-7zHeader.lo: 7z/Archive/7z/$(am__dirstamp) \
800
+	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
801
+7z/Archive/7z/libclamav_la-7zExtract.lo:  \
802
+	7z/Archive/7z/$(am__dirstamp) \
803
+	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
804
+jsparse/$(am__dirstamp):
805
+	@$(MKDIR_P) jsparse
806
+	@: > jsparse/$(am__dirstamp)
807
+jsparse/$(DEPDIR)/$(am__dirstamp):
808
+	@$(MKDIR_P) jsparse/$(DEPDIR)
809
+	@: > jsparse/$(DEPDIR)/$(am__dirstamp)
810
+jsparse/libclamav_la-js-norm.lo: jsparse/$(am__dirstamp) \
811
+	jsparse/$(DEPDIR)/$(am__dirstamp)
753 812
 libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) 
754 813
 	$(AM_V_CCLD)$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)
814
+regex/$(am__dirstamp):
815
+	@$(MKDIR_P) regex
816
+	@: > regex/$(am__dirstamp)
817
+regex/$(DEPDIR)/$(am__dirstamp):
818
+	@$(MKDIR_P) regex/$(DEPDIR)
819
+	@: > regex/$(DEPDIR)/$(am__dirstamp)
820
+regex/libclamav_internal_utils_la-strlcpy.lo: regex/$(am__dirstamp) \
821
+	regex/$(DEPDIR)/$(am__dirstamp)
822
+regex/libclamav_internal_utils_la-regcomp.lo: regex/$(am__dirstamp) \
823
+	regex/$(DEPDIR)/$(am__dirstamp)
824
+regex/libclamav_internal_utils_la-regerror.lo: regex/$(am__dirstamp) \
825
+	regex/$(DEPDIR)/$(am__dirstamp)
826
+regex/libclamav_internal_utils_la-regexec.lo: regex/$(am__dirstamp) \
827
+	regex/$(DEPDIR)/$(am__dirstamp)
828
+regex/libclamav_internal_utils_la-regfree.lo: regex/$(am__dirstamp) \
829
+	regex/$(DEPDIR)/$(am__dirstamp)
755 830
 libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) 
756 831
 	$(AM_V_CCLD)$(libclamav_internal_utils_la_LINK)  $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS)
832
+regex/libclamav_internal_utils_nothreads_la-strlcpy.lo:  \
833
+	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
834
+regex/libclamav_internal_utils_nothreads_la-regcomp.lo:  \
835
+	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
836
+regex/libclamav_internal_utils_nothreads_la-regerror.lo:  \
837
+	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
838
+regex/libclamav_internal_utils_nothreads_la-regexec.lo:  \
839
+	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
840
+regex/libclamav_internal_utils_nothreads_la-regfree.lo:  \
841
+	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
757 842
 libclamav_internal_utils_nothreads.la: $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_DEPENDENCIES) 
758 843
 	$(AM_V_CCLD)$(libclamav_internal_utils_nothreads_la_LINK)  $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_LIBADD) $(LIBS)
759 844
 libclamav_nocxx.la: $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_DEPENDENCIES) 
760 845
 	$(AM_V_CCLD)$(LINK)  $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_LIBADD) $(LIBS)
846
+../libclamunrar/$(am__dirstamp):
847
+	@$(MKDIR_P) ../libclamunrar
848
+	@: > ../libclamunrar/$(am__dirstamp)
849
+../libclamunrar/$(DEPDIR)/$(am__dirstamp):
850
+	@$(MKDIR_P) ../libclamunrar/$(DEPDIR)
851
+	@: > ../libclamunrar/$(DEPDIR)/$(am__dirstamp)
852
+../libclamunrar/unrar15.lo: ../libclamunrar/$(am__dirstamp) \
853
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
854
+../libclamunrar/unrar.lo: ../libclamunrar/$(am__dirstamp) \
855
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
856
+../libclamunrar/unrar20.lo: ../libclamunrar/$(am__dirstamp) \
857
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
858
+../libclamunrar/unrarppm.lo: ../libclamunrar/$(am__dirstamp) \
859
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
860
+../libclamunrar/unrarvm.lo: ../libclamunrar/$(am__dirstamp) \
861
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
862
+../libclamunrar/unrarcmd.lo: ../libclamunrar/$(am__dirstamp) \
863
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
864
+../libclamunrar/unrarfilter.lo: ../libclamunrar/$(am__dirstamp) \
865
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
866
+../libclamunrar/unrarhlp.lo: ../libclamunrar/$(am__dirstamp) \
867
+	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
761 868
 libclamunrar.la: $(libclamunrar_la_OBJECTS) $(libclamunrar_la_DEPENDENCIES) 
762 869
 	$(AM_V_CCLD)$(libclamunrar_la_LINK) $(am_libclamunrar_la_rpath) $(libclamunrar_la_OBJECTS) $(libclamunrar_la_LIBADD) $(LIBS)
870
+../libclamunrar_iface/$(am__dirstamp):
871
+	@$(MKDIR_P) ../libclamunrar_iface
872
+	@: > ../libclamunrar_iface/$(am__dirstamp)
873
+../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp):
874
+	@$(MKDIR_P) ../libclamunrar_iface/$(DEPDIR)
875
+	@: > ../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp)
876
+../libclamunrar_iface/unrar_iface.lo:  \
877
+	../libclamunrar_iface/$(am__dirstamp) \
878
+	../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp)
763 879
 libclamunrar_iface.la: $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_DEPENDENCIES) 
764 880
 	$(AM_V_CCLD)$(libclamunrar_iface_la_LINK) $(am_libclamunrar_iface_la_rpath) $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_LIBADD) $(LIBS)
765 881
 
766 882
 mostlyclean-compile:
767 883
 	-rm -f *.$(OBJEXT)
884
+	-rm -f ../libclamunrar/unrar.$(OBJEXT)
885
+	-rm -f ../libclamunrar/unrar.lo
886
+	-rm -f ../libclamunrar/unrar15.$(OBJEXT)
887
+	-rm -f ../libclamunrar/unrar15.lo
888
+	-rm -f ../libclamunrar/unrar20.$(OBJEXT)
889
+	-rm -f ../libclamunrar/unrar20.lo
890
+	-rm -f ../libclamunrar/unrarcmd.$(OBJEXT)
891
+	-rm -f ../libclamunrar/unrarcmd.lo
892
+	-rm -f ../libclamunrar/unrarfilter.$(OBJEXT)
893
+	-rm -f ../libclamunrar/unrarfilter.lo
894
+	-rm -f ../libclamunrar/unrarhlp.$(OBJEXT)
895
+	-rm -f ../libclamunrar/unrarhlp.lo
896
+	-rm -f ../libclamunrar/unrarppm.$(OBJEXT)
897
+	-rm -f ../libclamunrar/unrarppm.lo
898
+	-rm -f ../libclamunrar/unrarvm.$(OBJEXT)
899
+	-rm -f ../libclamunrar/unrarvm.lo
900
+	-rm -f ../libclamunrar_iface/unrar_iface.$(OBJEXT)
901
+	-rm -f ../libclamunrar_iface/unrar_iface.lo
902
+	-rm -f 7z/Archive/7z/libclamav_la-7zDecode.$(OBJEXT)
903
+	-rm -f 7z/Archive/7z/libclamav_la-7zDecode.lo
904
+	-rm -f 7z/Archive/7z/libclamav_la-7zExtract.$(OBJEXT)
905
+	-rm -f 7z/Archive/7z/libclamav_la-7zExtract.lo
906
+	-rm -f 7z/Archive/7z/libclamav_la-7zHeader.$(OBJEXT)
907
+	-rm -f 7z/Archive/7z/libclamav_la-7zHeader.lo
908
+	-rm -f 7z/Archive/7z/libclamav_la-7zIn.$(OBJEXT)
909
+	-rm -f 7z/Archive/7z/libclamav_la-7zIn.lo
910
+	-rm -f 7z/Archive/7z/libclamav_la-7zItem.$(OBJEXT)
911
+	-rm -f 7z/Archive/7z/libclamav_la-7zItem.lo
912
+	-rm -f 7z/libclamav_la-7zBuf.$(OBJEXT)
913
+	-rm -f 7z/libclamav_la-7zBuf.lo
914
+	-rm -f 7z/libclamav_la-7zCrc.$(OBJEXT)
915
+	-rm -f 7z/libclamav_la-7zCrc.lo
916
+	-rm -f 7z/libclamav_la-7zFile.$(OBJEXT)
917
+	-rm -f 7z/libclamav_la-7zFile.lo
918
+	-rm -f 7z/libclamav_la-7zStream.$(OBJEXT)
919
+	-rm -f 7z/libclamav_la-7zStream.lo
920
+	-rm -f 7z/libclamav_la-Bcj2.$(OBJEXT)
921
+	-rm -f 7z/libclamav_la-Bcj2.lo
922
+	-rm -f 7z/libclamav_la-Bra.$(OBJEXT)
923
+	-rm -f 7z/libclamav_la-Bra.lo
924
+	-rm -f 7z/libclamav_la-Bra86.$(OBJEXT)
925
+	-rm -f 7z/libclamav_la-Bra86.lo
926
+	-rm -f 7z/libclamav_la-LzmaDec.$(OBJEXT)
927
+	-rm -f 7z/libclamav_la-LzmaDec.lo
928
+	-rm -f jsparse/libclamav_la-js-norm.$(OBJEXT)
929
+	-rm -f jsparse/libclamav_la-js-norm.lo
930
+	-rm -f nsis/libclamav_la-bzlib.$(OBJEXT)
931
+	-rm -f nsis/libclamav_la-bzlib.lo
932
+	-rm -f nsis/libclamav_la-infblock.$(OBJEXT)
933
+	-rm -f nsis/libclamav_la-infblock.lo
934
+	-rm -f nsis/libclamav_la-nulsft.$(OBJEXT)
935
+	-rm -f nsis/libclamav_la-nulsft.lo
936
+	-rm -f regex/libclamav_internal_utils_la-regcomp.$(OBJEXT)
937
+	-rm -f regex/libclamav_internal_utils_la-regcomp.lo
938
+	-rm -f regex/libclamav_internal_utils_la-regerror.$(OBJEXT)
939
+	-rm -f regex/libclamav_internal_utils_la-regerror.lo
940
+	-rm -f regex/libclamav_internal_utils_la-regexec.$(OBJEXT)
941
+	-rm -f regex/libclamav_internal_utils_la-regexec.lo
942
+	-rm -f regex/libclamav_internal_utils_la-regfree.$(OBJEXT)
943
+	-rm -f regex/libclamav_internal_utils_la-regfree.lo
944
+	-rm -f regex/libclamav_internal_utils_la-strlcpy.$(OBJEXT)
945
+	-rm -f regex/libclamav_internal_utils_la-strlcpy.lo
946
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regcomp.$(OBJEXT)
947
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regcomp.lo
948
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regerror.$(OBJEXT)
949
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regerror.lo
950
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regexec.$(OBJEXT)
951
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regexec.lo
952
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regfree.$(OBJEXT)
953
+	-rm -f regex/libclamav_internal_utils_nothreads_la-regfree.lo
954
+	-rm -f regex/libclamav_internal_utils_nothreads_la-strlcpy.$(OBJEXT)
955
+	-rm -f regex/libclamav_internal_utils_nothreads_la-strlcpy.lo
768 956
 
769 957
 distclean-compile:
770 958
 	-rm -f *.tab.c
771 959
 
960
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrar.Plo@am__quote@
961
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrar15.Plo@am__quote@
962
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrar20.Plo@am__quote@
963
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarcmd.Plo@am__quote@
964
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarfilter.Plo@am__quote@
965
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarhlp.Plo@am__quote@
966
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarppm.Plo@am__quote@
967
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarvm.Plo@am__quote@
968
+@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar_iface/$(DEPDIR)/unrar_iface.Plo@am__quote@
772 969
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytecode_nojit.Plo@am__quote@
773 970
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-md5.Plo@am__quote@
774 971
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others_common.Plo@am__quote@
775 972
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-qsort.Plo@am__quote@
776
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo@am__quote@
777
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo@am__quote@
778
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo@am__quote@
779
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@
780 973
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@
781
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@
782 974
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo@am__quote@
783 975
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Plo@am__quote@
784 976
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-qsort.Plo@am__quote@
785
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo@am__quote@
786
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo@am__quote@
787
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo@am__quote@
788
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo@am__quote@
789 977
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Plo@am__quote@
790
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo@am__quote@
791 978
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7z.Plo@am__quote@
792
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zBuf.Plo@am__quote@
793
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zCrc.Plo@am__quote@
794
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zDecode.Plo@am__quote@
795
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zExtract.Plo@am__quote@
796
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zFile.Plo@am__quote@
797
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zHeader.Plo@am__quote@
798
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zIn.Plo@am__quote@
799
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zItem.Plo@am__quote@
800
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zStream.Plo@am__quote@
801
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-Bcj2.Plo@am__quote@
802
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-Bra.Plo@am__quote@
803
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-Bra86.Plo@am__quote@
804
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-LzmaDec.Plo@am__quote@
805 979
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-aspack.Plo@am__quote@
806 980
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-autoit.Plo@am__quote@
807 981
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bignum.Plo@am__quote@
... ...
@@ -812,7 +997,6 @@ distclean-compile:
812 812
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_api_decl.Plo@am__quote@
813 813
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_detect.Plo@am__quote@
814 814
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_vm.Plo@am__quote@
815
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bzlib.Plo@am__quote@
816 815
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-cab.Plo@am__quote@
817 816
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-cache.Plo@am__quote@
818 817
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-chmunpack.Plo@am__quote@
... ...
@@ -832,12 +1016,10 @@ distclean-compile:
832 832
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fsg.Plo@am__quote@
833 833
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-hashtab.Plo@am__quote@
834 834
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-htmlnorm.Plo@am__quote@
835
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-infblock.Plo@am__quote@
836 835
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-inflate64.Plo@am__quote@
837 836
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-is_tar.Plo@am__quote@
838 837
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-ishield.Plo@am__quote@
839 838
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-jpeg.Plo@am__quote@
840
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-js-norm.Plo@am__quote@
841 839
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-line.Plo@am__quote@
842 840
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-lzma_iface.Plo@am__quote@
843 841
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-macho.Plo@am__quote@
... ...
@@ -851,7 +1033,6 @@ distclean-compile:
851 851
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-mpool.Plo@am__quote@
852 852
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-msexpand.Plo@am__quote@
853 853
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-mspack.Plo@am__quote@
854
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-nulsft.Plo@am__quote@
855 854
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-ole2_extract.Plo@am__quote@
856 855
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-others.Plo@am__quote@
857 856
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-packlibs.Plo@am__quote@
... ...
@@ -893,35 +1074,56 @@ distclean-compile:
893 893
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-version.Plo@am__quote@
894 894
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-wwunpack.Plo@am__quote@
895 895
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yc.Plo@am__quote@
896
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar.Plo@am__quote@
897
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar15.Plo@am__quote@
898
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar20.Plo@am__quote@
899
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar_iface.Plo@am__quote@
900
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarcmd.Plo@am__quote@
901
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarfilter.Plo@am__quote@
902
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarhlp.Plo@am__quote@
903
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarppm.Plo@am__quote@
904
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarvm.Plo@am__quote@
896
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zBuf.Plo@am__quote@
897
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zCrc.Plo@am__quote@
898
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zFile.Plo@am__quote@
899
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zStream.Plo@am__quote@
900
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-Bcj2.Plo@am__quote@
901
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-Bra.Plo@am__quote@
902
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-Bra86.Plo@am__quote@
903
+@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-LzmaDec.Plo@am__quote@
904
+@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Plo@am__quote@
905
+@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Plo@am__quote@
906
+@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Plo@am__quote@
907
+@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Plo@am__quote@
908
+@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Plo@am__quote@
909
+@AMDEP_TRUE@@am__include@ @am__quote@jsparse/$(DEPDIR)/libclamav_la-js-norm.Plo@am__quote@
910
+@AMDEP_TRUE@@am__include@ @am__quote@nsis/$(DEPDIR)/libclamav_la-bzlib.Plo@am__quote@
911
+@AMDEP_TRUE@@am__include@ @am__quote@nsis/$(DEPDIR)/libclamav_la-infblock.Plo@am__quote@
912
+@AMDEP_TRUE@@am__include@ @am__quote@nsis/$(DEPDIR)/libclamav_la-nulsft.Plo@am__quote@
913
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo@am__quote@
914
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo@am__quote@
915
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo@am__quote@
916
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@
917
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@
918
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo@am__quote@
919
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo@am__quote@
920
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo@am__quote@
921
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo@am__quote@
922
+@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo@am__quote@
905 923
 
906 924
 .c.o:
907
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
908
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
925
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
926
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
927
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
909 928
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
910 929
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
911 930
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
912
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
931
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
913 932
 
914 933
 .c.obj:
915
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
916
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
934
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
935
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
936
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
917 937
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
918 938
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
919 939
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
920
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
940
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
921 941
 
922 942
 .c.lo:
923
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
924
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
943
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
944
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
945
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
925 946
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
926 947
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
927 948
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
... ...
@@ -1287,29 +1489,29 @@ libclamav_la-unarj.lo: unarj.c
1287 1287
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1288 1288
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-unarj.lo `test -f 'unarj.c' || echo '$(srcdir)/'`unarj.c
1289 1289
 
1290
-libclamav_la-bzlib.lo: nsis/bzlib.c
1291
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-bzlib.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bzlib.Tpo -c -o libclamav_la-bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c
1292
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-bzlib.Tpo $(DEPDIR)/libclamav_la-bzlib.Plo
1290
+nsis/libclamav_la-bzlib.lo: nsis/bzlib.c
1291
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT nsis/libclamav_la-bzlib.lo -MD -MP -MF nsis/$(DEPDIR)/libclamav_la-bzlib.Tpo -c -o nsis/libclamav_la-bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c
1292
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nsis/$(DEPDIR)/libclamav_la-bzlib.Tpo nsis/$(DEPDIR)/libclamav_la-bzlib.Plo
1293 1293
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1294
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/bzlib.c' object='libclamav_la-bzlib.lo' libtool=yes @AMDEPBACKSLASH@
1294
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/bzlib.c' object='nsis/libclamav_la-bzlib.lo' libtool=yes @AMDEPBACKSLASH@
1295 1295
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1296
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c
1296
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o nsis/libclamav_la-bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c
1297 1297
 
1298
-libclamav_la-nulsft.lo: nsis/nulsft.c
1299
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-nulsft.lo -MD -MP -MF $(DEPDIR)/libclamav_la-nulsft.Tpo -c -o libclamav_la-nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c
1300
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-nulsft.Tpo $(DEPDIR)/libclamav_la-nulsft.Plo
1298
+nsis/libclamav_la-nulsft.lo: nsis/nulsft.c
1299
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT nsis/libclamav_la-nulsft.lo -MD -MP -MF nsis/$(DEPDIR)/libclamav_la-nulsft.Tpo -c -o nsis/libclamav_la-nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c
1300
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nsis/$(DEPDIR)/libclamav_la-nulsft.Tpo nsis/$(DEPDIR)/libclamav_la-nulsft.Plo
1301 1301
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1302
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/nulsft.c' object='libclamav_la-nulsft.lo' libtool=yes @AMDEPBACKSLASH@
1302
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/nulsft.c' object='nsis/libclamav_la-nulsft.lo' libtool=yes @AMDEPBACKSLASH@
1303 1303
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1304
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c
1304
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o nsis/libclamav_la-nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c
1305 1305
 
1306
-libclamav_la-infblock.lo: nsis/infblock.c
1307
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-infblock.lo -MD -MP -MF $(DEPDIR)/libclamav_la-infblock.Tpo -c -o libclamav_la-infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c
1308
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-infblock.Tpo $(DEPDIR)/libclamav_la-infblock.Plo
1306
+nsis/libclamav_la-infblock.lo: nsis/infblock.c
1307
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT nsis/libclamav_la-infblock.lo -MD -MP -MF nsis/$(DEPDIR)/libclamav_la-infblock.Tpo -c -o nsis/libclamav_la-infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c
1308
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nsis/$(DEPDIR)/libclamav_la-infblock.Tpo nsis/$(DEPDIR)/libclamav_la-infblock.Plo
1309 1309
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1310
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/infblock.c' object='libclamav_la-infblock.lo' libtool=yes @AMDEPBACKSLASH@
1310
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/infblock.c' object='nsis/libclamav_la-infblock.lo' libtool=yes @AMDEPBACKSLASH@
1311 1311
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1312
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c
1312
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o nsis/libclamav_la-infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c
1313 1313
 
1314 1314
 libclamav_la-pdf.lo: pdf.c
1315 1315
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-pdf.lo -MD -MP -MF $(DEPDIR)/libclamav_la-pdf.Tpo -c -o libclamav_la-pdf.lo `test -f 'pdf.c' || echo '$(srcdir)/'`pdf.c
... ...
@@ -1439,13 +1641,13 @@ libclamav_la-dconf.lo: dconf.c
1439 1439
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1440 1440
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-dconf.lo `test -f 'dconf.c' || echo '$(srcdir)/'`dconf.c
1441 1441
 
1442
-libclamav_la-LzmaDec.lo: 7z/LzmaDec.c
1443
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-LzmaDec.lo -MD -MP -MF $(DEPDIR)/libclamav_la-LzmaDec.Tpo -c -o libclamav_la-LzmaDec.lo `test -f '7z/LzmaDec.c' || echo '$(srcdir)/'`7z/LzmaDec.c
1444
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-LzmaDec.Tpo $(DEPDIR)/libclamav_la-LzmaDec.Plo
1442
+7z/libclamav_la-LzmaDec.lo: 7z/LzmaDec.c
1443
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-LzmaDec.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-LzmaDec.Tpo -c -o 7z/libclamav_la-LzmaDec.lo `test -f '7z/LzmaDec.c' || echo '$(srcdir)/'`7z/LzmaDec.c
1444
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-LzmaDec.Tpo 7z/$(DEPDIR)/libclamav_la-LzmaDec.Plo
1445 1445
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1446
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/LzmaDec.c' object='libclamav_la-LzmaDec.lo' libtool=yes @AMDEPBACKSLASH@
1446
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/LzmaDec.c' object='7z/libclamav_la-LzmaDec.lo' libtool=yes @AMDEPBACKSLASH@
1447 1447
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1448
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-LzmaDec.lo `test -f '7z/LzmaDec.c' || echo '$(srcdir)/'`7z/LzmaDec.c
1448
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-LzmaDec.lo `test -f '7z/LzmaDec.c' || echo '$(srcdir)/'`7z/LzmaDec.c
1449 1449
 
1450 1450
 libclamav_la-lzma_iface.lo: lzma_iface.c
1451 1451
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-lzma_iface.lo -MD -MP -MF $(DEPDIR)/libclamav_la-lzma_iface.Tpo -c -o libclamav_la-lzma_iface.lo `test -f 'lzma_iface.c' || echo '$(srcdir)/'`lzma_iface.c
... ...
@@ -1463,101 +1665,101 @@ libclamav_la-7z.lo: 7z.c
1463 1463
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1464 1464
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7z.lo `test -f '7z.c' || echo '$(srcdir)/'`7z.c
1465 1465
 
1466
-libclamav_la-7zFile.lo: 7z/7zFile.c
1467
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zFile.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zFile.Tpo -c -o libclamav_la-7zFile.lo `test -f '7z/7zFile.c' || echo '$(srcdir)/'`7z/7zFile.c
1468
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zFile.Tpo $(DEPDIR)/libclamav_la-7zFile.Plo
1466
+7z/libclamav_la-7zFile.lo: 7z/7zFile.c
1467
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-7zFile.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-7zFile.Tpo -c -o 7z/libclamav_la-7zFile.lo `test -f '7z/7zFile.c' || echo '$(srcdir)/'`7z/7zFile.c
1468
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zFile.Tpo 7z/$(DEPDIR)/libclamav_la-7zFile.Plo
1469 1469
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1470
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zFile.c' object='libclamav_la-7zFile.lo' libtool=yes @AMDEPBACKSLASH@
1470
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zFile.c' object='7z/libclamav_la-7zFile.lo' libtool=yes @AMDEPBACKSLASH@
1471 1471
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1472
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zFile.lo `test -f '7z/7zFile.c' || echo '$(srcdir)/'`7z/7zFile.c
1472
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-7zFile.lo `test -f '7z/7zFile.c' || echo '$(srcdir)/'`7z/7zFile.c
1473 1473
 
1474
-libclamav_la-7zStream.lo: 7z/7zStream.c
1475
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zStream.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zStream.Tpo -c -o libclamav_la-7zStream.lo `test -f '7z/7zStream.c' || echo '$(srcdir)/'`7z/7zStream.c
1476
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zStream.Tpo $(DEPDIR)/libclamav_la-7zStream.Plo
1474
+7z/libclamav_la-7zStream.lo: 7z/7zStream.c
1475
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-7zStream.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-7zStream.Tpo -c -o 7z/libclamav_la-7zStream.lo `test -f '7z/7zStream.c' || echo '$(srcdir)/'`7z/7zStream.c
1476
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zStream.Tpo 7z/$(DEPDIR)/libclamav_la-7zStream.Plo
1477 1477
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1478
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zStream.c' object='libclamav_la-7zStream.lo' libtool=yes @AMDEPBACKSLASH@
1478
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zStream.c' object='7z/libclamav_la-7zStream.lo' libtool=yes @AMDEPBACKSLASH@
1479 1479
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1480
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zStream.lo `test -f '7z/7zStream.c' || echo '$(srcdir)/'`7z/7zStream.c
1480
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-7zStream.lo `test -f '7z/7zStream.c' || echo '$(srcdir)/'`7z/7zStream.c
1481 1481
 
1482
-libclamav_la-7zCrc.lo: 7z/7zCrc.c
1483
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zCrc.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zCrc.Tpo -c -o libclamav_la-7zCrc.lo `test -f '7z/7zCrc.c' || echo '$(srcdir)/'`7z/7zCrc.c
1484
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zCrc.Tpo $(DEPDIR)/libclamav_la-7zCrc.Plo
1482
+7z/libclamav_la-7zCrc.lo: 7z/7zCrc.c
1483
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-7zCrc.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-7zCrc.Tpo -c -o 7z/libclamav_la-7zCrc.lo `test -f '7z/7zCrc.c' || echo '$(srcdir)/'`7z/7zCrc.c
1484
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zCrc.Tpo 7z/$(DEPDIR)/libclamav_la-7zCrc.Plo
1485 1485
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1486
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zCrc.c' object='libclamav_la-7zCrc.lo' libtool=yes @AMDEPBACKSLASH@
1486
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zCrc.c' object='7z/libclamav_la-7zCrc.lo' libtool=yes @AMDEPBACKSLASH@
1487 1487
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1488
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zCrc.lo `test -f '7z/7zCrc.c' || echo '$(srcdir)/'`7z/7zCrc.c
1488
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-7zCrc.lo `test -f '7z/7zCrc.c' || echo '$(srcdir)/'`7z/7zCrc.c
1489 1489
 
1490
-libclamav_la-7zBuf.lo: 7z/7zBuf.c
1491
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zBuf.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zBuf.Tpo -c -o libclamav_la-7zBuf.lo `test -f '7z/7zBuf.c' || echo '$(srcdir)/'`7z/7zBuf.c
1492
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zBuf.Tpo $(DEPDIR)/libclamav_la-7zBuf.Plo
1490
+7z/libclamav_la-7zBuf.lo: 7z/7zBuf.c
1491
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-7zBuf.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-7zBuf.Tpo -c -o 7z/libclamav_la-7zBuf.lo `test -f '7z/7zBuf.c' || echo '$(srcdir)/'`7z/7zBuf.c
1492
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zBuf.Tpo 7z/$(DEPDIR)/libclamav_la-7zBuf.Plo
1493 1493
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1494
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zBuf.c' object='libclamav_la-7zBuf.lo' libtool=yes @AMDEPBACKSLASH@
1494
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zBuf.c' object='7z/libclamav_la-7zBuf.lo' libtool=yes @AMDEPBACKSLASH@
1495 1495
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1496
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zBuf.lo `test -f '7z/7zBuf.c' || echo '$(srcdir)/'`7z/7zBuf.c
1496
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-7zBuf.lo `test -f '7z/7zBuf.c' || echo '$(srcdir)/'`7z/7zBuf.c
1497 1497
 
1498
-libclamav_la-Bcj2.lo: 7z/Bcj2.c
1499
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-Bcj2.lo -MD -MP -MF $(DEPDIR)/libclamav_la-Bcj2.Tpo -c -o libclamav_la-Bcj2.lo `test -f '7z/Bcj2.c' || echo '$(srcdir)/'`7z/Bcj2.c
1500
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-Bcj2.Tpo $(DEPDIR)/libclamav_la-Bcj2.Plo
1498
+7z/libclamav_la-Bcj2.lo: 7z/Bcj2.c
1499
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-Bcj2.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-Bcj2.Tpo -c -o 7z/libclamav_la-Bcj2.lo `test -f '7z/Bcj2.c' || echo '$(srcdir)/'`7z/Bcj2.c
1500
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-Bcj2.Tpo 7z/$(DEPDIR)/libclamav_la-Bcj2.Plo
1501 1501
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1502
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bcj2.c' object='libclamav_la-Bcj2.lo' libtool=yes @AMDEPBACKSLASH@
1502
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bcj2.c' object='7z/libclamav_la-Bcj2.lo' libtool=yes @AMDEPBACKSLASH@
1503 1503
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1504
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-Bcj2.lo `test -f '7z/Bcj2.c' || echo '$(srcdir)/'`7z/Bcj2.c
1504
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-Bcj2.lo `test -f '7z/Bcj2.c' || echo '$(srcdir)/'`7z/Bcj2.c
1505 1505
 
1506
-libclamav_la-Bra.lo: 7z/Bra.c
1507
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-Bra.lo -MD -MP -MF $(DEPDIR)/libclamav_la-Bra.Tpo -c -o libclamav_la-Bra.lo `test -f '7z/Bra.c' || echo '$(srcdir)/'`7z/Bra.c
1508
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-Bra.Tpo $(DEPDIR)/libclamav_la-Bra.Plo
1506
+7z/libclamav_la-Bra.lo: 7z/Bra.c
1507
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-Bra.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-Bra.Tpo -c -o 7z/libclamav_la-Bra.lo `test -f '7z/Bra.c' || echo '$(srcdir)/'`7z/Bra.c
1508
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-Bra.Tpo 7z/$(DEPDIR)/libclamav_la-Bra.Plo
1509 1509
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1510
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra.c' object='libclamav_la-Bra.lo' libtool=yes @AMDEPBACKSLASH@
1510
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra.c' object='7z/libclamav_la-Bra.lo' libtool=yes @AMDEPBACKSLASH@
1511 1511
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1512
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-Bra.lo `test -f '7z/Bra.c' || echo '$(srcdir)/'`7z/Bra.c
1512
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-Bra.lo `test -f '7z/Bra.c' || echo '$(srcdir)/'`7z/Bra.c
1513 1513
 
1514
-libclamav_la-Bra86.lo: 7z/Bra86.c
1515
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-Bra86.lo -MD -MP -MF $(DEPDIR)/libclamav_la-Bra86.Tpo -c -o libclamav_la-Bra86.lo `test -f '7z/Bra86.c' || echo '$(srcdir)/'`7z/Bra86.c
1516
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-Bra86.Tpo $(DEPDIR)/libclamav_la-Bra86.Plo
1514
+7z/libclamav_la-Bra86.lo: 7z/Bra86.c
1515
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/libclamav_la-Bra86.lo -MD -MP -MF 7z/$(DEPDIR)/libclamav_la-Bra86.Tpo -c -o 7z/libclamav_la-Bra86.lo `test -f '7z/Bra86.c' || echo '$(srcdir)/'`7z/Bra86.c
1516
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-Bra86.Tpo 7z/$(DEPDIR)/libclamav_la-Bra86.Plo
1517 1517
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1518
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra86.c' object='libclamav_la-Bra86.lo' libtool=yes @AMDEPBACKSLASH@
1518
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra86.c' object='7z/libclamav_la-Bra86.lo' libtool=yes @AMDEPBACKSLASH@
1519 1519
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1520
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-Bra86.lo `test -f '7z/Bra86.c' || echo '$(srcdir)/'`7z/Bra86.c
1520
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/libclamav_la-Bra86.lo `test -f '7z/Bra86.c' || echo '$(srcdir)/'`7z/Bra86.c
1521 1521
 
1522
-libclamav_la-7zIn.lo: 7z/Archive/7z/7zIn.c
1523
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zIn.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zIn.Tpo -c -o libclamav_la-7zIn.lo `test -f '7z/Archive/7z/7zIn.c' || echo '$(srcdir)/'`7z/Archive/7z/7zIn.c
1524
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zIn.Tpo $(DEPDIR)/libclamav_la-7zIn.Plo
1522
+7z/Archive/7z/libclamav_la-7zIn.lo: 7z/Archive/7z/7zIn.c
1523
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/Archive/7z/libclamav_la-7zIn.lo -MD -MP -MF 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Tpo -c -o 7z/Archive/7z/libclamav_la-7zIn.lo `test -f '7z/Archive/7z/7zIn.c' || echo '$(srcdir)/'`7z/Archive/7z/7zIn.c
1524
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Plo
1525 1525
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1526
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zIn.c' object='libclamav_la-7zIn.lo' libtool=yes @AMDEPBACKSLASH@
1526
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zIn.c' object='7z/Archive/7z/libclamav_la-7zIn.lo' libtool=yes @AMDEPBACKSLASH@
1527 1527
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1528
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zIn.lo `test -f '7z/Archive/7z/7zIn.c' || echo '$(srcdir)/'`7z/Archive/7z/7zIn.c
1528
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/Archive/7z/libclamav_la-7zIn.lo `test -f '7z/Archive/7z/7zIn.c' || echo '$(srcdir)/'`7z/Archive/7z/7zIn.c
1529 1529
 
1530
-libclamav_la-7zDecode.lo: 7z/Archive/7z/7zDecode.c
1531
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zDecode.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zDecode.Tpo -c -o libclamav_la-7zDecode.lo `test -f '7z/Archive/7z/7zDecode.c' || echo '$(srcdir)/'`7z/Archive/7z/7zDecode.c
1532
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zDecode.Tpo $(DEPDIR)/libclamav_la-7zDecode.Plo
1530
+7z/Archive/7z/libclamav_la-7zDecode.lo: 7z/Archive/7z/7zDecode.c
1531
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/Archive/7z/libclamav_la-7zDecode.lo -MD -MP -MF 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Tpo -c -o 7z/Archive/7z/libclamav_la-7zDecode.lo `test -f '7z/Archive/7z/7zDecode.c' || echo '$(srcdir)/'`7z/Archive/7z/7zDecode.c
1532
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Plo
1533 1533
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1534
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zDecode.c' object='libclamav_la-7zDecode.lo' libtool=yes @AMDEPBACKSLASH@
1534
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zDecode.c' object='7z/Archive/7z/libclamav_la-7zDecode.lo' libtool=yes @AMDEPBACKSLASH@
1535 1535
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1536
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zDecode.lo `test -f '7z/Archive/7z/7zDecode.c' || echo '$(srcdir)/'`7z/Archive/7z/7zDecode.c
1536
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/Archive/7z/libclamav_la-7zDecode.lo `test -f '7z/Archive/7z/7zDecode.c' || echo '$(srcdir)/'`7z/Archive/7z/7zDecode.c
1537 1537
 
1538
-libclamav_la-7zItem.lo: 7z/Archive/7z/7zItem.c
1539
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zItem.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zItem.Tpo -c -o libclamav_la-7zItem.lo `test -f '7z/Archive/7z/7zItem.c' || echo '$(srcdir)/'`7z/Archive/7z/7zItem.c
1540
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zItem.Tpo $(DEPDIR)/libclamav_la-7zItem.Plo
1538
+7z/Archive/7z/libclamav_la-7zItem.lo: 7z/Archive/7z/7zItem.c
1539
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/Archive/7z/libclamav_la-7zItem.lo -MD -MP -MF 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Tpo -c -o 7z/Archive/7z/libclamav_la-7zItem.lo `test -f '7z/Archive/7z/7zItem.c' || echo '$(srcdir)/'`7z/Archive/7z/7zItem.c
1540
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Plo
1541 1541
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1542
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zItem.c' object='libclamav_la-7zItem.lo' libtool=yes @AMDEPBACKSLASH@
1542
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zItem.c' object='7z/Archive/7z/libclamav_la-7zItem.lo' libtool=yes @AMDEPBACKSLASH@
1543 1543
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1544
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zItem.lo `test -f '7z/Archive/7z/7zItem.c' || echo '$(srcdir)/'`7z/Archive/7z/7zItem.c
1544
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/Archive/7z/libclamav_la-7zItem.lo `test -f '7z/Archive/7z/7zItem.c' || echo '$(srcdir)/'`7z/Archive/7z/7zItem.c
1545 1545
 
1546
-libclamav_la-7zHeader.lo: 7z/Archive/7z/7zHeader.c
1547
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zHeader.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zHeader.Tpo -c -o libclamav_la-7zHeader.lo `test -f '7z/Archive/7z/7zHeader.c' || echo '$(srcdir)/'`7z/Archive/7z/7zHeader.c
1548
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zHeader.Tpo $(DEPDIR)/libclamav_la-7zHeader.Plo
1546
+7z/Archive/7z/libclamav_la-7zHeader.lo: 7z/Archive/7z/7zHeader.c
1547
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/Archive/7z/libclamav_la-7zHeader.lo -MD -MP -MF 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Tpo -c -o 7z/Archive/7z/libclamav_la-7zHeader.lo `test -f '7z/Archive/7z/7zHeader.c' || echo '$(srcdir)/'`7z/Archive/7z/7zHeader.c
1548
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Plo
1549 1549
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1550
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zHeader.c' object='libclamav_la-7zHeader.lo' libtool=yes @AMDEPBACKSLASH@
1550
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zHeader.c' object='7z/Archive/7z/libclamav_la-7zHeader.lo' libtool=yes @AMDEPBACKSLASH@
1551 1551
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1552
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zHeader.lo `test -f '7z/Archive/7z/7zHeader.c' || echo '$(srcdir)/'`7z/Archive/7z/7zHeader.c
1552
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/Archive/7z/libclamav_la-7zHeader.lo `test -f '7z/Archive/7z/7zHeader.c' || echo '$(srcdir)/'`7z/Archive/7z/7zHeader.c
1553 1553
 
1554
-libclamav_la-7zExtract.lo: 7z/Archive/7z/7zExtract.c
1555
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-7zExtract.lo -MD -MP -MF $(DEPDIR)/libclamav_la-7zExtract.Tpo -c -o libclamav_la-7zExtract.lo `test -f '7z/Archive/7z/7zExtract.c' || echo '$(srcdir)/'`7z/Archive/7z/7zExtract.c
1556
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zExtract.Tpo $(DEPDIR)/libclamav_la-7zExtract.Plo
1554
+7z/Archive/7z/libclamav_la-7zExtract.lo: 7z/Archive/7z/7zExtract.c
1555
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT 7z/Archive/7z/libclamav_la-7zExtract.lo -MD -MP -MF 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Tpo -c -o 7z/Archive/7z/libclamav_la-7zExtract.lo `test -f '7z/Archive/7z/7zExtract.c' || echo '$(srcdir)/'`7z/Archive/7z/7zExtract.c
1556
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Plo
1557 1557
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1558
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zExtract.c' object='libclamav_la-7zExtract.lo' libtool=yes @AMDEPBACKSLASH@
1558
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zExtract.c' object='7z/Archive/7z/libclamav_la-7zExtract.lo' libtool=yes @AMDEPBACKSLASH@
1559 1559
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1560
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-7zExtract.lo `test -f '7z/Archive/7z/7zExtract.c' || echo '$(srcdir)/'`7z/Archive/7z/7zExtract.c
1560
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o 7z/Archive/7z/libclamav_la-7zExtract.lo `test -f '7z/Archive/7z/7zExtract.c' || echo '$(srcdir)/'`7z/Archive/7z/7zExtract.c
1561 1561
 
1562 1562
 libclamav_la-explode.lo: explode.c
1563 1563
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-explode.lo -MD -MP -MF $(DEPDIR)/libclamav_la-explode.Tpo -c -o libclamav_la-explode.lo `test -f 'explode.c' || echo '$(srcdir)/'`explode.c
... ...
@@ -1583,13 +1785,13 @@ libclamav_la-dlp.lo: dlp.c
1583 1583
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1584 1584
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-dlp.lo `test -f 'dlp.c' || echo '$(srcdir)/'`dlp.c
1585 1585
 
1586
-libclamav_la-js-norm.lo: jsparse/js-norm.c
1587
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-js-norm.lo -MD -MP -MF $(DEPDIR)/libclamav_la-js-norm.Tpo -c -o libclamav_la-js-norm.lo `test -f 'jsparse/js-norm.c' || echo '$(srcdir)/'`jsparse/js-norm.c
1588
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-js-norm.Tpo $(DEPDIR)/libclamav_la-js-norm.Plo
1586
+jsparse/libclamav_la-js-norm.lo: jsparse/js-norm.c
1587
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT jsparse/libclamav_la-js-norm.lo -MD -MP -MF jsparse/$(DEPDIR)/libclamav_la-js-norm.Tpo -c -o jsparse/libclamav_la-js-norm.lo `test -f 'jsparse/js-norm.c' || echo '$(srcdir)/'`jsparse/js-norm.c
1588
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jsparse/$(DEPDIR)/libclamav_la-js-norm.Tpo jsparse/$(DEPDIR)/libclamav_la-js-norm.Plo
1589 1589
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1590
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jsparse/js-norm.c' object='libclamav_la-js-norm.lo' libtool=yes @AMDEPBACKSLASH@
1590
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jsparse/js-norm.c' object='jsparse/libclamav_la-js-norm.lo' libtool=yes @AMDEPBACKSLASH@
1591 1591
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1592
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-js-norm.lo `test -f 'jsparse/js-norm.c' || echo '$(srcdir)/'`jsparse/js-norm.c
1592
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o jsparse/libclamav_la-js-norm.lo `test -f 'jsparse/js-norm.c' || echo '$(srcdir)/'`jsparse/js-norm.c
1593 1593
 
1594 1594
 libclamav_la-uniq.lo: uniq.c
1595 1595
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-uniq.lo -MD -MP -MF $(DEPDIR)/libclamav_la-uniq.Tpo -c -o libclamav_la-uniq.lo `test -f 'uniq.c' || echo '$(srcdir)/'`uniq.c
... ...
@@ -1799,45 +2001,45 @@ libclamav_internal_utils_la-qsort.lo: qsort.c
1799 1799
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1800 1800
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-qsort.lo `test -f 'qsort.c' || echo '$(srcdir)/'`qsort.c
1801 1801
 
1802
-libclamav_internal_utils_la-strlcpy.lo: regex/strlcpy.c
1803
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo -c -o libclamav_internal_utils_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1804
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo
1802
+regex/libclamav_internal_utils_la-strlcpy.lo: regex/strlcpy.c
1803
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_la-strlcpy.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo -c -o regex/libclamav_internal_utils_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1804
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo
1805 1805
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1806
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='libclamav_internal_utils_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
1806
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='regex/libclamav_internal_utils_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
1807 1807
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1808
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1808
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1809 1809
 
1810
-libclamav_internal_utils_la-regcomp.lo: regex/regcomp.c
1811
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regcomp.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo -c -o libclamav_internal_utils_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1812
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo $(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo
1810
+regex/libclamav_internal_utils_la-regcomp.lo: regex/regcomp.c
1811
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_la-regcomp.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo -c -o regex/libclamav_internal_utils_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1812
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo
1813 1813
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1814
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='libclamav_internal_utils_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
1814
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='regex/libclamav_internal_utils_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
1815 1815
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1816
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1816
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1817 1817
 
1818
-libclamav_internal_utils_la-regerror.lo: regex/regerror.c
1819
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regerror.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo -c -o libclamav_internal_utils_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1820
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo $(DEPDIR)/libclamav_internal_utils_la-regerror.Plo
1818
+regex/libclamav_internal_utils_la-regerror.lo: regex/regerror.c
1819
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_la-regerror.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo -c -o regex/libclamav_internal_utils_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1820
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo
1821 1821
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1822
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='libclamav_internal_utils_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
1822
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='regex/libclamav_internal_utils_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
1823 1823
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1824
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1824
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1825 1825
 
1826
-libclamav_internal_utils_la-regexec.lo: regex/regexec.c
1827
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regexec.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo -c -o libclamav_internal_utils_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1828
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo $(DEPDIR)/libclamav_internal_utils_la-regexec.Plo
1826
+regex/libclamav_internal_utils_la-regexec.lo: regex/regexec.c
1827
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_la-regexec.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo -c -o regex/libclamav_internal_utils_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1828
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo
1829 1829
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1830
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='libclamav_internal_utils_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
1830
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='regex/libclamav_internal_utils_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
1831 1831
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1832
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1832
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1833 1833
 
1834
-libclamav_internal_utils_la-regfree.lo: regex/regfree.c
1835
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regfree.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo -c -o libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1836
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo $(DEPDIR)/libclamav_internal_utils_la-regfree.Plo
1834
+regex/libclamav_internal_utils_la-regfree.lo: regex/regfree.c
1835
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_la-regfree.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo -c -o regex/libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1836
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo
1837 1837
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1838
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='libclamav_internal_utils_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
1838
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='regex/libclamav_internal_utils_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
1839 1839
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1840
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1840
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1841 1841
 
1842 1842
 libclamav_internal_utils_nothreads_la-str.lo: str.c
1843 1843
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-str.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Tpo -c -o libclamav_internal_utils_nothreads_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c
... ...
@@ -1871,123 +2073,58 @@ libclamav_internal_utils_nothreads_la-qsort.lo: qsort.c
1871 1871
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1872 1872
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-qsort.lo `test -f 'qsort.c' || echo '$(srcdir)/'`qsort.c
1873 1873
 
1874
-libclamav_internal_utils_nothreads_la-strlcpy.lo: regex/strlcpy.c
1875
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo -c -o libclamav_internal_utils_nothreads_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1876
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo
1874
+regex/libclamav_internal_utils_nothreads_la-strlcpy.lo: regex/strlcpy.c
1875
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_nothreads_la-strlcpy.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo -c -o regex/libclamav_internal_utils_nothreads_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1876
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo
1877 1877
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1878
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='libclamav_internal_utils_nothreads_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
1878
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='regex/libclamav_internal_utils_nothreads_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
1879 1879
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1880
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1880
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_nothreads_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
1881 1881
 
1882
-libclamav_internal_utils_nothreads_la-regcomp.lo: regex/regcomp.c
1883
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regcomp.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo -c -o libclamav_internal_utils_nothreads_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1884
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo
1882
+regex/libclamav_internal_utils_nothreads_la-regcomp.lo: regex/regcomp.c
1883
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_nothreads_la-regcomp.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo -c -o regex/libclamav_internal_utils_nothreads_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1884
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo
1885 1885
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1886
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='libclamav_internal_utils_nothreads_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
1886
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='regex/libclamav_internal_utils_nothreads_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
1887 1887
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1888
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1888
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_nothreads_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
1889 1889
 
1890
-libclamav_internal_utils_nothreads_la-regerror.lo: regex/regerror.c
1891
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regerror.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo -c -o libclamav_internal_utils_nothreads_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1892
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo
1890
+regex/libclamav_internal_utils_nothreads_la-regerror.lo: regex/regerror.c
1891
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_nothreads_la-regerror.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo -c -o regex/libclamav_internal_utils_nothreads_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1892
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo
1893 1893
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1894
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='libclamav_internal_utils_nothreads_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
1894
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='regex/libclamav_internal_utils_nothreads_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
1895 1895
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1896
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1896
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_nothreads_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
1897 1897
 
1898
-libclamav_internal_utils_nothreads_la-regexec.lo: regex/regexec.c
1899
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regexec.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo -c -o libclamav_internal_utils_nothreads_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1900
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo
1898
+regex/libclamav_internal_utils_nothreads_la-regexec.lo: regex/regexec.c
1899
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_nothreads_la-regexec.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo -c -o regex/libclamav_internal_utils_nothreads_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1900
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo
1901 1901
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1902
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='libclamav_internal_utils_nothreads_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
1902
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='regex/libclamav_internal_utils_nothreads_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
1903 1903
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1904
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1904
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_nothreads_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
1905 1905
 
1906
-libclamav_internal_utils_nothreads_la-regfree.lo: regex/regfree.c
1907
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regfree.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo -c -o libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1908
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo
1906
+regex/libclamav_internal_utils_nothreads_la-regfree.lo: regex/regfree.c
1907
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT regex/libclamav_internal_utils_nothreads_la-regfree.lo -MD -MP -MF regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo -c -o regex/libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1908
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo
1909 1909
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1910
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='libclamav_internal_utils_nothreads_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
1910
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='regex/libclamav_internal_utils_nothreads_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
1911 1911
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1912
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1913
-
1914
-unrar15.lo: ../libclamunrar/unrar15.c
1915
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar15.lo -MD -MP -MF $(DEPDIR)/unrar15.Tpo -c -o unrar15.lo `test -f '../libclamunrar/unrar15.c' || echo '$(srcdir)/'`../libclamunrar/unrar15.c
1916
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar15.Tpo $(DEPDIR)/unrar15.Plo
1917
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1918
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrar15.c' object='unrar15.lo' libtool=yes @AMDEPBACKSLASH@
1919
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1920
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar15.lo `test -f '../libclamunrar/unrar15.c' || echo '$(srcdir)/'`../libclamunrar/unrar15.c
1921
-
1922
-unrar.lo: ../libclamunrar/unrar.c
1923
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar.lo -MD -MP -MF $(DEPDIR)/unrar.Tpo -c -o unrar.lo `test -f '../libclamunrar/unrar.c' || echo '$(srcdir)/'`../libclamunrar/unrar.c
1924
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar.Tpo $(DEPDIR)/unrar.Plo
1925
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1926
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrar.c' object='unrar.lo' libtool=yes @AMDEPBACKSLASH@
1927
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1928
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar.lo `test -f '../libclamunrar/unrar.c' || echo '$(srcdir)/'`../libclamunrar/unrar.c
1929
-
1930
-unrar20.lo: ../libclamunrar/unrar20.c
1931
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar20.lo -MD -MP -MF $(DEPDIR)/unrar20.Tpo -c -o unrar20.lo `test -f '../libclamunrar/unrar20.c' || echo '$(srcdir)/'`../libclamunrar/unrar20.c
1932
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar20.Tpo $(DEPDIR)/unrar20.Plo
1933
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1934
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrar20.c' object='unrar20.lo' libtool=yes @AMDEPBACKSLASH@
1935
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1936
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar20.lo `test -f '../libclamunrar/unrar20.c' || echo '$(srcdir)/'`../libclamunrar/unrar20.c
1937
-
1938
-unrarppm.lo: ../libclamunrar/unrarppm.c
1939
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarppm.lo -MD -MP -MF $(DEPDIR)/unrarppm.Tpo -c -o unrarppm.lo `test -f '../libclamunrar/unrarppm.c' || echo '$(srcdir)/'`../libclamunrar/unrarppm.c
1940
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarppm.Tpo $(DEPDIR)/unrarppm.Plo
1941
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1942
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarppm.c' object='unrarppm.lo' libtool=yes @AMDEPBACKSLASH@
1943
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1944
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarppm.lo `test -f '../libclamunrar/unrarppm.c' || echo '$(srcdir)/'`../libclamunrar/unrarppm.c
1945
-
1946
-unrarvm.lo: ../libclamunrar/unrarvm.c
1947
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarvm.lo -MD -MP -MF $(DEPDIR)/unrarvm.Tpo -c -o unrarvm.lo `test -f '../libclamunrar/unrarvm.c' || echo '$(srcdir)/'`../libclamunrar/unrarvm.c
1948
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarvm.Tpo $(DEPDIR)/unrarvm.Plo
1949
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1950
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarvm.c' object='unrarvm.lo' libtool=yes @AMDEPBACKSLASH@
1951
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1952
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarvm.lo `test -f '../libclamunrar/unrarvm.c' || echo '$(srcdir)/'`../libclamunrar/unrarvm.c
1953
-
1954
-unrarcmd.lo: ../libclamunrar/unrarcmd.c
1955
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarcmd.lo -MD -MP -MF $(DEPDIR)/unrarcmd.Tpo -c -o unrarcmd.lo `test -f '../libclamunrar/unrarcmd.c' || echo '$(srcdir)/'`../libclamunrar/unrarcmd.c
1956
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarcmd.Tpo $(DEPDIR)/unrarcmd.Plo
1957
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1958
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarcmd.c' object='unrarcmd.lo' libtool=yes @AMDEPBACKSLASH@
1959
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1960
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarcmd.lo `test -f '../libclamunrar/unrarcmd.c' || echo '$(srcdir)/'`../libclamunrar/unrarcmd.c
1961
-
1962
-unrarfilter.lo: ../libclamunrar/unrarfilter.c
1963
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarfilter.lo -MD -MP -MF $(DEPDIR)/unrarfilter.Tpo -c -o unrarfilter.lo `test -f '../libclamunrar/unrarfilter.c' || echo '$(srcdir)/'`../libclamunrar/unrarfilter.c
1964
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarfilter.Tpo $(DEPDIR)/unrarfilter.Plo
1965
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1966
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarfilter.c' object='unrarfilter.lo' libtool=yes @AMDEPBACKSLASH@
1967
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1968
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarfilter.lo `test -f '../libclamunrar/unrarfilter.c' || echo '$(srcdir)/'`../libclamunrar/unrarfilter.c
1969
-
1970
-unrarhlp.lo: ../libclamunrar/unrarhlp.c
1971
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarhlp.lo -MD -MP -MF $(DEPDIR)/unrarhlp.Tpo -c -o unrarhlp.lo `test -f '../libclamunrar/unrarhlp.c' || echo '$(srcdir)/'`../libclamunrar/unrarhlp.c
1972
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarhlp.Tpo $(DEPDIR)/unrarhlp.Plo
1973
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1974
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarhlp.c' object='unrarhlp.lo' libtool=yes @AMDEPBACKSLASH@
1975
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1976
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarhlp.lo `test -f '../libclamunrar/unrarhlp.c' || echo '$(srcdir)/'`../libclamunrar/unrarhlp.c
1977
-
1978
-unrar_iface.lo: ../libclamunrar_iface/unrar_iface.c
1979
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar_iface.lo -MD -MP -MF $(DEPDIR)/unrar_iface.Tpo -c -o unrar_iface.lo `test -f '../libclamunrar_iface/unrar_iface.c' || echo '$(srcdir)/'`../libclamunrar_iface/unrar_iface.c
1980
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar_iface.Tpo $(DEPDIR)/unrar_iface.Plo
1981
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1982
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar_iface/unrar_iface.c' object='unrar_iface.lo' libtool=yes @AMDEPBACKSLASH@
1983
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1984
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar_iface.lo `test -f '../libclamunrar_iface/unrar_iface.c' || echo '$(srcdir)/'`../libclamunrar_iface/unrar_iface.c
1912
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o regex/libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
1985 1913
 
1986 1914
 mostlyclean-libtool:
1987 1915
 	-rm -f *.lo
1988 1916
 
1989 1917
 clean-libtool:
1990 1918
 	-rm -rf .libs _libs
1919
+	-rm -rf ../libclamunrar/.libs ../libclamunrar/_libs
1920
+	-rm -rf ../libclamunrar_iface/.libs ../libclamunrar_iface/_libs
1921
+	-rm -rf 7z/.libs 7z/_libs
1922
+	-rm -rf 7z/Archive/7z/.libs 7z/Archive/7z/_libs
1923
+	-rm -rf jsparse/.libs jsparse/_libs
1924
+	-rm -rf nsis/.libs nsis/_libs
1925
+	-rm -rf regex/.libs regex/_libs
1991 1926
 install-includeHEADERS: $(include_HEADERS)
1992 1927
 	@$(NORMAL_INSTALL)
1993 1928
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
... ...
@@ -2234,6 +2371,20 @@ clean-generic:
2234 2234
 distclean-generic:
2235 2235
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2236 2236
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2237
+	-rm -f ../libclamunrar/$(DEPDIR)/$(am__dirstamp)
2238
+	-rm -f ../libclamunrar/$(am__dirstamp)
2239
+	-rm -f ../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp)
2240
+	-rm -f ../libclamunrar_iface/$(am__dirstamp)
2241
+	-rm -f 7z/$(DEPDIR)/$(am__dirstamp)
2242
+	-rm -f 7z/$(am__dirstamp)
2243
+	-rm -f 7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
2244
+	-rm -f 7z/Archive/7z/$(am__dirstamp)
2245
+	-rm -f jsparse/$(DEPDIR)/$(am__dirstamp)
2246
+	-rm -f jsparse/$(am__dirstamp)
2247
+	-rm -f nsis/$(DEPDIR)/$(am__dirstamp)
2248
+	-rm -f nsis/$(am__dirstamp)
2249
+	-rm -f regex/$(DEPDIR)/$(am__dirstamp)
2250
+	-rm -f regex/$(am__dirstamp)
2237 2251
 
2238 2252
 maintainer-clean-generic:
2239 2253
 	@echo "This command is intended for maintainers to use"
... ...
@@ -2245,7 +2396,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
2245 2245
 	clean-noinstLTLIBRARIES mostlyclean-am
2246 2246
 
2247 2247
 distclean: distclean-recursive
2248
-	-rm -rf ./$(DEPDIR)
2248
+	-rm -rf ../libclamunrar/$(DEPDIR) ../libclamunrar_iface/$(DEPDIR) ./$(DEPDIR) 7z/$(DEPDIR) 7z/Archive/7z/$(DEPDIR) jsparse/$(DEPDIR) nsis/$(DEPDIR) regex/$(DEPDIR)
2249 2249
 	-rm -f Makefile
2250 2250
 distclean-am: clean-am distclean-compile distclean-generic \
2251 2251
 	distclean-tags
... ...
@@ -2291,7 +2442,7 @@ install-ps-am:
2291 2291
 installcheck-am:
2292 2292
 
2293 2293
 maintainer-clean: maintainer-clean-recursive
2294
-	-rm -rf ./$(DEPDIR)
2294
+	-rm -rf ../libclamunrar/$(DEPDIR) ../libclamunrar_iface/$(DEPDIR) ./$(DEPDIR) 7z/$(DEPDIR) 7z/Archive/7z/$(DEPDIR) jsparse/$(DEPDIR) nsis/$(DEPDIR) regex/$(DEPDIR)
2295 2295
 	-rm -f Makefile
2296 2296
 maintainer-clean-am: distclean-am maintainer-clean-generic
2297 2297
 
... ...
@@ -88,7 +88,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
88 88
 	"$(DESTDIR)$(ltdlincludedir)"
89 89
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
90 90
 dld_link_la_DEPENDENCIES =
91
-am_dld_link_la_OBJECTS = dld_link.lo
91
+am__dirstamp = $(am__leading_dot)dirstamp
92
+am_dld_link_la_OBJECTS = loaders/dld_link.lo
92 93
 dld_link_la_OBJECTS = $(am_dld_link_la_OBJECTS)
93 94
 AM_V_lt = $(am__v_lt_$(V))
94 95
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
... ...
@@ -98,29 +99,30 @@ dld_link_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
98 98
 	$(dld_link_la_LDFLAGS) $(LDFLAGS) -o $@
99 99
 am__DEPENDENCIES_1 =
100 100
 dlopen_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
101
-am_dlopen_la_OBJECTS = dlopen.lo
101
+am_dlopen_la_OBJECTS = loaders/dlopen.lo
102 102
 dlopen_la_OBJECTS = $(am_dlopen_la_OBJECTS)
103 103
 dlopen_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
104 104
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
105 105
 	$(dlopen_la_LDFLAGS) $(LDFLAGS) -o $@
106 106
 dyld_la_LIBADD =
107
-am_dyld_la_OBJECTS = dyld.lo
107
+am_dyld_la_OBJECTS = loaders/dyld.lo
108 108
 dyld_la_OBJECTS = $(am_dyld_la_OBJECTS)
109 109
 dyld_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
110 110
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
111 111
 	$(dyld_la_LDFLAGS) $(LDFLAGS) -o $@
112
-am_libltdl_la_OBJECTS = libltdl_la-preopen.lo libltdl_la-lt__alloc.lo \
113
-	libltdl_la-lt_dlloader.lo libltdl_la-lt_error.lo \
114
-	libltdl_la-ltdl.lo libltdl_la-slist.lo
112
+am_libltdl_la_OBJECTS = loaders/libltdl_la-preopen.lo \
113
+	libltdl_la-lt__alloc.lo libltdl_la-lt_dlloader.lo \
114
+	libltdl_la-lt_error.lo libltdl_la-ltdl.lo libltdl_la-slist.lo
115 115
 libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS)
116 116
 libltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
117 117
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
118 118
 	$(libltdl_la_LDFLAGS) $(LDFLAGS) -o $@
119 119
 @INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir)
120 120
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
121
-am__objects_1 = libltdlc_la-preopen.lo libltdlc_la-lt__alloc.lo \
122
-	libltdlc_la-lt_dlloader.lo libltdlc_la-lt_error.lo \
123
-	libltdlc_la-ltdl.lo libltdlc_la-slist.lo
121
+am__objects_1 = loaders/libltdlc_la-preopen.lo \
122
+	libltdlc_la-lt__alloc.lo libltdlc_la-lt_dlloader.lo \
123
+	libltdlc_la-lt_error.lo libltdlc_la-ltdl.lo \
124
+	libltdlc_la-slist.lo
124 125
 am_libltdlc_la_OBJECTS = $(am__objects_1)
125 126
 libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS)
126 127
 libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
... ...
@@ -128,21 +130,21 @@ libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
128 128
 	$(libltdlc_la_LDFLAGS) $(LDFLAGS) -o $@
129 129
 @CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath =
130 130
 load_add_on_la_LIBADD =
131
-am_load_add_on_la_OBJECTS = load_add_on.lo
131
+am_load_add_on_la_OBJECTS = loaders/load_add_on.lo
132 132
 load_add_on_la_OBJECTS = $(am_load_add_on_la_OBJECTS)
133 133
 load_add_on_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
134 134
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
135 135
 	$(AM_CFLAGS) $(CFLAGS) $(load_add_on_la_LDFLAGS) $(LDFLAGS) -o \
136 136
 	$@
137 137
 loadlibrary_la_LIBADD =
138
-am_loadlibrary_la_OBJECTS = loadlibrary.lo
138
+am_loadlibrary_la_OBJECTS = loaders/loadlibrary.lo
139 139
 loadlibrary_la_OBJECTS = $(am_loadlibrary_la_OBJECTS)
140 140
 loadlibrary_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
141 141
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
142 142
 	$(AM_CFLAGS) $(CFLAGS) $(loadlibrary_la_LDFLAGS) $(LDFLAGS) -o \
143 143
 	$@
144 144
 shl_load_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
145
-am_shl_load_la_OBJECTS = shl_load.lo
145
+am_shl_load_la_OBJECTS = loaders/shl_load.lo
146 146
 shl_load_la_OBJECTS = $(am_shl_load_la_OBJECTS)
147 147
 shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
148 148
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
... ...
@@ -491,103 +493,120 @@ clean-noinstLTLIBRARIES:
491 491
 	  echo "rm -f \"$${dir}/so_locations\""; \
492 492
 	  rm -f "$${dir}/so_locations"; \
493 493
 	done
494
+loaders/$(am__dirstamp):
495
+	@$(MKDIR_P) loaders
496
+	@: > loaders/$(am__dirstamp)
497
+loaders/$(DEPDIR)/$(am__dirstamp):
498
+	@$(MKDIR_P) loaders/$(DEPDIR)
499
+	@: > loaders/$(DEPDIR)/$(am__dirstamp)
500
+loaders/dld_link.lo: loaders/$(am__dirstamp) \
501
+	loaders/$(DEPDIR)/$(am__dirstamp)
494 502
 dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) 
495 503
 	$(AM_V_CCLD)$(dld_link_la_LINK)  $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS)
504
+loaders/dlopen.lo: loaders/$(am__dirstamp) \
505
+	loaders/$(DEPDIR)/$(am__dirstamp)
496 506
 dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) 
497 507
 	$(AM_V_CCLD)$(dlopen_la_LINK)  $(dlopen_la_OBJECTS) $(dlopen_la_LIBADD) $(LIBS)
508
+loaders/dyld.lo: loaders/$(am__dirstamp) \
509
+	loaders/$(DEPDIR)/$(am__dirstamp)
498 510
 dyld.la: $(dyld_la_OBJECTS) $(dyld_la_DEPENDENCIES) 
499 511
 	$(AM_V_CCLD)$(dyld_la_LINK)  $(dyld_la_OBJECTS) $(dyld_la_LIBADD) $(LIBS)
512
+loaders/libltdl_la-preopen.lo: loaders/$(am__dirstamp) \
513
+	loaders/$(DEPDIR)/$(am__dirstamp)
500 514
 libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) 
501 515
 	$(AM_V_CCLD)$(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
516
+loaders/libltdlc_la-preopen.lo: loaders/$(am__dirstamp) \
517
+	loaders/$(DEPDIR)/$(am__dirstamp)
502 518
 libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) 
503 519
 	$(AM_V_CCLD)$(libltdlc_la_LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
520
+loaders/load_add_on.lo: loaders/$(am__dirstamp) \
521
+	loaders/$(DEPDIR)/$(am__dirstamp)
504 522
 load_add_on.la: $(load_add_on_la_OBJECTS) $(load_add_on_la_DEPENDENCIES) 
505 523
 	$(AM_V_CCLD)$(load_add_on_la_LINK)  $(load_add_on_la_OBJECTS) $(load_add_on_la_LIBADD) $(LIBS)
524
+loaders/loadlibrary.lo: loaders/$(am__dirstamp) \
525
+	loaders/$(DEPDIR)/$(am__dirstamp)
506 526
 loadlibrary.la: $(loadlibrary_la_OBJECTS) $(loadlibrary_la_DEPENDENCIES) 
507 527
 	$(AM_V_CCLD)$(loadlibrary_la_LINK)  $(loadlibrary_la_OBJECTS) $(loadlibrary_la_LIBADD) $(LIBS)
528
+loaders/shl_load.lo: loaders/$(am__dirstamp) \
529
+	loaders/$(DEPDIR)/$(am__dirstamp)
508 530
 shl_load.la: $(shl_load_la_OBJECTS) $(shl_load_la_DEPENDENCIES) 
509 531
 	$(AM_V_CCLD)$(shl_load_la_LINK)  $(shl_load_la_OBJECTS) $(shl_load_la_LIBADD) $(LIBS)
510 532
 
511 533
 mostlyclean-compile:
512 534
 	-rm -f *.$(OBJEXT)
535
+	-rm -f loaders/dld_link.$(OBJEXT)
536
+	-rm -f loaders/dld_link.lo
537
+	-rm -f loaders/dlopen.$(OBJEXT)
538
+	-rm -f loaders/dlopen.lo
539
+	-rm -f loaders/dyld.$(OBJEXT)
540
+	-rm -f loaders/dyld.lo
541
+	-rm -f loaders/libltdl_la-preopen.$(OBJEXT)
542
+	-rm -f loaders/libltdl_la-preopen.lo
543
+	-rm -f loaders/libltdlc_la-preopen.$(OBJEXT)
544
+	-rm -f loaders/libltdlc_la-preopen.lo
545
+	-rm -f loaders/load_add_on.$(OBJEXT)
546
+	-rm -f loaders/load_add_on.lo
547
+	-rm -f loaders/loadlibrary.$(OBJEXT)
548
+	-rm -f loaders/loadlibrary.lo
549
+	-rm -f loaders/shl_load.$(OBJEXT)
550
+	-rm -f loaders/shl_load.lo
513 551
 
514 552
 distclean-compile:
515 553
 	-rm -f *.tab.c
516 554
 
517
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dld_link.Plo@am__quote@
518
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlopen.Plo@am__quote@
519
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dyld.Plo@am__quote@
520 555
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-lt__alloc.Plo@am__quote@
521 556
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-lt_dlloader.Plo@am__quote@
522 557
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-lt_error.Plo@am__quote@
523 558
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-ltdl.Plo@am__quote@
524
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-preopen.Plo@am__quote@
525 559
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-slist.Plo@am__quote@
526 560
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-lt__alloc.Plo@am__quote@
527 561
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-lt_dlloader.Plo@am__quote@
528 562
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-lt_error.Plo@am__quote@
529 563
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-ltdl.Plo@am__quote@
530
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-preopen.Plo@am__quote@
531 564
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-slist.Plo@am__quote@
532
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_add_on.Plo@am__quote@
533
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadlibrary.Plo@am__quote@
534
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shl_load.Plo@am__quote@
565
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/dld_link.Plo@am__quote@
566
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/dlopen.Plo@am__quote@
567
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/dyld.Plo@am__quote@
568
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/libltdl_la-preopen.Plo@am__quote@
569
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/libltdlc_la-preopen.Plo@am__quote@
570
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/load_add_on.Plo@am__quote@
571
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/loadlibrary.Plo@am__quote@
572
+@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/shl_load.Plo@am__quote@
535 573
 
536 574
 .c.o:
537
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
538
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
575
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
576
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
577
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
539 578
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
540 579
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
541 580
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
542
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
581
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
543 582
 
544 583
 .c.obj:
545
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
546
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
584
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
585
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
586
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
547 587
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
548 588
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
549 589
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
550
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
590
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
551 591
 
552 592
 .c.lo:
553
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
554
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
593
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
594
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
595
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
555 596
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
556 597
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
557 598
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
558 599
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
559 600
 
560
-dld_link.lo: loaders/dld_link.c
561
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dld_link.lo -MD -MP -MF $(DEPDIR)/dld_link.Tpo -c -o dld_link.lo `test -f 'loaders/dld_link.c' || echo '$(srcdir)/'`loaders/dld_link.c
562
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dld_link.Tpo $(DEPDIR)/dld_link.Plo
601
+loaders/libltdl_la-preopen.lo: loaders/preopen.c
602
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loaders/libltdl_la-preopen.lo -MD -MP -MF loaders/$(DEPDIR)/libltdl_la-preopen.Tpo -c -o loaders/libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
603
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) loaders/$(DEPDIR)/libltdl_la-preopen.Tpo loaders/$(DEPDIR)/libltdl_la-preopen.Plo
563 604
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
564
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/dld_link.c' object='dld_link.lo' libtool=yes @AMDEPBACKSLASH@
605
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='loaders/libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
565 606
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
566
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dld_link.lo `test -f 'loaders/dld_link.c' || echo '$(srcdir)/'`loaders/dld_link.c
567
-
568
-dlopen.lo: loaders/dlopen.c
569
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dlopen.lo -MD -MP -MF $(DEPDIR)/dlopen.Tpo -c -o dlopen.lo `test -f 'loaders/dlopen.c' || echo '$(srcdir)/'`loaders/dlopen.c
570
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dlopen.Tpo $(DEPDIR)/dlopen.Plo
571
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
572
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/dlopen.c' object='dlopen.lo' libtool=yes @AMDEPBACKSLASH@
573
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
574
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dlopen.lo `test -f 'loaders/dlopen.c' || echo '$(srcdir)/'`loaders/dlopen.c
575
-
576
-dyld.lo: loaders/dyld.c
577
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dyld.lo -MD -MP -MF $(DEPDIR)/dyld.Tpo -c -o dyld.lo `test -f 'loaders/dyld.c' || echo '$(srcdir)/'`loaders/dyld.c
578
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dyld.Tpo $(DEPDIR)/dyld.Plo
579
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
580
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/dyld.c' object='dyld.lo' libtool=yes @AMDEPBACKSLASH@
581
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
582
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dyld.lo `test -f 'loaders/dyld.c' || echo '$(srcdir)/'`loaders/dyld.c
583
-
584
-libltdl_la-preopen.lo: loaders/preopen.c
585
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-preopen.lo -MD -MP -MF $(DEPDIR)/libltdl_la-preopen.Tpo -c -o libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
586
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-preopen.Tpo $(DEPDIR)/libltdl_la-preopen.Plo
587
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
588
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
589
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
590
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
607
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loaders/libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
591 608
 
592 609
 libltdl_la-lt__alloc.lo: lt__alloc.c
593 610
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt__alloc.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt__alloc.Tpo -c -o libltdl_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c
... ...
@@ -629,13 +648,13 @@ libltdl_la-slist.lo: slist.c
629 629
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
630 630
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c
631 631
 
632
-libltdlc_la-preopen.lo: loaders/preopen.c
633
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-preopen.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-preopen.Tpo -c -o libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
634
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-preopen.Tpo $(DEPDIR)/libltdlc_la-preopen.Plo
632
+loaders/libltdlc_la-preopen.lo: loaders/preopen.c
633
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loaders/libltdlc_la-preopen.lo -MD -MP -MF loaders/$(DEPDIR)/libltdlc_la-preopen.Tpo -c -o loaders/libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
634
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) loaders/$(DEPDIR)/libltdlc_la-preopen.Tpo loaders/$(DEPDIR)/libltdlc_la-preopen.Plo
635 635
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
636
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='libltdlc_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
636
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='loaders/libltdlc_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
637 637
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
638
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
638
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loaders/libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c
639 639
 
640 640
 libltdlc_la-lt__alloc.lo: lt__alloc.c
641 641
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt__alloc.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt__alloc.Tpo -c -o libltdlc_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c
... ...
@@ -677,35 +696,12 @@ libltdlc_la-slist.lo: slist.c
677 677
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
678 678
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c
679 679
 
680
-load_add_on.lo: loaders/load_add_on.c
681
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load_add_on.lo -MD -MP -MF $(DEPDIR)/load_add_on.Tpo -c -o load_add_on.lo `test -f 'loaders/load_add_on.c' || echo '$(srcdir)/'`loaders/load_add_on.c
682
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/load_add_on.Tpo $(DEPDIR)/load_add_on.Plo
683
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
684
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/load_add_on.c' object='load_add_on.lo' libtool=yes @AMDEPBACKSLASH@
685
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
686
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load_add_on.lo `test -f 'loaders/load_add_on.c' || echo '$(srcdir)/'`loaders/load_add_on.c
687
-
688
-loadlibrary.lo: loaders/loadlibrary.c
689
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadlibrary.lo -MD -MP -MF $(DEPDIR)/loadlibrary.Tpo -c -o loadlibrary.lo `test -f 'loaders/loadlibrary.c' || echo '$(srcdir)/'`loaders/loadlibrary.c
690
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadlibrary.Tpo $(DEPDIR)/loadlibrary.Plo
691
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
692
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/loadlibrary.c' object='loadlibrary.lo' libtool=yes @AMDEPBACKSLASH@
693
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
694
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadlibrary.lo `test -f 'loaders/loadlibrary.c' || echo '$(srcdir)/'`loaders/loadlibrary.c
695
-
696
-shl_load.lo: loaders/shl_load.c
697
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shl_load.lo -MD -MP -MF $(DEPDIR)/shl_load.Tpo -c -o shl_load.lo `test -f 'loaders/shl_load.c' || echo '$(srcdir)/'`loaders/shl_load.c
698
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shl_load.Tpo $(DEPDIR)/shl_load.Plo
699
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
700
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/shl_load.c' object='shl_load.lo' libtool=yes @AMDEPBACKSLASH@
701
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
702
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shl_load.lo `test -f 'loaders/shl_load.c' || echo '$(srcdir)/'`loaders/shl_load.c
703
-
704 680
 mostlyclean-libtool:
705 681
 	-rm -f *.lo
706 682
 
707 683
 clean-libtool:
708 684
 	-rm -rf .libs _libs
685
+	-rm -rf loaders/.libs loaders/_libs
709 686
 install-includeHEADERS: $(include_HEADERS)
710 687
 	@$(NORMAL_INSTALL)
711 688
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
... ...
@@ -861,6 +857,8 @@ clean-generic:
861 861
 distclean-generic:
862 862
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
863 863
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
864
+	-rm -f loaders/$(DEPDIR)/$(am__dirstamp)
865
+	-rm -f loaders/$(am__dirstamp)
864 866
 
865 867
 maintainer-clean-generic:
866 868
 	@echo "This command is intended for maintainers to use"
... ...
@@ -872,7 +870,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
872 872
 	clean-noinstLTLIBRARIES mostlyclean-am
873 873
 
874 874
 distclean: distclean-am
875
-	-rm -rf ./$(DEPDIR)
875
+	-rm -rf ./$(DEPDIR) loaders/$(DEPDIR)
876 876
 	-rm -f Makefile
877 877
 distclean-am: clean-am distclean-compile distclean-generic \
878 878
 	distclean-tags
... ...
@@ -918,7 +916,7 @@ install-ps-am:
918 918
 installcheck-am:
919 919
 
920 920
 maintainer-clean: maintainer-clean-am
921
-	-rm -rf ./$(DEPDIR)
921
+	-rm -rf ./$(DEPDIR) loaders/$(DEPDIR)
922 922
 	-rm -f Makefile
923 923
 maintainer-clean-am: distclean-am maintainer-clean-generic
924 924
 
... ...
@@ -61,126 +61,6 @@ const char *get_version(void)
61 61
 	/* it is a release, or we have nothing better */
62 62
 	return VERSION""VERSION_SUFFIX;
63 63
 }
64
-/* CL_NOLIBCLAMAV means to omit functions that depends on libclamav */
65
-#ifndef CL_NOLIBCLAMAV
66
-char *freshdbdir(void)
67
-{
68
-	struct cl_cvd *d1, *d2;
69
-	struct optstruct *opts;
70
-	const struct optstruct *opt;
71
-	const char *dbdir;
72
-	char *retdir;
73
-
74
-
75
-    /* try to find the most up-to-date db directory */
76
-    dbdir = cl_retdbdir();
77
-    if((opts = optparse(CONFDIR_FRESHCLAM, 0, NULL, 0, OPT_FRESHCLAM, 0, NULL))) {
78
-	if((opt = optget(opts, "DatabaseDirectory"))->enabled) {
79
-	    if(strcmp(dbdir, opt->strarg)) {
80
-		    char *daily = (char *) malloc(strlen(opt->strarg) + strlen(dbdir) + 30);
81
-		sprintf(daily, "%s"PATHSEP"daily.cvd", opt->strarg);
82
-		if(access(daily, R_OK))
83
-		    sprintf(daily, "%s"PATHSEP"daily.cld", opt->strarg);
84
-
85
-		if(!access(daily, R_OK) && (d1 = cl_cvdhead(daily))) {
86
-		    sprintf(daily, "%s"PATHSEP"daily.cvd", dbdir);
87
-		    if(access(daily, R_OK))
88
-			sprintf(daily, "%s"PATHSEP"daily.cld", dbdir);
89
-
90
-		    if(!access(daily, R_OK) && (d2 = cl_cvdhead(daily))) {
91
-			free(daily);
92
-			if(d1->version > d2->version)
93
-			    dbdir = opt->strarg;
94
-			cl_cvdfree(d2);
95
-		    } else {
96
-			free(daily);
97
-			dbdir = opt->strarg;
98
-		    }
99
-		    cl_cvdfree(d1);
100
-		} else {
101
-		    free(daily);
102
-		}
103
-	    }
104
-	}
105
-    }
106
-
107
-    retdir = strdup(dbdir);
108
-
109
-    if(opts)
110
-	optfree(opts);
111
-
112
-    return retdir;
113
-}
114
-
115
-void print_version(const char *dbdir)
116
-{
117
-	char *fdbdir = NULL, *path;
118
-	const char *pt;
119
-	struct cl_cvd *daily;
120
-	time_t db_time;
121
-	unsigned int db_version = 0;
122
-
123
-
124
-    if(dbdir)
125
-	pt = dbdir;
126
-    else
127
-	pt = fdbdir = freshdbdir();
128
-
129
-    if(!pt) {
130
-	printf("ClamAV %s\n",get_version());
131
-	return;
132
-    }
133
-
134
-    if(!(path = malloc(strlen(pt) + 11))) {
135
-	if(!dbdir)
136
-	    free(fdbdir);
137
-	return;
138
-    }
139
-
140
-    sprintf(path, "%s"PATHSEP"daily.cvd", pt);
141
-    if(!access(path, R_OK)) {
142
-	daily = cl_cvdhead(path);
143
-	if(daily) {
144
-	    db_version = daily->version;
145
-	    db_time = daily->stime;
146
-	    cl_cvdfree(daily);
147
-	}
148
-    }
149
-
150
-    sprintf(path, "%s"PATHSEP"daily.cld", pt);
151
-    if(!access(path, R_OK)) {
152
-	daily = cl_cvdhead(path);
153
-	if(daily) {
154
-	    if(daily->version > db_version) {
155
-		db_version = daily->version;
156
-		db_time = daily->stime;
157
-	    }
158
-	    cl_cvdfree(daily);
159
-	}
160
-    }
161
-
162
-    if(!dbdir)
163
-	free(fdbdir);
164
-
165
-    if(db_version) {
166
-	printf("ClamAV %s/%u/%s", get_version(), db_version, ctime(&db_time));
167
-    } else {
168
-	printf("ClamAV %s\n",get_version());
169
-    }
170
-
171
-    free(path);
172
-}
173
-
174
-int check_flevel(void)
175
-{
176
-    if(cl_retflevel() < CL_FLEVEL) {
177
-	fprintf(stderr, "ERROR: This tool requires libclamav with functionality level %u or higher (current f-level: %u)\n", CL_FLEVEL, cl_retflevel());
178
-	return 1;
179
-    }
180
-    return 0;
181
-}
182
-#endif
183
-
184 64
 const char *filelist(const struct optstruct *opts, int *err)
185 65
 {
186 66
 	static char buff[1025];
187 67
new file mode 100644
... ...
@@ -0,0 +1,159 @@
0
+/*
1
+ *  Copyright (C) 2007-2009 Sourcefire, Inc.
2
+ *
3
+ *  Authors: Tomasz Kojm
4
+ *
5
+ *  This program is free software; you can redistribute it and/or modify
6
+ *  it under the terms of the GNU General Public License version 2 as
7
+ *  published by the Free Software Foundation.
8
+ *
9
+ *  This program is distributed in the hope that it will be useful,
10
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
+ *  GNU General Public License for more details.
13
+ *
14
+ *  You should have received a copy of the GNU General Public License
15
+ *  along with this program; if not, write to the Free Software
16
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17
+ *  MA 02110-1301, USA.
18
+ */
19
+#if HAVE_CONFIG_H
20
+#include "clamav-config.h"
21
+#endif
22
+#include <clamav.h>
23
+#include <stdio.h>
24
+#include <stdlib.h>
25
+#ifdef	HAVE_UNISTD_H
26
+#include <unistd.h>
27
+#endif
28
+#include <string.h>
29
+#include <time.h>
30
+#include <sys/types.h>
31
+#include <sys/stat.h>
32
+#ifndef _WIN32
33
+#include <sys/socket.h>
34
+#endif
35
+#include <dirent.h>
36
+#include <fcntl.h>
37
+#include <ctype.h>
38
+#include <errno.h>
39
+#include "shared/optparser.h"
40
+#include "libclamav/others.h" /* for cli_rmdirs() */
41
+
42
+/* CL_NOLIBCLAMAV means to omit functions that depends on libclamav */
43
+char *freshdbdir(void)
44
+{
45
+	struct cl_cvd *d1, *d2;
46
+	struct optstruct *opts;
47
+	const struct optstruct *opt;
48
+	const char *dbdir;
49
+	char *retdir;
50
+
51
+
52
+    /* try to find the most up-to-date db directory */
53
+    dbdir = cl_retdbdir();
54
+    if((opts = optparse(CONFDIR_FRESHCLAM, 0, NULL, 0, OPT_FRESHCLAM, 0, NULL))) {
55
+	if((opt = optget(opts, "DatabaseDirectory"))->enabled) {
56
+	    if(strcmp(dbdir, opt->strarg)) {
57
+		    char *daily = (char *) malloc(strlen(opt->strarg) + strlen(dbdir) + 30);
58
+		sprintf(daily, "%s"PATHSEP"daily.cvd", opt->strarg);
59
+		if(access(daily, R_OK))
60
+		    sprintf(daily, "%s"PATHSEP"daily.cld", opt->strarg);
61
+
62
+		if(!access(daily, R_OK) && (d1 = cl_cvdhead(daily))) {
63
+		    sprintf(daily, "%s"PATHSEP"daily.cvd", dbdir);
64
+		    if(access(daily, R_OK))
65
+			sprintf(daily, "%s"PATHSEP"daily.cld", dbdir);
66
+
67
+		    if(!access(daily, R_OK) && (d2 = cl_cvdhead(daily))) {
68
+			free(daily);
69
+			if(d1->version > d2->version)
70
+			    dbdir = opt->strarg;
71
+			cl_cvdfree(d2);
72
+		    } else {
73
+			free(daily);
74
+			dbdir = opt->strarg;
75
+		    }
76
+		    cl_cvdfree(d1);
77
+		} else {
78
+		    free(daily);
79
+		}
80
+	    }
81
+	}
82
+    }
83
+
84
+    retdir = strdup(dbdir);
85
+
86
+    if(opts)
87
+	optfree(opts);
88
+
89
+    return retdir;
90
+}
91
+
92
+void print_version(const char *dbdir)
93
+{
94
+	char *fdbdir = NULL, *path;
95
+	const char *pt;
96
+	struct cl_cvd *daily;
97
+	time_t db_time;
98
+	unsigned int db_version = 0;
99
+
100
+
101
+    if(dbdir)
102
+	pt = dbdir;
103
+    else
104
+	pt = fdbdir = freshdbdir();
105
+
106
+    if(!pt) {
107
+	printf("ClamAV %s\n",get_version());
108
+	return;
109
+    }
110
+
111
+    if(!(path = malloc(strlen(pt) + 11))) {
112
+	if(!dbdir)
113
+	    free(fdbdir);
114
+	return;
115
+    }
116
+
117
+    sprintf(path, "%s"PATHSEP"daily.cvd", pt);
118
+    if(!access(path, R_OK)) {
119
+	daily = cl_cvdhead(path);
120
+	if(daily) {
121
+	    db_version = daily->version;
122
+	    db_time = daily->stime;
123
+	    cl_cvdfree(daily);
124
+	}
125
+    }
126
+
127
+    sprintf(path, "%s"PATHSEP"daily.cld", pt);
128
+    if(!access(path, R_OK)) {
129
+	daily = cl_cvdhead(path);
130
+	if(daily) {
131
+	    if(daily->version > db_version) {
132
+		db_version = daily->version;
133
+		db_time = daily->stime;
134
+	    }
135
+	    cl_cvdfree(daily);
136
+	}
137
+    }
138
+
139
+    if(!dbdir)
140
+	free(fdbdir);
141
+
142
+    if(db_version) {
143
+	printf("ClamAV %s/%u/%s", get_version(), db_version, ctime(&db_time));
144
+    } else {
145
+	printf("ClamAV %s\n",get_version());
146
+    }
147
+
148
+    free(path);
149
+}
150
+
151
+int check_flevel(void)
152
+{
153
+    if(cl_retflevel() < CL_FLEVEL) {
154
+	fprintf(stderr, "ERROR: This tool requires libclamav with functionality level %u or higher (current f-level: %u)\n", CL_FLEVEL, cl_retflevel());
155
+	return 1;
156
+    }
157
+    return 0;
158
+}
... ...
@@ -19,18 +19,6 @@
19 19
 bin_PROGRAMS = sigtool
20 20
 
21 21
 sigtool_SOURCES = \
22
-    $(top_srcdir)/shared/output.c \
23
-    $(top_srcdir)/shared/output.h \
24
-    $(top_srcdir)/shared/getopt.c \
25
-    $(top_srcdir)/shared/getopt.h \
26
-    $(top_srcdir)/shared/optparser.c \
27
-    $(top_srcdir)/shared/optparser.h \
28
-    $(top_srcdir)/shared/misc.c \
29
-    $(top_srcdir)/shared/misc.h \
30
-    $(top_srcdir)/shared/cdiff.c \
31
-    $(top_srcdir)/shared/cdiff.h \
32
-    $(top_srcdir)/shared/tar.c \
33
-    $(top_srcdir)/shared/tar.h \
34 22
     vba.c \
35 23
     vba.h \
36 24
     sigtool.c
... ...
@@ -38,5 +26,5 @@ sigtool_SOURCES = \
38 38
 AM_CFLAGS=@WERR_CFLAGS@
39 39
 DEFS = @DEFS@ -DCL_NOTHREADS
40 40
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
41
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
41
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
42 42
 CLEANFILES=*.gcda *.gcno
... ...
@@ -76,9 +76,7 @@ CONFIG_CLEAN_FILES =
76 76
 CONFIG_CLEAN_VPATH_FILES =
77 77
 am__installdirs = "$(DESTDIR)$(bindir)"
78 78
 PROGRAMS = $(bin_PROGRAMS)
79
-am_sigtool_OBJECTS = output.$(OBJEXT) getopt.$(OBJEXT) \
80
-	optparser.$(OBJEXT) misc.$(OBJEXT) cdiff.$(OBJEXT) \
81
-	tar.$(OBJEXT) vba.$(OBJEXT) sigtool.$(OBJEXT)
79
+am_sigtool_OBJECTS = vba.$(OBJEXT) sigtool.$(OBJEXT)
82 80
 sigtool_OBJECTS = $(am_sigtool_OBJECTS)
83 81
 sigtool_LDADD = $(LDADD)
84 82
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -178,7 +176,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
178 178
 LIBLTDL = @LIBLTDL@
179 179
 LIBM = @LIBM@
180 180
 LIBOBJS = @LIBOBJS@
181
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
181
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
182 182
 LIBTOOL = @LIBTOOL@
183 183
 LIPO = @LIPO@
184 184
 LN_S = @LN_S@
... ...
@@ -279,18 +277,6 @@ top_build_prefix = @top_build_prefix@
279 279
 top_builddir = @top_builddir@
280 280
 top_srcdir = @top_srcdir@
281 281
 sigtool_SOURCES = \
282
-    $(top_srcdir)/shared/output.c \
283
-    $(top_srcdir)/shared/output.h \
284
-    $(top_srcdir)/shared/getopt.c \
285
-    $(top_srcdir)/shared/getopt.h \
286
-    $(top_srcdir)/shared/optparser.c \
287
-    $(top_srcdir)/shared/optparser.h \
288
-    $(top_srcdir)/shared/misc.c \
289
-    $(top_srcdir)/shared/misc.h \
290
-    $(top_srcdir)/shared/cdiff.c \
291
-    $(top_srcdir)/shared/cdiff.h \
292
-    $(top_srcdir)/shared/tar.c \
293
-    $(top_srcdir)/shared/tar.h \
294 282
     vba.c \
295 283
     vba.h \
296 284
     sigtool.c
... ...
@@ -401,135 +387,36 @@ mostlyclean-compile:
401 401
 distclean-compile:
402 402
 	-rm -f *.tab.c
403 403
 
404
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiff.Po@am__quote@
405
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
406
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
407
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
408
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
409 404
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigtool.Po@am__quote@
410
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tar.Po@am__quote@
411 405
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vba.Po@am__quote@
412 406
 
413 407
 .c.o:
414
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
415
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
408
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
409
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
410
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
416 411
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
417 412
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
418 413
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
419
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
414
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
420 415
 
421 416
 .c.obj:
422
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
423
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
417
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
418
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
419
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
424 420
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
425 421
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
426 422
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
427
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
423
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
428 424
 
429 425
 .c.lo:
430
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
431
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
426
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
427
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
428
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
432 429
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
433 430
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
434 431
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
435 432
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
436 433
 
437
-output.o: $(top_srcdir)/shared/output.c
438
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.o -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
439
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
440
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
441
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
442
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
443
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
444
-
445
-output.obj: $(top_srcdir)/shared/output.c
446
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT output.obj -MD -MP -MF $(DEPDIR)/output.Tpo -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
447
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
448
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
449
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
450
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
451
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`
452
-
453
-getopt.o: $(top_srcdir)/shared/getopt.c
454
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
455
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
456
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
457
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
458
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
459
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
460
-
461
-getopt.obj: $(top_srcdir)/shared/getopt.c
462
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
463
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
464
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
465
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
466
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
467
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '$(top_srcdir)/shared/getopt.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/getopt.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/getopt.c'; fi`
468
-
469
-optparser.o: $(top_srcdir)/shared/optparser.c
470
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.o -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
471
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
472
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
473
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
474
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
475
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
476
-
477
-optparser.obj: $(top_srcdir)/shared/optparser.c
478
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT optparser.obj -MD -MP -MF $(DEPDIR)/optparser.Tpo -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
479
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
480
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
481
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
482
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
483
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o optparser.obj `if test -f '$(top_srcdir)/shared/optparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/optparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/optparser.c'; fi`
484
-
485
-misc.o: $(top_srcdir)/shared/misc.c
486
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
487
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
488
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
489
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
490
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
491
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
492
-
493
-misc.obj: $(top_srcdir)/shared/misc.c
494
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
495
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
496
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
497
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
498
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
499
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`
500
-
501
-cdiff.o: $(top_srcdir)/shared/cdiff.c
502
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdiff.o -MD -MP -MF $(DEPDIR)/cdiff.Tpo -c -o cdiff.o `test -f '$(top_srcdir)/shared/cdiff.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cdiff.c
503
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
504
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
505
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.o' libtool=no @AMDEPBACKSLASH@
506
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
507
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdiff.o `test -f '$(top_srcdir)/shared/cdiff.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cdiff.c
508
-
509
-cdiff.obj: $(top_srcdir)/shared/cdiff.c
510
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdiff.obj -MD -MP -MF $(DEPDIR)/cdiff.Tpo -c -o cdiff.obj `if test -f '$(top_srcdir)/shared/cdiff.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cdiff.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cdiff.c'; fi`
511
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
512
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
513
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.obj' libtool=no @AMDEPBACKSLASH@
514
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
515
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdiff.obj `if test -f '$(top_srcdir)/shared/cdiff.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cdiff.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cdiff.c'; fi`
516
-
517
-tar.o: $(top_srcdir)/shared/tar.c
518
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tar.o -MD -MP -MF $(DEPDIR)/tar.Tpo -c -o tar.o `test -f '$(top_srcdir)/shared/tar.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/tar.c
519
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
520
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
521
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.o' libtool=no @AMDEPBACKSLASH@
522
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
523
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tar.o `test -f '$(top_srcdir)/shared/tar.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/tar.c
524
-
525
-tar.obj: $(top_srcdir)/shared/tar.c
526
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tar.obj -MD -MP -MF $(DEPDIR)/tar.Tpo -c -o tar.obj `if test -f '$(top_srcdir)/shared/tar.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/tar.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/tar.c'; fi`
527
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
528
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
529
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.obj' libtool=no @AMDEPBACKSLASH@
530
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
531
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tar.obj `if test -f '$(top_srcdir)/shared/tar.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/tar.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/tar.c'; fi`
532
-
533 434
 mostlyclean-libtool:
534 435
 	-rm -f *.lo
535 436
 
... ...
@@ -469,24 +469,27 @@ distclean-compile:
469 469
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamd-check_clamd.Po@am__quote@
470 470
 
471 471
 .c.o:
472
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
473
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
472
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
473
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
474
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
474 475
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
475 476
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
476 477
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
477
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
478
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
478 479
 
479 480
 .c.obj:
480
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
481
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
481
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
482
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
483
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
482 484
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
483 485
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
484 486
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
485
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
487
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
486 488
 
487 489
 .c.lo:
488
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
489
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
490
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
491
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
492
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
490 493
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
491 494
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
492 495
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
... ...
@@ -505,7 +505,7 @@
505 505
 /* #undef USE_SYSLOG */
506 506
 
507 507
 /* Version number of package */
508
-#define VERSION "devel-clamav-0.97-75-gd955dc2"
508
+#define VERSION "devel-clamav-0.97-77-g14c7f2b"
509 509
 
510 510
 /* Version suffix for package */
511 511
 #define VERSION_SUFFIX ""
... ...
@@ -153,7 +153,6 @@
153 153
   </ItemDefinitionGroup>
154 154
   <ItemGroup>
155 155
     <ClCompile Include="..\clambc\bcrun.c"/>
156
-    <ClCompile Include="..\shared\misc.c"/>
157 156
   </ItemGroup>
158 157
   <ItemGroup>
159 158
     <ResourceCompile Include="res\clambc.rc"/>
... ...
@@ -153,7 +153,6 @@
153 153
   </ItemDefinitionGroup>
154 154
   <ItemGroup>
155 155
     <ClCompile Include="..\clamconf\clamconf.c"/>
156
-    <ClCompile Include="..\shared\misc.c"/>
157 156
   </ItemGroup>
158 157
   <ItemGroup>
159 158
     <ResourceCompile Include="res\clamconf.rc"/>
... ...
@@ -163,8 +163,6 @@
163 163
     <ClCompile Include="..\clamd\session.c"/>
164 164
     <ClCompile Include="..\clamd\tcpserver.c"/>
165 165
     <ClCompile Include="..\clamd\thrmgr.c"/>
166
-    <ClCompile Include="..\shared\misc.c"/>
167
-    <ClCompile Include="..\shared\output.c"/>
168 166
   </ItemGroup>
169 167
   <ItemGroup>
170 168
     <ProjectReference Include="libclamav.vcxproj">
... ...
@@ -155,13 +155,9 @@
155 155
     <ResourceCompile Include="res\clamdscan.rc"/>
156 156
   </ItemGroup>
157 157
   <ItemGroup>
158
-    <ClCompile Include="..\shared\clamdcom.c"/>
159 158
     <ClCompile Include="..\clamdscan\clamdscan.c"/>
160 159
     <ClCompile Include="..\clamdscan\client.c"/>
161 160
     <ClCompile Include="..\clamdscan\proto.c"/>
162
-    <ClCompile Include="..\shared\actions.c"/>
163
-    <ClCompile Include="..\shared\misc.c"/>
164
-    <ClCompile Include="..\shared\output.c"/>
165 161
   </ItemGroup>
166 162
   <ItemGroup>
167 163
     <ProjectReference Include="libclamav.vcxproj">
... ...
@@ -157,9 +157,6 @@
157 157
   <ItemGroup>
158 158
     <ClCompile Include="..\clamscan\clamscan.c"/>
159 159
     <ClCompile Include="..\clamscan\manager.c"/>
160
-    <ClCompile Include="..\shared\actions.c"/>
161
-    <ClCompile Include="..\shared\misc.c"/>
162
-    <ClCompile Include="..\shared\output.c"/>
163 160
   </ItemGroup>
164 161
   <ItemGroup>
165 162
     <ProjectReference Include="libclamav.vcxproj">
... ...
@@ -159,7 +159,6 @@
159 159
     <ResourceCompile Include="res\freshclam.rc"/>
160 160
   </ItemGroup>
161 161
   <ItemGroup>
162
-    <ClCompile Include="..\shared\clamdcom.c"/>
163 162
     <ClCompile Include="..\freshclam\dns.c"/>
164 163
     <ClCompile Include="..\freshclam\execute.c"/>
165 164
     <ClCompile Include="..\freshclam\freshclam.c"/>
... ...
@@ -167,10 +166,6 @@
167 167
     <ClCompile Include="..\freshclam\mirman.c"/>
168 168
     <ClCompile Include="..\freshclam\nonblock.c"/>
169 169
     <ClCompile Include="..\freshclam\notify.c"/>
170
-    <ClCompile Include="..\shared\cdiff.c"/>
171
-    <ClCompile Include="..\shared\misc.c"/>
172
-    <ClCompile Include="..\shared\output.c"/>
173
-    <ClCompile Include="..\shared\tar.c"/>
174 170
     <ClCompile Include="compat\resolv.c"/>
175 171
     <ClCompile Include="compat\strptime.c"/>
176 172
   </ItemGroup>
... ...
@@ -155,10 +155,6 @@
155 155
     <ResourceCompile Include="res\sigtool.rc"/>
156 156
   </ItemGroup>
157 157
   <ItemGroup>
158
-    <ClCompile Include="..\shared\cdiff.c"/>
159
-    <ClCompile Include="..\shared\misc.c"/>
160
-    <ClCompile Include="..\shared\output.c"/>
161
-    <ClCompile Include="..\shared\tar.c"/>
162 158
     <ClCompile Include="..\sigtool\sigtool.c"/>
163 159
     <ClCompile Include="..\sigtool\vba.c"/>
164 160
   </ItemGroup>