Browse code

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

This reverts commit 321488a9586a14ea796f6904fa557d4c7d3e2283.

Conflicts:

win32/clamav-config.h

Török Edvin authored on 2011/04/16 23:41:57
Showing 35 changed files
... ...
@@ -18,7 +18,7 @@
18 18
 
19 19
 ACLOCAL_AMFLAGS=-I m4
20 20
 
21
-SUBDIRS = libltdl libclamav shared clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
21
+SUBDIRS = libltdl libclamav 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
... ...
@@ -346,7 +346,7 @@ top_build_prefix = @top_build_prefix@
346 346
 top_builddir = @top_builddir@
347 347
 top_srcdir = @top_srcdir@
348 348
 ACLOCAL_AMFLAGS = -I m4
349
-SUBDIRS = libltdl libclamav shared clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
349
+SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
350 350
 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
351 351
 bin_SCRIPTS = clamav-config
352 352
 pkgconfigdir = $(libdir)/pkgconfig
... ...
@@ -22,6 +22,14 @@ 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 \
25 33
     whitelist.c \
26 34
     whitelist.h \
27 35
     connpool.c \
... ...
@@ -38,6 +46,6 @@ endif
38 38
 endif
39 39
 
40 40
 DEFS = @DEFS@ -DCL_NOLIBCLAMAV
41
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la $(top_builddir)/shared/libshared_minimal_threads.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
41
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
42 42
 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
43 43
 CLEANFILES=*.gcda *.gcno
... ...
@@ -77,10 +77,18 @@ 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 = whitelist.c whitelist.h connpool.c \
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 \
81 85
 	connpool.h netcode.c netcode.h clamfi.c clamfi.h \
82 86
 	clamav-milter.c
83 87
 @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) \
84 92
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	whitelist.$(OBJEXT) \
85 93
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	connpool.$(OBJEXT) \
86 94
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	netcode.$(OBJEXT) \
... ...
@@ -210,7 +218,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
210 210
 LIBLTDL = @LIBLTDL@
211 211
 LIBM = @LIBM@
212 212
 LIBOBJS = @LIBOBJS@
213
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la $(top_builddir)/shared/libshared_minimal_threads.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
213
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
214 214
 LIBTOOL = @LIBTOOL@
215 215
 LIPO = @LIPO@
216 216
 LN_S = @LN_S@
... ...
@@ -312,6 +320,14 @@ top_build_prefix = @top_build_prefix@
312 312
 top_builddir = @top_builddir@
313 313
 top_srcdir = @top_srcdir@
314 314
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = \
315
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.c \
316
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.h \
317
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/output.c \
318
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/output.h \
319
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/getopt.c \
320
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/getopt.h \
321
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/misc.c \
322
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/misc.h \
315 323
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    whitelist.c \
316 324
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    whitelist.h \
317 325
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    connpool.c \
... ...
@@ -432,36 +448,101 @@ distclean-compile:
432 432
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav-milter.Po@am__quote@
433 433
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamfi.Po@am__quote@
434 434
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connpool.Po@am__quote@
435
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
436
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
435 437
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netcode.Po@am__quote@
438
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
439
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
436 440
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whitelist.Po@am__quote@
437 441
 
438 442
 .c.o:
439
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
440
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
441
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
443
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
444
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
442 445
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
443 446
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
444 447
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
445
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
448
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
446 449
 
447 450
 .c.obj:
448
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
449
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
450
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
451
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
452
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
451 453
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
452 454
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
453 455
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
454
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
456
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
455 457
 
456 458
 .c.lo:
457
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
458
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
459
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
459
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
460
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
460 461
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
461 462
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
462 463
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
463 464
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
464 465
 
466
+optparser.o: $(top_srcdir)/shared/optparser.c
467
+@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
468
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
469
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
470
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
471
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
472
+@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
473
+
474
+optparser.obj: $(top_srcdir)/shared/optparser.c
475
+@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`
476
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
477
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
478
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
479
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
480
+@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`
481
+
482
+output.o: $(top_srcdir)/shared/output.c
483
+@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
484
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
485
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
486
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
487
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
488
+@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
489
+
490
+output.obj: $(top_srcdir)/shared/output.c
491
+@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`
492
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
493
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
494
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
495
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
496
+@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`
497
+
498
+getopt.o: $(top_srcdir)/shared/getopt.c
499
+@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
500
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
501
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
502
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
503
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
504
+@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
505
+
506
+getopt.obj: $(top_srcdir)/shared/getopt.c
507
+@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`
508
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
509
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
510
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
511
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
512
+@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`
513
+
514
+misc.o: $(top_srcdir)/shared/misc.c
515
+@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
516
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
517
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
518
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
519
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
520
+@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
521
+
522
+misc.obj: $(top_srcdir)/shared/misc.c
523
+@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`
524
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
525
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
526
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
527
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
528
+@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`
529
+
465 530
 mostlyclean-libtool:
466 531
 	-rm -f *.lo
467 532
 
... ...
@@ -1,8 +1,14 @@
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 \
3 9
     bcrun.c
4 10
 
5 11
 AM_CFLAGS=@WERR_CFLAGS@
6 12
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
7
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
13
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
8 14
 CLEANFILES=*.gcda *.gcno
... ...
@@ -58,7 +58,8 @@ CONFIG_CLEAN_FILES =
58 58
 CONFIG_CLEAN_VPATH_FILES =
59 59
 am__installdirs = "$(DESTDIR)$(bindir)"
60 60
 PROGRAMS = $(bin_PROGRAMS)
61
-am_clambc_OBJECTS = bcrun.$(OBJEXT)
61
+am_clambc_OBJECTS = optparser.$(OBJEXT) getopt.$(OBJEXT) \
62
+	misc.$(OBJEXT) bcrun.$(OBJEXT)
62 63
 clambc_OBJECTS = $(am_clambc_OBJECTS)
63 64
 clambc_LDADD = $(LDADD)
64 65
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -159,7 +160,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
159 159
 LIBLTDL = @LIBLTDL@
160 160
 LIBM = @LIBM@
161 161
 LIBOBJS = @LIBOBJS@
162
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
162
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
163 163
 LIBTOOL = @LIBTOOL@
164 164
 LIPO = @LIPO@
165 165
 LN_S = @LN_S@
... ...
@@ -261,6 +262,12 @@ top_build_prefix = @top_build_prefix@
261 261
 top_builddir = @top_builddir@
262 262
 top_srcdir = @top_srcdir@
263 263
 clambc_SOURCES = \
264
+    $(top_srcdir)/shared/optparser.c \
265
+    $(top_srcdir)/shared/optparser.h \
266
+    $(top_srcdir)/shared/getopt.c \
267
+    $(top_srcdir)/shared/getopt.h \
268
+    $(top_srcdir)/shared/misc.c \
269
+    $(top_srcdir)/shared/misc.h \
264 270
     bcrun.c
265 271
 
266 272
 AM_CFLAGS = @WERR_CFLAGS@
... ...
@@ -370,34 +377,82 @@ distclean-compile:
370 370
 	-rm -f *.tab.c
371 371
 
372 372
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bcrun.Po@am__quote@
373
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
374
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
375
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
373 376
 
374 377
 .c.o:
375
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
376
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
377
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
378
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
379
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
378 380
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
379 381
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
380 382
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
381
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
383
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
382 384
 
383 385
 .c.obj:
384
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
385
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
386
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
386
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
387
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
387 388
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
388 389
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
389 390
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
390
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
391
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
391 392
 
392 393
 .c.lo:
393
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
394
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
395
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
394
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
395
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
396 396
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
397 397
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
398 398
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
399 399
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
400 400
 
401
+optparser.o: $(top_srcdir)/shared/optparser.c
402
+@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
403
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
404
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
405
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
406
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
407
+@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
408
+
409
+optparser.obj: $(top_srcdir)/shared/optparser.c
410
+@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`
411
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
412
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
413
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
414
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
415
+@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`
416
+
417
+getopt.o: $(top_srcdir)/shared/getopt.c
418
+@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
419
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
420
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
421
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
422
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
423
+@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
424
+
425
+getopt.obj: $(top_srcdir)/shared/getopt.c
426
+@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`
427
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
428
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
429
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
430
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
431
+@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`
432
+
433
+misc.o: $(top_srcdir)/shared/misc.c
434
+@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
435
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
436
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
437
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
438
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
439
+@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
440
+
441
+misc.obj: $(top_srcdir)/shared/misc.c
442
+@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`
443
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
444
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
445
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
446
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
447
+@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`
448
+
401 449
 mostlyclean-libtool:
402 450
 	-rm -f *.lo
403 451
 
... ...
@@ -19,6 +19,12 @@
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 \
22 28
     clamconf.c
23 29
 
24 30
 AM_CFLAGS=@WERR_CFLAGS@
... ...
@@ -28,5 +34,5 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
28 28
 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
29 29
 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
30 30
 	      -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
31
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
31
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
32 32
 CLEANFILES=*.gcda *.gcno
... ...
@@ -76,7 +76,8 @@ CONFIG_CLEAN_FILES =
76 76
 CONFIG_CLEAN_VPATH_FILES =
77 77
 am__installdirs = "$(DESTDIR)$(bindir)"
78 78
 PROGRAMS = $(bin_PROGRAMS)
79
-am_clamconf_OBJECTS = clamconf.$(OBJEXT)
79
+am_clamconf_OBJECTS = optparser.$(OBJEXT) getopt.$(OBJEXT) \
80
+	misc.$(OBJEXT) clamconf.$(OBJEXT)
80 81
 clamconf_OBJECTS = $(am_clamconf_OBJECTS)
81 82
 clamconf_LDADD = $(LDADD)
82 83
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -177,7 +178,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
177 177
 LIBLTDL = @LIBLTDL@
178 178
 LIBM = @LIBM@
179 179
 LIBOBJS = @LIBOBJS@
180
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
180
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
181 181
 LIBTOOL = @LIBTOOL@
182 182
 LIPO = @LIPO@
183 183
 LN_S = @LN_S@
... ...
@@ -279,6 +280,12 @@ top_build_prefix = @top_build_prefix@
279 279
 top_builddir = @top_builddir@
280 280
 top_srcdir = @top_srcdir@
281 281
 clamconf_SOURCES = \
282
+    $(top_srcdir)/shared/optparser.c \
283
+    $(top_srcdir)/shared/optparser.h \
284
+    $(top_srcdir)/shared/getopt.c \
285
+    $(top_srcdir)/shared/getopt.h \
286
+    $(top_srcdir)/shared/misc.c \
287
+    $(top_srcdir)/shared/misc.h \
282 288
     clamconf.c
283 289
 
284 290
 AM_CFLAGS = @WERR_CFLAGS@
... ...
@@ -392,34 +399,82 @@ distclean-compile:
392 392
 	-rm -f *.tab.c
393 393
 
394 394
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamconf.Po@am__quote@
395
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
396
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
397
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
395 398
 
396 399
 .c.o:
397
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
398
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
399
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
400
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
401
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
400 402
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
401 403
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
402 404
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
403
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
405
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
404 406
 
405 407
 .c.obj:
406
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
407
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
408
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
408
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
409
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
409 410
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
410 411
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
411 412
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
412
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
413
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
413 414
 
414 415
 .c.lo:
415
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
416
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
417
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
416
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
417
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
418 418
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
419 419
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
420 420
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
421 421
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
422 422
 
423
+optparser.o: $(top_srcdir)/shared/optparser.c
424
+@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
425
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
426
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
427
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
428
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
429
+@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
430
+
431
+optparser.obj: $(top_srcdir)/shared/optparser.c
432
+@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`
433
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
434
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
435
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
436
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
437
+@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`
438
+
439
+getopt.o: $(top_srcdir)/shared/getopt.c
440
+@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
441
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
442
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
443
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
444
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
445
+@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
446
+
447
+getopt.obj: $(top_srcdir)/shared/getopt.c
448
+@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`
449
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
450
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
451
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
452
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
453
+@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`
454
+
455
+misc.o: $(top_srcdir)/shared/misc.c
456
+@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
457
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
458
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
459
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
460
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
461
+@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
462
+
463
+misc.obj: $(top_srcdir)/shared/misc.c
464
+@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`
465
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
466
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
467
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
468
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
469
+@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`
470
+
423 471
 mostlyclean-libtool:
424 472
 	-rm -f *.lo
425 473
 
... ...
@@ -21,6 +21,14 @@ 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 \
24 32
     clamd.c \
25 33
     tcpserver.c \
26 34
     tcpserver.h \
... ...
@@ -54,7 +62,7 @@ AM_CFLAGS=@WERR_CFLAGS@
54 54
 
55 55
 endif
56 56
 
57
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_threads.la @CLAMD_LIBS@ @THREAD_LIBS@
57
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
58 58
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
59 59
 
60 60
 # it does support --help and --version but with the default config file
... ...
@@ -76,13 +76,19 @@ 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 = 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 \
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 \
83 87
 	dazukoio_compat12.c dazukoio_compat12.h dazukoio.c dazukoio.h \
84 88
 	dazuko_xp.h dazukoio_xp.h dazukofs.c dazukofs.h shared.h
85
-@BUILD_CLAMD_TRUE@am_clamd_OBJECTS = clamd.$(OBJEXT) \
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) \
86 92
 @BUILD_CLAMD_TRUE@	tcpserver.$(OBJEXT) localserver.$(OBJEXT) \
87 93
 @BUILD_CLAMD_TRUE@	session.$(OBJEXT) thrmgr.$(OBJEXT) \
88 94
 @BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \
... ...
@@ -190,7 +196,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
190 190
 LIBLTDL = @LIBLTDL@
191 191
 LIBM = @LIBM@
192 192
 LIBOBJS = @LIBOBJS@
193
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_threads.la @CLAMD_LIBS@ @THREAD_LIBS@
193
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
194 194
 LIBTOOL = @LIBTOOL@
195 195
 LIPO = @LIPO@
196 196
 LN_S = @LN_S@
... ...
@@ -292,6 +298,14 @@ top_build_prefix = @top_build_prefix@
292 292
 top_builddir = @top_builddir@
293 293
 top_srcdir = @top_srcdir@
294 294
 @BUILD_CLAMD_TRUE@clamd_SOURCES = \
295
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \
296
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \
297
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.c \
298
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.h \
299
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.c \
300
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \
301
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.c \
302
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.h \
295 303
 @BUILD_CLAMD_TRUE@    clamd.c \
296 304
 @BUILD_CLAMD_TRUE@    tcpserver.c \
297 305
 @BUILD_CLAMD_TRUE@    tcpserver.h \
... ...
@@ -437,8 +451,12 @@ distclean-compile:
437 437
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukofs.Po@am__quote@
438 438
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio.Po@am__quote@
439 439
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio_compat12.Po@am__quote@
440
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
440 441
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localserver.Po@am__quote@
442
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
443
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
441 444
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Po@am__quote@
445
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
442 446
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner.Po@am__quote@
443 447
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server-th.Po@am__quote@
444 448
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@
... ...
@@ -446,32 +464,93 @@ distclean-compile:
446 446
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrmgr.Po@am__quote@
447 447
 
448 448
 .c.o:
449
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
450
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
451
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
449
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
450
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
452 451
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
453 452
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
454 453
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
455
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
454
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
456 455
 
457 456
 .c.obj:
458
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
459
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
460
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
457
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
458
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
461 459
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
462 460
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
463 461
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
464
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
462
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
465 463
 
466 464
 .c.lo:
467
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
468
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
469
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
465
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
466
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
470 467
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
471 468
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
472 469
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
473 470
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
474 471
 
472
+output.o: $(top_srcdir)/shared/output.c
473
+@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
474
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
475
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
476
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
477
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
478
+@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
479
+
480
+output.obj: $(top_srcdir)/shared/output.c
481
+@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`
482
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
483
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
484
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' 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 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`
487
+
488
+optparser.o: $(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.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
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.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 optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
495
+
496
+optparser.obj: $(top_srcdir)/shared/optparser.c
497
+@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`
498
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
499
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
500
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.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 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`
503
+
504
+getopt.o: $(top_srcdir)/shared/getopt.c
505
+@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
506
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
507
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
508
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.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 getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
511
+
512
+getopt.obj: $(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.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`
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.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 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`
519
+
520
+misc.o: $(top_srcdir)/shared/misc.c
521
+@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
522
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
523
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
524
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.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 misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
527
+
528
+misc.obj: $(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.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`
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.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 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`
535
+
475 536
 mostlyclean-libtool:
476 537
 	-rm -f *.lo
477 538
 
... ...
@@ -21,6 +21,18 @@ 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 \
24 36
     clamdscan.c \
25 37
     proto.c \
26 38
     proto.h \
... ...
@@ -33,7 +45,7 @@ endif
33 33
 
34 34
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
35 35
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
36
-LIBS = $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@
36
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @CLAMDSCAN_LIBS@
37 37
 
38 38
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
39 39
 CLEANFILES=*.gcda *.gcno
... ...
@@ -76,9 +76,18 @@ 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 = clamdscan.c proto.c proto.h client.c \
80
-	client.h
81
-@BUILD_CLAMD_TRUE@am_clamdscan_OBJECTS = clamdscan.$(OBJEXT) \
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) \
82 91
 @BUILD_CLAMD_TRUE@	proto.$(OBJEXT) client.$(OBJEXT)
83 92
 clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)
84 93
 clamdscan_LDADD = $(LDADD)
... ...
@@ -180,7 +189,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
180 180
 LIBLTDL = @LIBLTDL@
181 181
 LIBM = @LIBM@
182 182
 LIBOBJS = @LIBOBJS@
183
-LIBS = $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@
183
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @CLAMDSCAN_LIBS@
184 184
 LIBTOOL = @LIBTOOL@
185 185
 LIPO = @LIPO@
186 186
 LN_S = @LN_S@
... ...
@@ -282,6 +291,18 @@ top_build_prefix = @top_build_prefix@
282 282
 top_builddir = @top_builddir@
283 283
 top_srcdir = @top_srcdir@
284 284
 @BUILD_CLAMD_TRUE@clamdscan_SOURCES = \
285
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \
286
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \
287
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.c \
288
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/optparser.h \
289
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.c \
290
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.h \
291
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.c \
292
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \
293
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.c \
294
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.h \
295
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/clamdcom.c \
296
+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/clamdcom.h \
285 297
 @BUILD_CLAMD_TRUE@    clamdscan.c \
286 298
 @BUILD_CLAMD_TRUE@    proto.c \
287 299
 @BUILD_CLAMD_TRUE@    proto.h \
... ...
@@ -395,37 +416,136 @@ mostlyclean-compile:
395 395
 distclean-compile:
396 396
 	-rm -f *.tab.c
397 397
 
398
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@
399
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdcom.Po@am__quote@
398 400
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdscan.Po@am__quote@
399 401
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@
402
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
403
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
404
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
405
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
400 406
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto.Po@am__quote@
401 407
 
402 408
 .c.o:
403
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
404
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
405
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
409
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
410
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
406 411
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
407 412
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
408 413
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
409
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
414
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
410 415
 
411 416
 .c.obj:
412
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
413
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
414
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
417
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
418
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
415 419
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
416 420
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
417 421
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
418
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
422
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
419 423
 
420 424
 .c.lo:
421
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
422
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
423
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
425
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
426
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
424 427
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
425 428
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
426 429
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
427 430
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
428 431
 
432
+output.o: $(top_srcdir)/shared/output.c
433
+@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
434
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
435
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
436
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
437
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
438
+@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
439
+
440
+output.obj: $(top_srcdir)/shared/output.c
441
+@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`
442
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
443
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
444
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
445
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
446
+@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`
447
+
448
+optparser.o: $(top_srcdir)/shared/optparser.c
449
+@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
450
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
451
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
452
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
453
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
454
+@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
455
+
456
+optparser.obj: $(top_srcdir)/shared/optparser.c
457
+@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`
458
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
459
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
460
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
461
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
462
+@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`
463
+
464
+misc.o: $(top_srcdir)/shared/misc.c
465
+@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
466
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
467
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
468
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
469
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
470
+@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
471
+
472
+misc.obj: $(top_srcdir)/shared/misc.c
473
+@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`
474
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
475
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
476
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
477
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
478
+@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`
479
+
480
+getopt.o: $(top_srcdir)/shared/getopt.c
481
+@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
482
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
483
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
484
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.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 getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
487
+
488
+getopt.obj: $(top_srcdir)/shared/getopt.c
489
+@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`
490
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
491
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
492
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.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 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`
495
+
496
+actions.o: $(top_srcdir)/shared/actions.c
497
+@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
498
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
499
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
500
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.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 actions.o `test -f '$(top_srcdir)/shared/actions.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/actions.c
503
+
504
+actions.obj: $(top_srcdir)/shared/actions.c
505
+@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`
506
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
507
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
508
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.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 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`
511
+
512
+clamdcom.o: $(top_srcdir)/shared/clamdcom.c
513
+@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
514
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
515
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
516
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.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 clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c
519
+
520
+clamdcom.obj: $(top_srcdir)/shared/clamdcom.c
521
+@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`
522
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
523
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
524
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.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 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`
527
+
429 528
 mostlyclean-libtool:
430 529
 	-rm -f *.lo
431 530
 
... ...
@@ -2,11 +2,17 @@ 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 \
5 11
     clamdtop.c
6 12
 
7 13
 AM_CFLAGS=@WERR_CFLAGS@
8 14
 AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
9
-clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
15
+clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
10 16
 endif
11 17
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
12 18
 EXTRA_DIST = clamdtop.c
... ...
@@ -58,12 +58,15 @@ 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 = clamdtop.c
62
-@HAVE_CURSES_TRUE@am_clamdtop_OBJECTS = clamdtop.$(OBJEXT)
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)
63 68
 clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
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
69
+@HAVE_CURSES_TRUE@clamdtop_DEPENDENCIES = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
67 70
 AM_V_lt = $(am__v_lt_$(V))
68 71
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
69 72
 am__v_lt_0 = --silent
... ...
@@ -289,11 +292,17 @@ top_builddir = @top_builddir@
289 289
 top_srcdir = @top_srcdir@
290 290
 @HAVE_CURSES_TRUE@man_MANS = $(top_builddir)/docs/man/clamdtop.1
291 291
 @HAVE_CURSES_TRUE@clamdtop_SOURCES = \
292
+@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/optparser.c \
293
+@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/optparser.h \
294
+@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/getopt.c \
295
+@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/getopt.h \
296
+@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/misc.c \
297
+@HAVE_CURSES_TRUE@    $(top_srcdir)/shared/misc.h \
292 298
 @HAVE_CURSES_TRUE@    clamdtop.c
293 299
 
294 300
 @HAVE_CURSES_TRUE@AM_CFLAGS = @WERR_CFLAGS@
295 301
 @HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
296
-@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
302
+@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
297 303
 EXTRA_DIST = clamdtop.c
298 304
 all: all-am
299 305
 
... ...
@@ -399,34 +408,82 @@ distclean-compile:
399 399
 	-rm -f *.tab.c
400 400
 
401 401
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdtop.Po@am__quote@
402
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
403
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
404
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
402 405
 
403 406
 .c.o:
404
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
405
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
406
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
407
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
408
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
407 409
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
408 410
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
409 411
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
410
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
412
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
411 413
 
412 414
 .c.obj:
413
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
414
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
415
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
415
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
416
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
416 417
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
417 418
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
418 419
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
419
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
420
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
420 421
 
421 422
 .c.lo:
422
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
423
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
424
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
423
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
424
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
425 425
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
426 426
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
427 427
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
428 428
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
429 429
 
430
+optparser.o: $(top_srcdir)/shared/optparser.c
431
+@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
432
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
433
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
434
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' 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 optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
437
+
438
+optparser.obj: $(top_srcdir)/shared/optparser.c
439
+@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`
440
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
441
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
442
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' 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 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`
445
+
446
+getopt.o: $(top_srcdir)/shared/getopt.c
447
+@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
448
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
449
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
450
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' 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 getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
453
+
454
+getopt.obj: $(top_srcdir)/shared/getopt.c
455
+@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`
456
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
457
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
458
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
459
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
460
+@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`
461
+
462
+misc.o: $(top_srcdir)/shared/misc.c
463
+@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
464
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
465
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
466
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
467
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
468
+@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
469
+
470
+misc.obj: $(top_srcdir)/shared/misc.c
471
+@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`
472
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
473
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
474
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
475
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
476
+@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`
477
+
430 478
 mostlyclean-libtool:
431 479
 	-rm -f *.lo
432 480
 
... ...
@@ -19,7 +19,17 @@
19 19
 
20 20
 bin_PROGRAMS = clamscan
21 21
 
22
-clamscan_SOURCES =\
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 \
23 33
     clamscan.c \
24 34
     global.h \
25 35
     manager.c \
... ...
@@ -27,7 +37,7 @@ clamscan_SOURCES =\
27 27
 
28 28
 AM_CFLAGS=@WERR_CFLAGS@
29 29
 DEFS = @DEFS@ -DCL_NOTHREADS
30
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
30
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
31 31
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
32 32
 
33 33
 CLEANFILES=*.gcda *.gcno
... ...
@@ -77,7 +77,9 @@ CONFIG_CLEAN_FILES =
77 77
 CONFIG_CLEAN_VPATH_FILES =
78 78
 am__installdirs = "$(DESTDIR)$(bindir)"
79 79
 PROGRAMS = $(bin_PROGRAMS)
80
-am_clamscan_OBJECTS = clamscan.$(OBJEXT) manager.$(OBJEXT)
80
+am_clamscan_OBJECTS = output.$(OBJEXT) getopt.$(OBJEXT) \
81
+	optparser.$(OBJEXT) actions.$(OBJEXT) misc.$(OBJEXT) \
82
+	clamscan.$(OBJEXT) manager.$(OBJEXT)
81 83
 clamscan_OBJECTS = $(am_clamscan_OBJECTS)
82 84
 clamscan_LDADD = $(LDADD)
83 85
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -178,7 +180,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
178 178
 LIBLTDL = @LIBLTDL@
179 179
 LIBM = @LIBM@
180 180
 LIBOBJS = @LIBOBJS@
181
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
181
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
182 182
 LIBTOOL = @LIBTOOL@
183 183
 LIPO = @LIPO@
184 184
 LN_S = @LN_S@
... ...
@@ -280,6 +282,16 @@ 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 \
283 293
     clamscan.c \
284 294
     global.h \
285 295
     manager.c \
... ...
@@ -391,36 +403,118 @@ mostlyclean-compile:
391 391
 distclean-compile:
392 392
 	-rm -f *.tab.c
393 393
 
394
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@
394 395
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamscan.Po@am__quote@
396
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
395 397
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Po@am__quote@
398
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
399
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
400
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
396 401
 
397 402
 .c.o:
398
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
399
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
400
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
403
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
404
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
401 405
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
402 406
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
403 407
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
404
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
408
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
405 409
 
406 410
 .c.obj:
407
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
408
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
409
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
411
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
412
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
410 413
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
411 414
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
412 415
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
413
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
416
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
414 417
 
415 418
 .c.lo:
416
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
417
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
418
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
419
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
420
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
419 421
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
420 422
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
421 423
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
422 424
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
423 425
 
426
+output.o: $(top_srcdir)/shared/output.c
427
+@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
428
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
429
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
430
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
431
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
432
+@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
433
+
434
+output.obj: $(top_srcdir)/shared/output.c
435
+@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`
436
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
437
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
438
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
439
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
440
+@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`
441
+
442
+getopt.o: $(top_srcdir)/shared/getopt.c
443
+@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
444
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
445
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
446
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
447
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
448
+@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
449
+
450
+getopt.obj: $(top_srcdir)/shared/getopt.c
451
+@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`
452
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
453
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
454
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
455
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
456
+@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`
457
+
458
+optparser.o: $(top_srcdir)/shared/optparser.c
459
+@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
460
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
461
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
462
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
463
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
464
+@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
465
+
466
+optparser.obj: $(top_srcdir)/shared/optparser.c
467
+@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`
468
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
469
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
470
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
471
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
472
+@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`
473
+
474
+actions.o: $(top_srcdir)/shared/actions.c
475
+@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
476
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
477
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
478
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.o' libtool=no @AMDEPBACKSLASH@
479
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
480
+@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
481
+
482
+actions.obj: $(top_srcdir)/shared/actions.c
483
+@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`
484
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/actions.Tpo $(DEPDIR)/actions.Po
485
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
486
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/actions.c' object='actions.obj' libtool=no @AMDEPBACKSLASH@
487
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
488
+@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`
489
+
490
+misc.o: $(top_srcdir)/shared/misc.c
491
+@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
492
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
493
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
494
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
495
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
496
+@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
497
+
498
+misc.obj: $(top_srcdir)/shared/misc.c
499
+@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`
500
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
501
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
502
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
503
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
504
+@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`
505
+
424 506
 mostlyclean-libtool:
425 507
 	-rm -f *.lo
426 508
 
... ...
@@ -20855,7 +20855,7 @@ $as_echo "#define HAVE__INTERNAL__SHA_COLLECT 1" >>confdefs.h
20855 20855
 
20856 20856
 fi
20857 20857
 
20858
-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"
20858
+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"
20859 20859
 
20860 20860
 cat >confcache <<\_ACEOF
20861 20861
 # This file is a shell script that caches the results of configure
... ...
@@ -21937,7 +21937,6 @@ do
21937 21937
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
21938 21938
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
21939 21939
     "freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;;
21940
-    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
21941 21940
     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;
21942 21941
     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;
21943 21942
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
... ...
@@ -24571,7 +24570,6 @@ do
24571 24571
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
24572 24572
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
24573 24573
     "freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;;
24574
-    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
24575 24574
     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;
24576 24575
     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;
24577 24576
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
... ...
@@ -34,9 +34,7 @@ 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
38
-		  foreign dist-bzip2 no-define color-tests parallel-tests
39
-		  tar-ustar subdir-objects])
37
+AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])
40 38
 AM_SILENT_RULES([yes])
41 39
 
42 40
 dnl we told automake to not define these, since we want to include
... ...
@@ -1626,7 +1624,6 @@ clamd/Makefile
1626 1626
 clamdscan/Makefile
1627 1627
 clamav-milter/Makefile
1628 1628
 freshclam/Makefile
1629
-shared/Makefile
1630 1629
 sigtool/Makefile
1631 1630
 clamconf/Makefile
1632 1631
 etc/Makefile
... ...
@@ -20,6 +20,20 @@
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 \
23 37
     freshclam.c \
24 38
     manager.c \
25 39
     manager.h \
... ...
@@ -37,7 +51,7 @@ freshclam_SOURCES = \
37 37
 AM_CFLAGS=@WERR_CFLAGS@
38 38
 DEFS = @DEFS@ -DCL_NOTHREADS
39 39
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
40
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
40
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
41 41
 
42 42
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)
43 43
 CLEANFILES=*.gcda *.gcno
... ...
@@ -77,7 +77,9 @@ CONFIG_CLEAN_FILES =
77 77
 CONFIG_CLEAN_VPATH_FILES =
78 78
 am__installdirs = "$(DESTDIR)$(bindir)"
79 79
 PROGRAMS = $(bin_PROGRAMS)
80
-am_freshclam_OBJECTS = freshclam.$(OBJEXT) manager.$(OBJEXT) \
80
+am_freshclam_OBJECTS = output.$(OBJEXT) optparser.$(OBJEXT) \
81
+	getopt.$(OBJEXT) misc.$(OBJEXT) cdiff.$(OBJEXT) tar.$(OBJEXT) \
82
+	clamdcom.$(OBJEXT) freshclam.$(OBJEXT) manager.$(OBJEXT) \
81 83
 	notify.$(OBJEXT) dns.$(OBJEXT) execute.$(OBJEXT) \
82 84
 	nonblock.$(OBJEXT) mirman.$(OBJEXT)
83 85
 freshclam_OBJECTS = $(am_freshclam_OBJECTS)
... ...
@@ -180,7 +182,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
180 180
 LIBLTDL = @LIBLTDL@
181 181
 LIBM = @LIBM@
182 182
 LIBOBJS = @LIBOBJS@
183
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
183
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
184 184
 LIBTOOL = @LIBTOOL@
185 185
 LIPO = @LIPO@
186 186
 LN_S = @LN_S@
... ...
@@ -282,6 +284,20 @@ 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 \
285 299
     freshclam.c \
286 300
     manager.c \
287 301
     manager.h \
... ...
@@ -403,41 +419,157 @@ mostlyclean-compile:
403 403
 distclean-compile:
404 404
 	-rm -f *.tab.c
405 405
 
406
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiff.Po@am__quote@
407
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdcom.Po@am__quote@
406 408
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
407 409
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/execute.Po@am__quote@
408 410
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freshclam.Po@am__quote@
411
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
409 412
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Po@am__quote@
410 413
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mirman.Po@am__quote@
414
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
411 415
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nonblock.Po@am__quote@
412 416
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify.Po@am__quote@
417
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
418
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
419
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tar.Po@am__quote@
413 420
 
414 421
 .c.o:
415
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
416
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
417
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
422
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
423
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
418 424
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
419 425
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
420 426
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
421
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
427
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
422 428
 
423 429
 .c.obj:
424
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
425
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
426
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
430
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
431
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
427 432
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
428 433
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
429 434
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
430
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
435
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
431 436
 
432 437
 .c.lo:
433
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
434
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
435
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
438
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
439
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
436 440
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
437 441
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
438 442
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
439 443
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
440 444
 
445
+output.o: $(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.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
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.o' 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.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c
452
+
453
+output.obj: $(top_srcdir)/shared/output.c
454
+@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`
455
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
456
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
457
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' 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 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`
460
+
461
+optparser.o: $(top_srcdir)/shared/optparser.c
462
+@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
463
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
464
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
465
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' 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 optparser.o `test -f '$(top_srcdir)/shared/optparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/optparser.c
468
+
469
+optparser.obj: $(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.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`
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.obj' 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.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`
476
+
477
+getopt.o: $(top_srcdir)/shared/getopt.c
478
+@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
479
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
480
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
481
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' 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 getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c
484
+
485
+getopt.obj: $(top_srcdir)/shared/getopt.c
486
+@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`
487
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
488
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
489
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' 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 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`
492
+
493
+misc.o: $(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.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
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.o' 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.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c
500
+
501
+misc.obj: $(top_srcdir)/shared/misc.c
502
+@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`
503
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
504
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
505
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' 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 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`
508
+
509
+cdiff.o: $(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.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
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.o' 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.o `test -f '$(top_srcdir)/shared/cdiff.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cdiff.c
516
+
517
+cdiff.obj: $(top_srcdir)/shared/cdiff.c
518
+@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`
519
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
520
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
521
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.obj' 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 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`
524
+
525
+tar.o: $(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.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
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.o' 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.o `test -f '$(top_srcdir)/shared/tar.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/tar.c
532
+
533
+tar.obj: $(top_srcdir)/shared/tar.c
534
+@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`
535
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
536
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
537
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.obj' libtool=no @AMDEPBACKSLASH@
538
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
539
+@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`
540
+
541
+clamdcom.o: $(top_srcdir)/shared/clamdcom.c
542
+@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
543
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
544
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
545
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.o' libtool=no @AMDEPBACKSLASH@
546
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
547
+@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
548
+
549
+clamdcom.obj: $(top_srcdir)/shared/clamdcom.c
550
+@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`
551
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po
552
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
553
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.obj' libtool=no @AMDEPBACKSLASH@
554
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
555
+@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`
556
+
441 557
 mostlyclean-libtool:
442 558
 	-rm -f *.lo
443 559
 
... ...
@@ -159,7 +159,6 @@ 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
163 162
 @LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo
164 163
 am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
165 164
 	libclamav_la-matcher-bm.lo libclamav_la-matcher-hash.lo \
... ...
@@ -183,8 +182,8 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
183 183
 	libclamav_la-special.lo libclamav_la-binhex.lo \
184 184
 	libclamav_la-is_tar.lo libclamav_la-tnef.lo \
185 185
 	libclamav_la-autoit.lo libclamav_la-unarj.lo \
186
-	nsis/libclamav_la-bzlib.lo nsis/libclamav_la-nulsft.lo \
187
-	nsis/libclamav_la-infblock.lo libclamav_la-pdf.lo \
186
+	libclamav_la-bzlib.lo libclamav_la-nulsft.lo \
187
+	libclamav_la-infblock.lo libclamav_la-pdf.lo \
188 188
 	libclamav_la-spin.lo libclamav_la-yc.lo libclamav_la-elf.lo \
189 189
 	libclamav_la-sis.lo libclamav_la-uuencode.lo \
190 190
 	libclamav_la-phishcheck.lo \
... ...
@@ -193,18 +192,15 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
193 193
 	libclamav_la-regex_suffix.lo libclamav_la-mspack.lo \
194 194
 	libclamav_la-cab.lo libclamav_la-entconv.lo \
195 195
 	libclamav_la-hashtab.lo libclamav_la-dconf.lo \
196
-	7z/libclamav_la-LzmaDec.lo libclamav_la-lzma_iface.lo \
197
-	libclamav_la-7z.lo 7z/libclamav_la-7zFile.lo \
198
-	7z/libclamav_la-7zStream.lo 7z/libclamav_la-7zCrc.lo \
199
-	7z/libclamav_la-7zBuf.lo 7z/libclamav_la-Bcj2.lo \
200
-	7z/libclamav_la-Bra.lo 7z/libclamav_la-Bra86.lo \
201
-	7z/Archive/7z/libclamav_la-7zIn.lo \
202
-	7z/Archive/7z/libclamav_la-7zDecode.lo \
203
-	7z/Archive/7z/libclamav_la-7zItem.lo \
204
-	7z/Archive/7z/libclamav_la-7zHeader.lo \
205
-	7z/Archive/7z/libclamav_la-7zExtract.lo \
196
+	libclamav_la-LzmaDec.lo libclamav_la-lzma_iface.lo \
197
+	libclamav_la-7z.lo libclamav_la-7zFile.lo \
198
+	libclamav_la-7zStream.lo libclamav_la-7zCrc.lo \
199
+	libclamav_la-7zBuf.lo libclamav_la-Bcj2.lo libclamav_la-Bra.lo \
200
+	libclamav_la-Bra86.lo libclamav_la-7zIn.lo \
201
+	libclamav_la-7zDecode.lo libclamav_la-7zItem.lo \
202
+	libclamav_la-7zHeader.lo libclamav_la-7zExtract.lo \
206 203
 	libclamav_la-explode.lo libclamav_la-textnorm.lo \
207
-	libclamav_la-dlp.lo jsparse/libclamav_la-js-norm.lo \
204
+	libclamav_la-dlp.lo libclamav_la-js-norm.lo \
208 205
 	libclamav_la-uniq.lo libclamav_la-version.lo \
209 206
 	libclamav_la-mpool.lo libclamav_la-filtering.lo \
210 207
 	libclamav_la-fmap.lo libclamav_la-perflogging.lo \
... ...
@@ -229,11 +225,11 @@ am_libclamav_internal_utils_la_OBJECTS =  \
229 229
 	libclamav_internal_utils_la-md5.lo \
230 230
 	libclamav_internal_utils_la-others_common.lo \
231 231
 	libclamav_internal_utils_la-qsort.lo \
232
-	regex/libclamav_internal_utils_la-strlcpy.lo \
233
-	regex/libclamav_internal_utils_la-regcomp.lo \
234
-	regex/libclamav_internal_utils_la-regerror.lo \
235
-	regex/libclamav_internal_utils_la-regexec.lo \
236
-	regex/libclamav_internal_utils_la-regfree.lo
232
+	libclamav_internal_utils_la-strlcpy.lo \
233
+	libclamav_internal_utils_la-regcomp.lo \
234
+	libclamav_internal_utils_la-regerror.lo \
235
+	libclamav_internal_utils_la-regexec.lo \
236
+	libclamav_internal_utils_la-regfree.lo
237 237
 libclamav_internal_utils_la_OBJECTS =  \
238 238
 	$(am_libclamav_internal_utils_la_OBJECTS)
239 239
 libclamav_internal_utils_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
... ...
@@ -246,11 +242,11 @@ am_libclamav_internal_utils_nothreads_la_OBJECTS =  \
246 246
 	libclamav_internal_utils_nothreads_la-md5.lo \
247 247
 	libclamav_internal_utils_nothreads_la-others_common.lo \
248 248
 	libclamav_internal_utils_nothreads_la-qsort.lo \
249
-	regex/libclamav_internal_utils_nothreads_la-strlcpy.lo \
250
-	regex/libclamav_internal_utils_nothreads_la-regcomp.lo \
251
-	regex/libclamav_internal_utils_nothreads_la-regerror.lo \
252
-	regex/libclamav_internal_utils_nothreads_la-regexec.lo \
253
-	regex/libclamav_internal_utils_nothreads_la-regfree.lo
249
+	libclamav_internal_utils_nothreads_la-strlcpy.lo \
250
+	libclamav_internal_utils_nothreads_la-regcomp.lo \
251
+	libclamav_internal_utils_nothreads_la-regerror.lo \
252
+	libclamav_internal_utils_nothreads_la-regexec.lo \
253
+	libclamav_internal_utils_nothreads_la-regfree.lo
254 254
 libclamav_internal_utils_nothreads_la_OBJECTS =  \
255 255
 	$(am_libclamav_internal_utils_nothreads_la_OBJECTS)
256 256
 libclamav_internal_utils_nothreads_la_LINK = $(LIBTOOL) $(AM_V_lt) \
... ...
@@ -271,15 +267,9 @@ am__libclamunrar_la_SOURCES_DIST = ../libclamunrar/unrar15.c \
271 271
 	../libclamunrar/unrarfilter.c ../libclamunrar/unrarppm.h \
272 272
 	../libclamunrar/unrarvm.h ../libclamunrar/unrarhlp.c \
273 273
 	../libclamunrar/unrarhlp.h
274
-@ENABLE_UNRAR_TRUE@am_libclamunrar_la_OBJECTS =  \
275
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrar15.lo \
276
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrar.lo \
277
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrar20.lo \
278
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarppm.lo \
279
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarvm.lo \
280
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarcmd.lo \
281
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarfilter.lo \
282
-@ENABLE_UNRAR_TRUE@	../libclamunrar/unrarhlp.lo
274
+@ENABLE_UNRAR_TRUE@am_libclamunrar_la_OBJECTS = unrar15.lo unrar.lo \
275
+@ENABLE_UNRAR_TRUE@	unrar20.lo unrarppm.lo unrarvm.lo \
276
+@ENABLE_UNRAR_TRUE@	unrarcmd.lo unrarfilter.lo unrarhlp.lo
283 277
 libclamunrar_la_OBJECTS = $(am_libclamunrar_la_OBJECTS)
284 278
 libclamunrar_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
285 279
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
... ...
@@ -291,8 +281,7 @@ libclamunrar_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
291 291
 am__libclamunrar_iface_la_SOURCES_DIST =  \
292 292
 	../libclamunrar_iface/unrar_iface.c \
293 293
 	../libclamunrar_iface/unrar_iface.h
294
-@ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_OBJECTS =  \
295
-@ENABLE_UNRAR_TRUE@	../libclamunrar_iface/unrar_iface.lo
294
+@ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_OBJECTS = unrar_iface.lo
296 295
 libclamunrar_iface_la_OBJECTS = $(am_libclamunrar_iface_la_OBJECTS)
297 296
 libclamunrar_iface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
298 297
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
... ...
@@ -763,232 +752,58 @@ clean-noinstLTLIBRARIES:
763 763
 	  echo "rm -f \"$${dir}/so_locations\""; \
764 764
 	  rm -f "$${dir}/so_locations"; \
765 765
 	done
766
-nsis/$(am__dirstamp):
767
-	@$(MKDIR_P) nsis
768
-	@: > nsis/$(am__dirstamp)
769
-nsis/$(DEPDIR)/$(am__dirstamp):
770
-	@$(MKDIR_P) nsis/$(DEPDIR)
771
-	@: > nsis/$(DEPDIR)/$(am__dirstamp)
772
-nsis/libclamav_la-bzlib.lo: nsis/$(am__dirstamp) \
773
-	nsis/$(DEPDIR)/$(am__dirstamp)
774
-nsis/libclamav_la-nulsft.lo: nsis/$(am__dirstamp) \
775
-	nsis/$(DEPDIR)/$(am__dirstamp)
776
-nsis/libclamav_la-infblock.lo: nsis/$(am__dirstamp) \
777
-	nsis/$(DEPDIR)/$(am__dirstamp)
778
-7z/$(am__dirstamp):
779
-	@$(MKDIR_P) 7z
780
-	@: > 7z/$(am__dirstamp)
781
-7z/$(DEPDIR)/$(am__dirstamp):
782
-	@$(MKDIR_P) 7z/$(DEPDIR)
783
-	@: > 7z/$(DEPDIR)/$(am__dirstamp)
784
-7z/libclamav_la-LzmaDec.lo: 7z/$(am__dirstamp) \
785
-	7z/$(DEPDIR)/$(am__dirstamp)
786
-7z/libclamav_la-7zFile.lo: 7z/$(am__dirstamp) \
787
-	7z/$(DEPDIR)/$(am__dirstamp)
788
-7z/libclamav_la-7zStream.lo: 7z/$(am__dirstamp) \
789
-	7z/$(DEPDIR)/$(am__dirstamp)
790
-7z/libclamav_la-7zCrc.lo: 7z/$(am__dirstamp) \
791
-	7z/$(DEPDIR)/$(am__dirstamp)
792
-7z/libclamav_la-7zBuf.lo: 7z/$(am__dirstamp) \
793
-	7z/$(DEPDIR)/$(am__dirstamp)
794
-7z/libclamav_la-Bcj2.lo: 7z/$(am__dirstamp) \
795
-	7z/$(DEPDIR)/$(am__dirstamp)
796
-7z/libclamav_la-Bra.lo: 7z/$(am__dirstamp) \
797
-	7z/$(DEPDIR)/$(am__dirstamp)
798
-7z/libclamav_la-Bra86.lo: 7z/$(am__dirstamp) \
799
-	7z/$(DEPDIR)/$(am__dirstamp)
800
-7z/Archive/7z/$(am__dirstamp):
801
-	@$(MKDIR_P) 7z/Archive/7z
802
-	@: > 7z/Archive/7z/$(am__dirstamp)
803
-7z/Archive/7z/$(DEPDIR)/$(am__dirstamp):
804
-	@$(MKDIR_P) 7z/Archive/7z/$(DEPDIR)
805
-	@: > 7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
806
-7z/Archive/7z/libclamav_la-7zIn.lo: 7z/Archive/7z/$(am__dirstamp) \
807
-	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
808
-7z/Archive/7z/libclamav_la-7zDecode.lo: 7z/Archive/7z/$(am__dirstamp) \
809
-	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
810
-7z/Archive/7z/libclamav_la-7zItem.lo: 7z/Archive/7z/$(am__dirstamp) \
811
-	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
812
-7z/Archive/7z/libclamav_la-7zHeader.lo: 7z/Archive/7z/$(am__dirstamp) \
813
-	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
814
-7z/Archive/7z/libclamav_la-7zExtract.lo:  \
815
-	7z/Archive/7z/$(am__dirstamp) \
816
-	7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
817
-jsparse/$(am__dirstamp):
818
-	@$(MKDIR_P) jsparse
819
-	@: > jsparse/$(am__dirstamp)
820
-jsparse/$(DEPDIR)/$(am__dirstamp):
821
-	@$(MKDIR_P) jsparse/$(DEPDIR)
822
-	@: > jsparse/$(DEPDIR)/$(am__dirstamp)
823
-jsparse/libclamav_la-js-norm.lo: jsparse/$(am__dirstamp) \
824
-	jsparse/$(DEPDIR)/$(am__dirstamp)
825 766
 libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) 
826 767
 	$(AM_V_CCLD)$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)
827
-regex/$(am__dirstamp):
828
-	@$(MKDIR_P) regex
829
-	@: > regex/$(am__dirstamp)
830
-regex/$(DEPDIR)/$(am__dirstamp):
831
-	@$(MKDIR_P) regex/$(DEPDIR)
832
-	@: > regex/$(DEPDIR)/$(am__dirstamp)
833
-regex/libclamav_internal_utils_la-strlcpy.lo: regex/$(am__dirstamp) \
834
-	regex/$(DEPDIR)/$(am__dirstamp)
835
-regex/libclamav_internal_utils_la-regcomp.lo: regex/$(am__dirstamp) \
836
-	regex/$(DEPDIR)/$(am__dirstamp)
837
-regex/libclamav_internal_utils_la-regerror.lo: regex/$(am__dirstamp) \
838
-	regex/$(DEPDIR)/$(am__dirstamp)
839
-regex/libclamav_internal_utils_la-regexec.lo: regex/$(am__dirstamp) \
840
-	regex/$(DEPDIR)/$(am__dirstamp)
841
-regex/libclamav_internal_utils_la-regfree.lo: regex/$(am__dirstamp) \
842
-	regex/$(DEPDIR)/$(am__dirstamp)
843 768
 libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) 
844 769
 	$(AM_V_CCLD)$(libclamav_internal_utils_la_LINK)  $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS)
845
-regex/libclamav_internal_utils_nothreads_la-strlcpy.lo:  \
846
-	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
847
-regex/libclamav_internal_utils_nothreads_la-regcomp.lo:  \
848
-	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
849
-regex/libclamav_internal_utils_nothreads_la-regerror.lo:  \
850
-	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
851
-regex/libclamav_internal_utils_nothreads_la-regexec.lo:  \
852
-	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
853
-regex/libclamav_internal_utils_nothreads_la-regfree.lo:  \
854
-	regex/$(am__dirstamp) regex/$(DEPDIR)/$(am__dirstamp)
855 770
 libclamav_internal_utils_nothreads.la: $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_DEPENDENCIES) 
856 771
 	$(AM_V_CCLD)$(libclamav_internal_utils_nothreads_la_LINK)  $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_LIBADD) $(LIBS)
857 772
 libclamav_nocxx.la: $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_DEPENDENCIES) 
858 773
 	$(AM_V_CCLD)$(LINK)  $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_LIBADD) $(LIBS)
859
-../libclamunrar/$(am__dirstamp):
860
-	@$(MKDIR_P) ../libclamunrar
861
-	@: > ../libclamunrar/$(am__dirstamp)
862
-../libclamunrar/$(DEPDIR)/$(am__dirstamp):
863
-	@$(MKDIR_P) ../libclamunrar/$(DEPDIR)
864
-	@: > ../libclamunrar/$(DEPDIR)/$(am__dirstamp)
865
-../libclamunrar/unrar15.lo: ../libclamunrar/$(am__dirstamp) \
866
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
867
-../libclamunrar/unrar.lo: ../libclamunrar/$(am__dirstamp) \
868
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
869
-../libclamunrar/unrar20.lo: ../libclamunrar/$(am__dirstamp) \
870
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
871
-../libclamunrar/unrarppm.lo: ../libclamunrar/$(am__dirstamp) \
872
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
873
-../libclamunrar/unrarvm.lo: ../libclamunrar/$(am__dirstamp) \
874
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
875
-../libclamunrar/unrarcmd.lo: ../libclamunrar/$(am__dirstamp) \
876
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
877
-../libclamunrar/unrarfilter.lo: ../libclamunrar/$(am__dirstamp) \
878
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
879
-../libclamunrar/unrarhlp.lo: ../libclamunrar/$(am__dirstamp) \
880
-	../libclamunrar/$(DEPDIR)/$(am__dirstamp)
881 774
 libclamunrar.la: $(libclamunrar_la_OBJECTS) $(libclamunrar_la_DEPENDENCIES) 
882 775
 	$(AM_V_CCLD)$(libclamunrar_la_LINK) $(am_libclamunrar_la_rpath) $(libclamunrar_la_OBJECTS) $(libclamunrar_la_LIBADD) $(LIBS)
883
-../libclamunrar_iface/$(am__dirstamp):
884
-	@$(MKDIR_P) ../libclamunrar_iface
885
-	@: > ../libclamunrar_iface/$(am__dirstamp)
886
-../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp):
887
-	@$(MKDIR_P) ../libclamunrar_iface/$(DEPDIR)
888
-	@: > ../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp)
889
-../libclamunrar_iface/unrar_iface.lo:  \
890
-	../libclamunrar_iface/$(am__dirstamp) \
891
-	../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp)
892 776
 libclamunrar_iface.la: $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_DEPENDENCIES) 
893 777
 	$(AM_V_CCLD)$(libclamunrar_iface_la_LINK) $(am_libclamunrar_iface_la_rpath) $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_LIBADD) $(LIBS)
894 778
 
895 779
 mostlyclean-compile:
896 780
 	-rm -f *.$(OBJEXT)
897
-	-rm -f ../libclamunrar/unrar.$(OBJEXT)
898
-	-rm -f ../libclamunrar/unrar.lo
899
-	-rm -f ../libclamunrar/unrar15.$(OBJEXT)
900
-	-rm -f ../libclamunrar/unrar15.lo
901
-	-rm -f ../libclamunrar/unrar20.$(OBJEXT)
902
-	-rm -f ../libclamunrar/unrar20.lo
903
-	-rm -f ../libclamunrar/unrarcmd.$(OBJEXT)
904
-	-rm -f ../libclamunrar/unrarcmd.lo
905
-	-rm -f ../libclamunrar/unrarfilter.$(OBJEXT)
906
-	-rm -f ../libclamunrar/unrarfilter.lo
907
-	-rm -f ../libclamunrar/unrarhlp.$(OBJEXT)
908
-	-rm -f ../libclamunrar/unrarhlp.lo
909
-	-rm -f ../libclamunrar/unrarppm.$(OBJEXT)
910
-	-rm -f ../libclamunrar/unrarppm.lo
911
-	-rm -f ../libclamunrar/unrarvm.$(OBJEXT)
912
-	-rm -f ../libclamunrar/unrarvm.lo
913
-	-rm -f ../libclamunrar_iface/unrar_iface.$(OBJEXT)
914
-	-rm -f ../libclamunrar_iface/unrar_iface.lo
915
-	-rm -f 7z/Archive/7z/libclamav_la-7zDecode.$(OBJEXT)
916
-	-rm -f 7z/Archive/7z/libclamav_la-7zDecode.lo
917
-	-rm -f 7z/Archive/7z/libclamav_la-7zExtract.$(OBJEXT)
918
-	-rm -f 7z/Archive/7z/libclamav_la-7zExtract.lo
919
-	-rm -f 7z/Archive/7z/libclamav_la-7zHeader.$(OBJEXT)
920
-	-rm -f 7z/Archive/7z/libclamav_la-7zHeader.lo
921
-	-rm -f 7z/Archive/7z/libclamav_la-7zIn.$(OBJEXT)
922
-	-rm -f 7z/Archive/7z/libclamav_la-7zIn.lo
923
-	-rm -f 7z/Archive/7z/libclamav_la-7zItem.$(OBJEXT)
924
-	-rm -f 7z/Archive/7z/libclamav_la-7zItem.lo
925
-	-rm -f 7z/libclamav_la-7zBuf.$(OBJEXT)
926
-	-rm -f 7z/libclamav_la-7zBuf.lo
927
-	-rm -f 7z/libclamav_la-7zCrc.$(OBJEXT)
928
-	-rm -f 7z/libclamav_la-7zCrc.lo
929
-	-rm -f 7z/libclamav_la-7zFile.$(OBJEXT)
930
-	-rm -f 7z/libclamav_la-7zFile.lo
931
-	-rm -f 7z/libclamav_la-7zStream.$(OBJEXT)
932
-	-rm -f 7z/libclamav_la-7zStream.lo
933
-	-rm -f 7z/libclamav_la-Bcj2.$(OBJEXT)
934
-	-rm -f 7z/libclamav_la-Bcj2.lo
935
-	-rm -f 7z/libclamav_la-Bra.$(OBJEXT)
936
-	-rm -f 7z/libclamav_la-Bra.lo
937
-	-rm -f 7z/libclamav_la-Bra86.$(OBJEXT)
938
-	-rm -f 7z/libclamav_la-Bra86.lo
939
-	-rm -f 7z/libclamav_la-LzmaDec.$(OBJEXT)
940
-	-rm -f 7z/libclamav_la-LzmaDec.lo
941
-	-rm -f jsparse/libclamav_la-js-norm.$(OBJEXT)
942
-	-rm -f jsparse/libclamav_la-js-norm.lo
943
-	-rm -f nsis/libclamav_la-bzlib.$(OBJEXT)
944
-	-rm -f nsis/libclamav_la-bzlib.lo
945
-	-rm -f nsis/libclamav_la-infblock.$(OBJEXT)
946
-	-rm -f nsis/libclamav_la-infblock.lo
947
-	-rm -f nsis/libclamav_la-nulsft.$(OBJEXT)
948
-	-rm -f nsis/libclamav_la-nulsft.lo
949
-	-rm -f regex/libclamav_internal_utils_la-regcomp.$(OBJEXT)
950
-	-rm -f regex/libclamav_internal_utils_la-regcomp.lo
951
-	-rm -f regex/libclamav_internal_utils_la-regerror.$(OBJEXT)
952
-	-rm -f regex/libclamav_internal_utils_la-regerror.lo
953
-	-rm -f regex/libclamav_internal_utils_la-regexec.$(OBJEXT)
954
-	-rm -f regex/libclamav_internal_utils_la-regexec.lo
955
-	-rm -f regex/libclamav_internal_utils_la-regfree.$(OBJEXT)
956
-	-rm -f regex/libclamav_internal_utils_la-regfree.lo
957
-	-rm -f regex/libclamav_internal_utils_la-strlcpy.$(OBJEXT)
958
-	-rm -f regex/libclamav_internal_utils_la-strlcpy.lo
959
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regcomp.$(OBJEXT)
960
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regcomp.lo
961
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regerror.$(OBJEXT)
962
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regerror.lo
963
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regexec.$(OBJEXT)
964
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regexec.lo
965
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regfree.$(OBJEXT)
966
-	-rm -f regex/libclamav_internal_utils_nothreads_la-regfree.lo
967
-	-rm -f regex/libclamav_internal_utils_nothreads_la-strlcpy.$(OBJEXT)
968
-	-rm -f regex/libclamav_internal_utils_nothreads_la-strlcpy.lo
969 781
 
970 782
 distclean-compile:
971 783
 	-rm -f *.tab.c
972 784
 
973
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrar.Plo@am__quote@
974
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrar15.Plo@am__quote@
975
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrar20.Plo@am__quote@
976
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarcmd.Plo@am__quote@
977
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarfilter.Plo@am__quote@
978
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarhlp.Plo@am__quote@
979
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarppm.Plo@am__quote@
980
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/unrarvm.Plo@am__quote@
981
-@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar_iface/$(DEPDIR)/unrar_iface.Plo@am__quote@
982 785
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytecode_nojit.Plo@am__quote@
983 786
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-md5.Plo@am__quote@
984 787
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others_common.Plo@am__quote@
985 788
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-qsort.Plo@am__quote@
789
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo@am__quote@
790
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo@am__quote@
791
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo@am__quote@
792
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@
986 793
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@
794
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@
987 795
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo@am__quote@
988 796
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Plo@am__quote@
989 797
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-qsort.Plo@am__quote@
798
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo@am__quote@
799
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo@am__quote@
800
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo@am__quote@
801
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo@am__quote@
990 802
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Plo@am__quote@
803
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo@am__quote@
991 804
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7z.Plo@am__quote@
805
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zBuf.Plo@am__quote@
806
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zCrc.Plo@am__quote@
807
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zDecode.Plo@am__quote@
808
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zExtract.Plo@am__quote@
809
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zFile.Plo@am__quote@
810
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zHeader.Plo@am__quote@
811
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zIn.Plo@am__quote@
812
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zItem.Plo@am__quote@
813
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zStream.Plo@am__quote@
814
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-Bcj2.Plo@am__quote@
815
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-Bra.Plo@am__quote@
816
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-Bra86.Plo@am__quote@
817
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-LzmaDec.Plo@am__quote@
992 818
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-aspack.Plo@am__quote@
993 819
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-autoit.Plo@am__quote@
994 820
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bignum.Plo@am__quote@
... ...
@@ -999,6 +814,7 @@ distclean-compile:
999 999
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_api_decl.Plo@am__quote@
1000 1000
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_detect.Plo@am__quote@
1001 1001
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_vm.Plo@am__quote@
1002
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bzlib.Plo@am__quote@
1002 1003
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-cab.Plo@am__quote@
1003 1004
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-cache.Plo@am__quote@
1004 1005
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-chmunpack.Plo@am__quote@
... ...
@@ -1018,10 +834,12 @@ distclean-compile:
1018 1018
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fsg.Plo@am__quote@
1019 1019
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-hashtab.Plo@am__quote@
1020 1020
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-htmlnorm.Plo@am__quote@
1021
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-infblock.Plo@am__quote@
1021 1022
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-inflate64.Plo@am__quote@
1022 1023
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-is_tar.Plo@am__quote@
1023 1024
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-ishield.Plo@am__quote@
1024 1025
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-jpeg.Plo@am__quote@
1026
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-js-norm.Plo@am__quote@
1025 1027
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-line.Plo@am__quote@
1026 1028
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-lzma_iface.Plo@am__quote@
1027 1029
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-macho.Plo@am__quote@
... ...
@@ -1035,6 +853,7 @@ distclean-compile:
1035 1035
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-mpool.Plo@am__quote@
1036 1036
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-msexpand.Plo@am__quote@
1037 1037
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-mspack.Plo@am__quote@
1038
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-nulsft.Plo@am__quote@
1038 1039
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-ole2_extract.Plo@am__quote@
1039 1040
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-others.Plo@am__quote@
1040 1041
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-packlibs.Plo@am__quote@
... ...
@@ -1076,56 +895,35 @@ distclean-compile:
1076 1076
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-version.Plo@am__quote@
1077 1077
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-wwunpack.Plo@am__quote@
1078 1078
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yc.Plo@am__quote@
1079
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zBuf.Plo@am__quote@
1080
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zCrc.Plo@am__quote@
1081
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zFile.Plo@am__quote@
1082
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-7zStream.Plo@am__quote@
1083
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-Bcj2.Plo@am__quote@
1084
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-Bra.Plo@am__quote@
1085
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-Bra86.Plo@am__quote@
1086
-@AMDEP_TRUE@@am__include@ @am__quote@7z/$(DEPDIR)/libclamav_la-LzmaDec.Plo@am__quote@
1087
-@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Plo@am__quote@
1088
-@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Plo@am__quote@
1089
-@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Plo@am__quote@
1090
-@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Plo@am__quote@
1091
-@AMDEP_TRUE@@am__include@ @am__quote@7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Plo@am__quote@
1092
-@AMDEP_TRUE@@am__include@ @am__quote@jsparse/$(DEPDIR)/libclamav_la-js-norm.Plo@am__quote@
1093
-@AMDEP_TRUE@@am__include@ @am__quote@nsis/$(DEPDIR)/libclamav_la-bzlib.Plo@am__quote@
1094
-@AMDEP_TRUE@@am__include@ @am__quote@nsis/$(DEPDIR)/libclamav_la-infblock.Plo@am__quote@
1095
-@AMDEP_TRUE@@am__include@ @am__quote@nsis/$(DEPDIR)/libclamav_la-nulsft.Plo@am__quote@
1096
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo@am__quote@
1097
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo@am__quote@
1098
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo@am__quote@
1099
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@
1100
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@
1101
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo@am__quote@
1102
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo@am__quote@
1103
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo@am__quote@
1104
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo@am__quote@
1105
-@AMDEP_TRUE@@am__include@ @am__quote@regex/$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo@am__quote@
1079
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar.Plo@am__quote@
1080
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar15.Plo@am__quote@
1081
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar20.Plo@am__quote@
1082
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar_iface.Plo@am__quote@
1083
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarcmd.Plo@am__quote@
1084
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarfilter.Plo@am__quote@
1085
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarhlp.Plo@am__quote@
1086
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarppm.Plo@am__quote@
1087
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarvm.Plo@am__quote@
1106 1088
 
1107 1089
 .c.o:
1108
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
1109
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
1110
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
1090
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1091
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1111 1092
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1112 1093
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1113 1094
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1114
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
1095
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
1115 1096
 
1116 1097
 .c.obj:
1117
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
1118
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
1119
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
1098
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
1099
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1120 1100
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1121 1101
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1122 1102
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1123
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
1103
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
1124 1104
 
1125 1105
 .c.lo:
1126
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
1127
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
1128
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
1106
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1107
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
1129 1108
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1130 1109
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
1131 1110
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
... ...
@@ -1491,29 +1289,29 @@ libclamav_la-unarj.lo: unarj.c
1491 1491
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1492 1492
 @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
1493 1493
 
1494
-nsis/libclamav_la-bzlib.lo: nsis/bzlib.c
1495
-@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
1496
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nsis/$(DEPDIR)/libclamav_la-bzlib.Tpo nsis/$(DEPDIR)/libclamav_la-bzlib.Plo
1494
+libclamav_la-bzlib.lo: nsis/bzlib.c
1495
+@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
1496
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-bzlib.Tpo $(DEPDIR)/libclamav_la-bzlib.Plo
1497 1497
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1498
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/bzlib.c' object='nsis/libclamav_la-bzlib.lo' libtool=yes @AMDEPBACKSLASH@
1498
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/bzlib.c' object='libclamav_la-bzlib.lo' libtool=yes @AMDEPBACKSLASH@
1499 1499
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1500
-@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
1500
+@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
1501 1501
 
1502
-nsis/libclamav_la-nulsft.lo: nsis/nulsft.c
1503
-@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
1504
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nsis/$(DEPDIR)/libclamav_la-nulsft.Tpo nsis/$(DEPDIR)/libclamav_la-nulsft.Plo
1502
+libclamav_la-nulsft.lo: nsis/nulsft.c
1503
+@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
1504
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-nulsft.Tpo $(DEPDIR)/libclamav_la-nulsft.Plo
1505 1505
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1506
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/nulsft.c' object='nsis/libclamav_la-nulsft.lo' libtool=yes @AMDEPBACKSLASH@
1506
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/nulsft.c' object='libclamav_la-nulsft.lo' libtool=yes @AMDEPBACKSLASH@
1507 1507
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1508
-@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
1508
+@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
1509 1509
 
1510
-nsis/libclamav_la-infblock.lo: nsis/infblock.c
1511
-@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
1512
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nsis/$(DEPDIR)/libclamav_la-infblock.Tpo nsis/$(DEPDIR)/libclamav_la-infblock.Plo
1510
+libclamav_la-infblock.lo: nsis/infblock.c
1511
+@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
1512
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-infblock.Tpo $(DEPDIR)/libclamav_la-infblock.Plo
1513 1513
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1514
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/infblock.c' object='nsis/libclamav_la-infblock.lo' libtool=yes @AMDEPBACKSLASH@
1514
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/infblock.c' object='libclamav_la-infblock.lo' libtool=yes @AMDEPBACKSLASH@
1515 1515
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1516
-@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
1516
+@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
1517 1517
 
1518 1518
 libclamav_la-pdf.lo: pdf.c
1519 1519
 @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
... ...
@@ -1643,13 +1441,13 @@ libclamav_la-dconf.lo: dconf.c
1643 1643
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1644 1644
 @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
1645 1645
 
1646
-7z/libclamav_la-LzmaDec.lo: 7z/LzmaDec.c
1647
-@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
1648
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-LzmaDec.Tpo 7z/$(DEPDIR)/libclamav_la-LzmaDec.Plo
1646
+libclamav_la-LzmaDec.lo: 7z/LzmaDec.c
1647
+@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
1648
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-LzmaDec.Tpo $(DEPDIR)/libclamav_la-LzmaDec.Plo
1649 1649
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1650
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/LzmaDec.c' object='7z/libclamav_la-LzmaDec.lo' libtool=yes @AMDEPBACKSLASH@
1650
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/LzmaDec.c' object='libclamav_la-LzmaDec.lo' libtool=yes @AMDEPBACKSLASH@
1651 1651
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1652
-@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
1652
+@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
1653 1653
 
1654 1654
 libclamav_la-lzma_iface.lo: lzma_iface.c
1655 1655
 @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
... ...
@@ -1667,101 +1465,101 @@ libclamav_la-7z.lo: 7z.c
1667 1667
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1668 1668
 @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
1669 1669
 
1670
-7z/libclamav_la-7zFile.lo: 7z/7zFile.c
1671
-@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
1672
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zFile.Tpo 7z/$(DEPDIR)/libclamav_la-7zFile.Plo
1670
+libclamav_la-7zFile.lo: 7z/7zFile.c
1671
+@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
1672
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zFile.Tpo $(DEPDIR)/libclamav_la-7zFile.Plo
1673 1673
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1674
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zFile.c' object='7z/libclamav_la-7zFile.lo' libtool=yes @AMDEPBACKSLASH@
1674
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zFile.c' object='libclamav_la-7zFile.lo' libtool=yes @AMDEPBACKSLASH@
1675 1675
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1676
-@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
1676
+@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
1677 1677
 
1678
-7z/libclamav_la-7zStream.lo: 7z/7zStream.c
1679
-@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
1680
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zStream.Tpo 7z/$(DEPDIR)/libclamav_la-7zStream.Plo
1678
+libclamav_la-7zStream.lo: 7z/7zStream.c
1679
+@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
1680
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zStream.Tpo $(DEPDIR)/libclamav_la-7zStream.Plo
1681 1681
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1682
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zStream.c' object='7z/libclamav_la-7zStream.lo' libtool=yes @AMDEPBACKSLASH@
1682
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zStream.c' object='libclamav_la-7zStream.lo' libtool=yes @AMDEPBACKSLASH@
1683 1683
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1684
-@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
1684
+@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
1685 1685
 
1686
-7z/libclamav_la-7zCrc.lo: 7z/7zCrc.c
1687
-@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
1688
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zCrc.Tpo 7z/$(DEPDIR)/libclamav_la-7zCrc.Plo
1686
+libclamav_la-7zCrc.lo: 7z/7zCrc.c
1687
+@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
1688
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zCrc.Tpo $(DEPDIR)/libclamav_la-7zCrc.Plo
1689 1689
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1690
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zCrc.c' object='7z/libclamav_la-7zCrc.lo' libtool=yes @AMDEPBACKSLASH@
1690
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zCrc.c' object='libclamav_la-7zCrc.lo' libtool=yes @AMDEPBACKSLASH@
1691 1691
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1692
-@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
1692
+@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
1693 1693
 
1694
-7z/libclamav_la-7zBuf.lo: 7z/7zBuf.c
1695
-@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
1696
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-7zBuf.Tpo 7z/$(DEPDIR)/libclamav_la-7zBuf.Plo
1694
+libclamav_la-7zBuf.lo: 7z/7zBuf.c
1695
+@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
1696
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zBuf.Tpo $(DEPDIR)/libclamav_la-7zBuf.Plo
1697 1697
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1698
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zBuf.c' object='7z/libclamav_la-7zBuf.lo' libtool=yes @AMDEPBACKSLASH@
1698
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/7zBuf.c' object='libclamav_la-7zBuf.lo' libtool=yes @AMDEPBACKSLASH@
1699 1699
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1700
-@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
1700
+@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
1701 1701
 
1702
-7z/libclamav_la-Bcj2.lo: 7z/Bcj2.c
1703
-@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
1704
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-Bcj2.Tpo 7z/$(DEPDIR)/libclamav_la-Bcj2.Plo
1702
+libclamav_la-Bcj2.lo: 7z/Bcj2.c
1703
+@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
1704
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-Bcj2.Tpo $(DEPDIR)/libclamav_la-Bcj2.Plo
1705 1705
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1706
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bcj2.c' object='7z/libclamav_la-Bcj2.lo' libtool=yes @AMDEPBACKSLASH@
1706
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bcj2.c' object='libclamav_la-Bcj2.lo' libtool=yes @AMDEPBACKSLASH@
1707 1707
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1708
-@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
1708
+@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
1709 1709
 
1710
-7z/libclamav_la-Bra.lo: 7z/Bra.c
1711
-@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
1712
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-Bra.Tpo 7z/$(DEPDIR)/libclamav_la-Bra.Plo
1710
+libclamav_la-Bra.lo: 7z/Bra.c
1711
+@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
1712
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-Bra.Tpo $(DEPDIR)/libclamav_la-Bra.Plo
1713 1713
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1714
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra.c' object='7z/libclamav_la-Bra.lo' libtool=yes @AMDEPBACKSLASH@
1714
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra.c' object='libclamav_la-Bra.lo' libtool=yes @AMDEPBACKSLASH@
1715 1715
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1716
-@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
1716
+@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
1717 1717
 
1718
-7z/libclamav_la-Bra86.lo: 7z/Bra86.c
1719
-@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
1720
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/$(DEPDIR)/libclamav_la-Bra86.Tpo 7z/$(DEPDIR)/libclamav_la-Bra86.Plo
1718
+libclamav_la-Bra86.lo: 7z/Bra86.c
1719
+@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
1720
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-Bra86.Tpo $(DEPDIR)/libclamav_la-Bra86.Plo
1721 1721
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1722
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra86.c' object='7z/libclamav_la-Bra86.lo' libtool=yes @AMDEPBACKSLASH@
1722
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Bra86.c' object='libclamav_la-Bra86.lo' libtool=yes @AMDEPBACKSLASH@
1723 1723
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1724
-@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
1724
+@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
1725 1725
 
1726
-7z/Archive/7z/libclamav_la-7zIn.lo: 7z/Archive/7z/7zIn.c
1727
-@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
1728
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zIn.Plo
1726
+libclamav_la-7zIn.lo: 7z/Archive/7z/7zIn.c
1727
+@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
1728
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zIn.Tpo $(DEPDIR)/libclamav_la-7zIn.Plo
1729 1729
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1730
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zIn.c' object='7z/Archive/7z/libclamav_la-7zIn.lo' libtool=yes @AMDEPBACKSLASH@
1730
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zIn.c' object='libclamav_la-7zIn.lo' libtool=yes @AMDEPBACKSLASH@
1731 1731
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1732
-@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
1732
+@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
1733 1733
 
1734
-7z/Archive/7z/libclamav_la-7zDecode.lo: 7z/Archive/7z/7zDecode.c
1735
-@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
1736
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zDecode.Plo
1734
+libclamav_la-7zDecode.lo: 7z/Archive/7z/7zDecode.c
1735
+@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
1736
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zDecode.Tpo $(DEPDIR)/libclamav_la-7zDecode.Plo
1737 1737
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1738
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zDecode.c' object='7z/Archive/7z/libclamav_la-7zDecode.lo' libtool=yes @AMDEPBACKSLASH@
1738
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zDecode.c' object='libclamav_la-7zDecode.lo' libtool=yes @AMDEPBACKSLASH@
1739 1739
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1740
-@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
1740
+@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
1741 1741
 
1742
-7z/Archive/7z/libclamav_la-7zItem.lo: 7z/Archive/7z/7zItem.c
1743
-@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
1744
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zItem.Plo
1742
+libclamav_la-7zItem.lo: 7z/Archive/7z/7zItem.c
1743
+@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
1744
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zItem.Tpo $(DEPDIR)/libclamav_la-7zItem.Plo
1745 1745
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1746
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zItem.c' object='7z/Archive/7z/libclamav_la-7zItem.lo' libtool=yes @AMDEPBACKSLASH@
1746
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zItem.c' object='libclamav_la-7zItem.lo' libtool=yes @AMDEPBACKSLASH@
1747 1747
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1748
-@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
1748
+@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
1749 1749
 
1750
-7z/Archive/7z/libclamav_la-7zHeader.lo: 7z/Archive/7z/7zHeader.c
1751
-@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
1752
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zHeader.Plo
1750
+libclamav_la-7zHeader.lo: 7z/Archive/7z/7zHeader.c
1751
+@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
1752
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zHeader.Tpo $(DEPDIR)/libclamav_la-7zHeader.Plo
1753 1753
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1754
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zHeader.c' object='7z/Archive/7z/libclamav_la-7zHeader.lo' libtool=yes @AMDEPBACKSLASH@
1754
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zHeader.c' object='libclamav_la-7zHeader.lo' libtool=yes @AMDEPBACKSLASH@
1755 1755
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1756
-@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
1756
+@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
1757 1757
 
1758
-7z/Archive/7z/libclamav_la-7zExtract.lo: 7z/Archive/7z/7zExtract.c
1759
-@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
1760
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Tpo 7z/Archive/7z/$(DEPDIR)/libclamav_la-7zExtract.Plo
1758
+libclamav_la-7zExtract.lo: 7z/Archive/7z/7zExtract.c
1759
+@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
1760
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-7zExtract.Tpo $(DEPDIR)/libclamav_la-7zExtract.Plo
1761 1761
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1762
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zExtract.c' object='7z/Archive/7z/libclamav_la-7zExtract.lo' libtool=yes @AMDEPBACKSLASH@
1762
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='7z/Archive/7z/7zExtract.c' object='libclamav_la-7zExtract.lo' libtool=yes @AMDEPBACKSLASH@
1763 1763
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1764
-@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
1764
+@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
1765 1765
 
1766 1766
 libclamav_la-explode.lo: explode.c
1767 1767
 @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
... ...
@@ -1787,13 +1585,13 @@ libclamav_la-dlp.lo: dlp.c
1787 1787
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1788 1788
 @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
1789 1789
 
1790
-jsparse/libclamav_la-js-norm.lo: jsparse/js-norm.c
1791
-@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
1792
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jsparse/$(DEPDIR)/libclamav_la-js-norm.Tpo jsparse/$(DEPDIR)/libclamav_la-js-norm.Plo
1790
+libclamav_la-js-norm.lo: jsparse/js-norm.c
1791
+@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
1792
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-js-norm.Tpo $(DEPDIR)/libclamav_la-js-norm.Plo
1793 1793
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
1794
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jsparse/js-norm.c' object='jsparse/libclamav_la-js-norm.lo' libtool=yes @AMDEPBACKSLASH@
1794
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jsparse/js-norm.c' object='libclamav_la-js-norm.lo' libtool=yes @AMDEPBACKSLASH@
1795 1795
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1796
-@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
1796
+@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
1797 1797
 
1798 1798
 libclamav_la-uniq.lo: uniq.c
1799 1799
 @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
... ...
@@ -2003,45 +1801,45 @@ libclamav_internal_utils_la-qsort.lo: qsort.c
2003 2003
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2004 2004
 @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
2005 2005
 
2006
-regex/libclamav_internal_utils_la-strlcpy.lo: regex/strlcpy.c
2007
-@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
2008
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo
2006
+libclamav_internal_utils_la-strlcpy.lo: regex/strlcpy.c
2007
+@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
2008
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo
2009 2009
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2010
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='regex/libclamav_internal_utils_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
2010
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='libclamav_internal_utils_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
2011 2011
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2012
-@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
2012
+@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
2013 2013
 
2014
-regex/libclamav_internal_utils_la-regcomp.lo: regex/regcomp.c
2015
-@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
2016
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo
2014
+libclamav_internal_utils_la-regcomp.lo: regex/regcomp.c
2015
+@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
2016
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo $(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo
2017 2017
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2018
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='regex/libclamav_internal_utils_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
2018
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='libclamav_internal_utils_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
2019 2019
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2020
-@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
2020
+@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
2021 2021
 
2022
-regex/libclamav_internal_utils_la-regerror.lo: regex/regerror.c
2023
-@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
2024
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo
2022
+libclamav_internal_utils_la-regerror.lo: regex/regerror.c
2023
+@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
2024
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo $(DEPDIR)/libclamav_internal_utils_la-regerror.Plo
2025 2025
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2026
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='regex/libclamav_internal_utils_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
2026
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='libclamav_internal_utils_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
2027 2027
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2028
-@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
2028
+@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
2029 2029
 
2030
-regex/libclamav_internal_utils_la-regexec.lo: regex/regexec.c
2031
-@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
2032
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo
2030
+libclamav_internal_utils_la-regexec.lo: regex/regexec.c
2031
+@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
2032
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo $(DEPDIR)/libclamav_internal_utils_la-regexec.Plo
2033 2033
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2034
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='regex/libclamav_internal_utils_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
2034
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='libclamav_internal_utils_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
2035 2035
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2036
-@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
2036
+@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
2037 2037
 
2038
-regex/libclamav_internal_utils_la-regfree.lo: regex/regfree.c
2039
-@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
2040
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo regex/$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo
2038
+libclamav_internal_utils_la-regfree.lo: regex/regfree.c
2039
+@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
2040
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo $(DEPDIR)/libclamav_internal_utils_la-regfree.Plo
2041 2041
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2042
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='regex/libclamav_internal_utils_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
2042
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='libclamav_internal_utils_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
2043 2043
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2044
-@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
2044
+@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
2045 2045
 
2046 2046
 libclamav_internal_utils_nothreads_la-str.lo: str.c
2047 2047
 @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
... ...
@@ -2075,58 +1873,123 @@ libclamav_internal_utils_nothreads_la-qsort.lo: qsort.c
2075 2075
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2076 2076
 @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
2077 2077
 
2078
-regex/libclamav_internal_utils_nothreads_la-strlcpy.lo: regex/strlcpy.c
2079
-@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
2080
-@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
2078
+libclamav_internal_utils_nothreads_la-strlcpy.lo: regex/strlcpy.c
2079
+@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
2080
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo
2081 2081
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2082
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='regex/libclamav_internal_utils_nothreads_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
2082
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='libclamav_internal_utils_nothreads_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
2083 2083
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2084
-@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
2084
+@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
2085 2085
 
2086
-regex/libclamav_internal_utils_nothreads_la-regcomp.lo: regex/regcomp.c
2087
-@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
2088
-@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
2086
+libclamav_internal_utils_nothreads_la-regcomp.lo: regex/regcomp.c
2087
+@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
2088
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo
2089 2089
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2090
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='regex/libclamav_internal_utils_nothreads_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
2090
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='libclamav_internal_utils_nothreads_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
2091 2091
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2092
-@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
2092
+@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
2093 2093
 
2094
-regex/libclamav_internal_utils_nothreads_la-regerror.lo: regex/regerror.c
2095
-@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
2096
-@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
2094
+libclamav_internal_utils_nothreads_la-regerror.lo: regex/regerror.c
2095
+@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
2096
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo
2097 2097
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2098
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='regex/libclamav_internal_utils_nothreads_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
2098
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='libclamav_internal_utils_nothreads_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
2099 2099
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2100
-@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
2100
+@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
2101 2101
 
2102
-regex/libclamav_internal_utils_nothreads_la-regexec.lo: regex/regexec.c
2103
-@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
2104
-@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
2102
+libclamav_internal_utils_nothreads_la-regexec.lo: regex/regexec.c
2103
+@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
2104
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo
2105 2105
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2106
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='regex/libclamav_internal_utils_nothreads_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
2106
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='libclamav_internal_utils_nothreads_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
2107 2107
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2108
-@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
2108
+@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
2109 2109
 
2110
-regex/libclamav_internal_utils_nothreads_la-regfree.lo: regex/regfree.c
2111
-@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
2112
-@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
2110
+libclamav_internal_utils_nothreads_la-regfree.lo: regex/regfree.c
2111
+@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
2112
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo
2113 2113
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2114
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='regex/libclamav_internal_utils_nothreads_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
2114
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='libclamav_internal_utils_nothreads_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
2115 2115
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2116
-@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
2116
+@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
2117
+
2118
+unrar15.lo: ../libclamunrar/unrar15.c
2119
+@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
2120
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar15.Tpo $(DEPDIR)/unrar15.Plo
2121
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2122
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrar15.c' object='unrar15.lo' libtool=yes @AMDEPBACKSLASH@
2123
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2124
+@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
2125
+
2126
+unrar.lo: ../libclamunrar/unrar.c
2127
+@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
2128
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar.Tpo $(DEPDIR)/unrar.Plo
2129
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2130
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrar.c' object='unrar.lo' libtool=yes @AMDEPBACKSLASH@
2131
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2132
+@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
2133
+
2134
+unrar20.lo: ../libclamunrar/unrar20.c
2135
+@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
2136
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar20.Tpo $(DEPDIR)/unrar20.Plo
2137
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2138
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrar20.c' object='unrar20.lo' libtool=yes @AMDEPBACKSLASH@
2139
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2140
+@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
2141
+
2142
+unrarppm.lo: ../libclamunrar/unrarppm.c
2143
+@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
2144
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarppm.Tpo $(DEPDIR)/unrarppm.Plo
2145
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2146
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarppm.c' object='unrarppm.lo' libtool=yes @AMDEPBACKSLASH@
2147
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2148
+@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
2149
+
2150
+unrarvm.lo: ../libclamunrar/unrarvm.c
2151
+@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
2152
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarvm.Tpo $(DEPDIR)/unrarvm.Plo
2153
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2154
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarvm.c' object='unrarvm.lo' libtool=yes @AMDEPBACKSLASH@
2155
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2156
+@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
2157
+
2158
+unrarcmd.lo: ../libclamunrar/unrarcmd.c
2159
+@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
2160
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarcmd.Tpo $(DEPDIR)/unrarcmd.Plo
2161
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2162
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarcmd.c' object='unrarcmd.lo' libtool=yes @AMDEPBACKSLASH@
2163
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2164
+@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
2165
+
2166
+unrarfilter.lo: ../libclamunrar/unrarfilter.c
2167
+@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
2168
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarfilter.Tpo $(DEPDIR)/unrarfilter.Plo
2169
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2170
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarfilter.c' object='unrarfilter.lo' libtool=yes @AMDEPBACKSLASH@
2171
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2172
+@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
2173
+
2174
+unrarhlp.lo: ../libclamunrar/unrarhlp.c
2175
+@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
2176
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrarhlp.Tpo $(DEPDIR)/unrarhlp.Plo
2177
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2178
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar/unrarhlp.c' object='unrarhlp.lo' libtool=yes @AMDEPBACKSLASH@
2179
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2180
+@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
2181
+
2182
+unrar_iface.lo: ../libclamunrar_iface/unrar_iface.c
2183
+@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
2184
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unrar_iface.Tpo $(DEPDIR)/unrar_iface.Plo
2185
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
2186
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libclamunrar_iface/unrar_iface.c' object='unrar_iface.lo' libtool=yes @AMDEPBACKSLASH@
2187
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2188
+@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
2117 2189
 
2118 2190
 mostlyclean-libtool:
2119 2191
 	-rm -f *.lo
2120 2192
 
2121 2193
 clean-libtool:
2122 2194
 	-rm -rf .libs _libs
2123
-	-rm -rf ../libclamunrar/.libs ../libclamunrar/_libs
2124
-	-rm -rf ../libclamunrar_iface/.libs ../libclamunrar_iface/_libs
2125
-	-rm -rf 7z/.libs 7z/_libs
2126
-	-rm -rf 7z/Archive/7z/.libs 7z/Archive/7z/_libs
2127
-	-rm -rf jsparse/.libs jsparse/_libs
2128
-	-rm -rf nsis/.libs nsis/_libs
2129
-	-rm -rf regex/.libs regex/_libs
2130 2195
 install-includeHEADERS: $(include_HEADERS)
2131 2196
 	@$(NORMAL_INSTALL)
2132 2197
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
... ...
@@ -2373,20 +2236,6 @@ clean-generic:
2373 2373
 distclean-generic:
2374 2374
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2375 2375
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2376
-	-rm -f ../libclamunrar/$(DEPDIR)/$(am__dirstamp)
2377
-	-rm -f ../libclamunrar/$(am__dirstamp)
2378
-	-rm -f ../libclamunrar_iface/$(DEPDIR)/$(am__dirstamp)
2379
-	-rm -f ../libclamunrar_iface/$(am__dirstamp)
2380
-	-rm -f 7z/$(DEPDIR)/$(am__dirstamp)
2381
-	-rm -f 7z/$(am__dirstamp)
2382
-	-rm -f 7z/Archive/7z/$(DEPDIR)/$(am__dirstamp)
2383
-	-rm -f 7z/Archive/7z/$(am__dirstamp)
2384
-	-rm -f jsparse/$(DEPDIR)/$(am__dirstamp)
2385
-	-rm -f jsparse/$(am__dirstamp)
2386
-	-rm -f nsis/$(DEPDIR)/$(am__dirstamp)
2387
-	-rm -f nsis/$(am__dirstamp)
2388
-	-rm -f regex/$(DEPDIR)/$(am__dirstamp)
2389
-	-rm -f regex/$(am__dirstamp)
2390 2376
 
2391 2377
 maintainer-clean-generic:
2392 2378
 	@echo "This command is intended for maintainers to use"
... ...
@@ -2398,7 +2247,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
2398 2398
 	clean-noinstLTLIBRARIES mostlyclean-am
2399 2399
 
2400 2400
 distclean: distclean-recursive
2401
-	-rm -rf ../libclamunrar/$(DEPDIR) ../libclamunrar_iface/$(DEPDIR) ./$(DEPDIR) 7z/$(DEPDIR) 7z/Archive/7z/$(DEPDIR) jsparse/$(DEPDIR) nsis/$(DEPDIR) regex/$(DEPDIR)
2401
+	-rm -rf ./$(DEPDIR)
2402 2402
 	-rm -f Makefile
2403 2403
 distclean-am: clean-am distclean-compile distclean-generic \
2404 2404
 	distclean-tags
... ...
@@ -2444,7 +2293,7 @@ install-ps-am:
2444 2444
 installcheck-am:
2445 2445
 
2446 2446
 maintainer-clean: maintainer-clean-recursive
2447
-	-rm -rf ../libclamunrar/$(DEPDIR) ../libclamunrar_iface/$(DEPDIR) ./$(DEPDIR) 7z/$(DEPDIR) 7z/Archive/7z/$(DEPDIR) jsparse/$(DEPDIR) nsis/$(DEPDIR) regex/$(DEPDIR)
2447
+	-rm -rf ./$(DEPDIR)
2448 2448
 	-rm -f Makefile
2449 2449
 maintainer-clean-am: distclean-am maintainer-clean-generic
2450 2450
 
... ...
@@ -88,8 +88,7 @@ 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__dirstamp = $(am__leading_dot)dirstamp
92
-am_dld_link_la_OBJECTS = loaders/dld_link.lo
91
+am_dld_link_la_OBJECTS = dld_link.lo
93 92
 dld_link_la_OBJECTS = $(am_dld_link_la_OBJECTS)
94 93
 AM_V_lt = $(am__v_lt_$(V))
95 94
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
... ...
@@ -99,30 +98,29 @@ dld_link_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
99 99
 	$(dld_link_la_LDFLAGS) $(LDFLAGS) -o $@
100 100
 am__DEPENDENCIES_1 =
101 101
 dlopen_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
102
-am_dlopen_la_OBJECTS = loaders/dlopen.lo
102
+am_dlopen_la_OBJECTS = dlopen.lo
103 103
 dlopen_la_OBJECTS = $(am_dlopen_la_OBJECTS)
104 104
 dlopen_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
105 105
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
106 106
 	$(dlopen_la_LDFLAGS) $(LDFLAGS) -o $@
107 107
 dyld_la_LIBADD =
108
-am_dyld_la_OBJECTS = loaders/dyld.lo
108
+am_dyld_la_OBJECTS = dyld.lo
109 109
 dyld_la_OBJECTS = $(am_dyld_la_OBJECTS)
110 110
 dyld_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
111 111
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
112 112
 	$(dyld_la_LDFLAGS) $(LDFLAGS) -o $@
113
-am_libltdl_la_OBJECTS = loaders/libltdl_la-preopen.lo \
114
-	libltdl_la-lt__alloc.lo libltdl_la-lt_dlloader.lo \
115
-	libltdl_la-lt_error.lo libltdl_la-ltdl.lo libltdl_la-slist.lo
113
+am_libltdl_la_OBJECTS = libltdl_la-preopen.lo libltdl_la-lt__alloc.lo \
114
+	libltdl_la-lt_dlloader.lo libltdl_la-lt_error.lo \
115
+	libltdl_la-ltdl.lo libltdl_la-slist.lo
116 116
 libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS)
117 117
 libltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
118 118
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
119 119
 	$(libltdl_la_LDFLAGS) $(LDFLAGS) -o $@
120 120
 @INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir)
121 121
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
122
-am__objects_1 = loaders/libltdlc_la-preopen.lo \
123
-	libltdlc_la-lt__alloc.lo libltdlc_la-lt_dlloader.lo \
124
-	libltdlc_la-lt_error.lo libltdlc_la-ltdl.lo \
125
-	libltdlc_la-slist.lo
122
+am__objects_1 = libltdlc_la-preopen.lo libltdlc_la-lt__alloc.lo \
123
+	libltdlc_la-lt_dlloader.lo libltdlc_la-lt_error.lo \
124
+	libltdlc_la-ltdl.lo libltdlc_la-slist.lo
126 125
 am_libltdlc_la_OBJECTS = $(am__objects_1)
127 126
 libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS)
128 127
 libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
... ...
@@ -130,21 +128,21 @@ libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
130 130
 	$(libltdlc_la_LDFLAGS) $(LDFLAGS) -o $@
131 131
 @CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath =
132 132
 load_add_on_la_LIBADD =
133
-am_load_add_on_la_OBJECTS = loaders/load_add_on.lo
133
+am_load_add_on_la_OBJECTS = load_add_on.lo
134 134
 load_add_on_la_OBJECTS = $(am_load_add_on_la_OBJECTS)
135 135
 load_add_on_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
136 136
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
137 137
 	$(AM_CFLAGS) $(CFLAGS) $(load_add_on_la_LDFLAGS) $(LDFLAGS) -o \
138 138
 	$@
139 139
 loadlibrary_la_LIBADD =
140
-am_loadlibrary_la_OBJECTS = loaders/loadlibrary.lo
140
+am_loadlibrary_la_OBJECTS = loadlibrary.lo
141 141
 loadlibrary_la_OBJECTS = $(am_loadlibrary_la_OBJECTS)
142 142
 loadlibrary_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
143 143
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
144 144
 	$(AM_CFLAGS) $(CFLAGS) $(loadlibrary_la_LDFLAGS) $(LDFLAGS) -o \
145 145
 	$@
146 146
 shl_load_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
147
-am_shl_load_la_OBJECTS = loaders/shl_load.lo
147
+am_shl_load_la_OBJECTS = shl_load.lo
148 148
 shl_load_la_OBJECTS = $(am_shl_load_la_OBJECTS)
149 149
 shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
150 150
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
... ...
@@ -495,120 +493,103 @@ clean-noinstLTLIBRARIES:
495 495
 	  echo "rm -f \"$${dir}/so_locations\""; \
496 496
 	  rm -f "$${dir}/so_locations"; \
497 497
 	done
498
-loaders/$(am__dirstamp):
499
-	@$(MKDIR_P) loaders
500
-	@: > loaders/$(am__dirstamp)
501
-loaders/$(DEPDIR)/$(am__dirstamp):
502
-	@$(MKDIR_P) loaders/$(DEPDIR)
503
-	@: > loaders/$(DEPDIR)/$(am__dirstamp)
504
-loaders/dld_link.lo: loaders/$(am__dirstamp) \
505
-	loaders/$(DEPDIR)/$(am__dirstamp)
506 498
 dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) 
507 499
 	$(AM_V_CCLD)$(dld_link_la_LINK)  $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS)
508
-loaders/dlopen.lo: loaders/$(am__dirstamp) \
509
-	loaders/$(DEPDIR)/$(am__dirstamp)
510 500
 dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) 
511 501
 	$(AM_V_CCLD)$(dlopen_la_LINK)  $(dlopen_la_OBJECTS) $(dlopen_la_LIBADD) $(LIBS)
512
-loaders/dyld.lo: loaders/$(am__dirstamp) \
513
-	loaders/$(DEPDIR)/$(am__dirstamp)
514 502
 dyld.la: $(dyld_la_OBJECTS) $(dyld_la_DEPENDENCIES) 
515 503
 	$(AM_V_CCLD)$(dyld_la_LINK)  $(dyld_la_OBJECTS) $(dyld_la_LIBADD) $(LIBS)
516
-loaders/libltdl_la-preopen.lo: loaders/$(am__dirstamp) \
517
-	loaders/$(DEPDIR)/$(am__dirstamp)
518 504
 libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) 
519 505
 	$(AM_V_CCLD)$(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
520
-loaders/libltdlc_la-preopen.lo: loaders/$(am__dirstamp) \
521
-	loaders/$(DEPDIR)/$(am__dirstamp)
522 506
 libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) 
523 507
 	$(AM_V_CCLD)$(libltdlc_la_LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
524
-loaders/load_add_on.lo: loaders/$(am__dirstamp) \
525
-	loaders/$(DEPDIR)/$(am__dirstamp)
526 508
 load_add_on.la: $(load_add_on_la_OBJECTS) $(load_add_on_la_DEPENDENCIES) 
527 509
 	$(AM_V_CCLD)$(load_add_on_la_LINK)  $(load_add_on_la_OBJECTS) $(load_add_on_la_LIBADD) $(LIBS)
528
-loaders/loadlibrary.lo: loaders/$(am__dirstamp) \
529
-	loaders/$(DEPDIR)/$(am__dirstamp)
530 510
 loadlibrary.la: $(loadlibrary_la_OBJECTS) $(loadlibrary_la_DEPENDENCIES) 
531 511
 	$(AM_V_CCLD)$(loadlibrary_la_LINK)  $(loadlibrary_la_OBJECTS) $(loadlibrary_la_LIBADD) $(LIBS)
532
-loaders/shl_load.lo: loaders/$(am__dirstamp) \
533
-	loaders/$(DEPDIR)/$(am__dirstamp)
534 512
 shl_load.la: $(shl_load_la_OBJECTS) $(shl_load_la_DEPENDENCIES) 
535 513
 	$(AM_V_CCLD)$(shl_load_la_LINK)  $(shl_load_la_OBJECTS) $(shl_load_la_LIBADD) $(LIBS)
536 514
 
537 515
 mostlyclean-compile:
538 516
 	-rm -f *.$(OBJEXT)
539
-	-rm -f loaders/dld_link.$(OBJEXT)
540
-	-rm -f loaders/dld_link.lo
541
-	-rm -f loaders/dlopen.$(OBJEXT)
542
-	-rm -f loaders/dlopen.lo
543
-	-rm -f loaders/dyld.$(OBJEXT)
544
-	-rm -f loaders/dyld.lo
545
-	-rm -f loaders/libltdl_la-preopen.$(OBJEXT)
546
-	-rm -f loaders/libltdl_la-preopen.lo
547
-	-rm -f loaders/libltdlc_la-preopen.$(OBJEXT)
548
-	-rm -f loaders/libltdlc_la-preopen.lo
549
-	-rm -f loaders/load_add_on.$(OBJEXT)
550
-	-rm -f loaders/load_add_on.lo
551
-	-rm -f loaders/loadlibrary.$(OBJEXT)
552
-	-rm -f loaders/loadlibrary.lo
553
-	-rm -f loaders/shl_load.$(OBJEXT)
554
-	-rm -f loaders/shl_load.lo
555 517
 
556 518
 distclean-compile:
557 519
 	-rm -f *.tab.c
558 520
 
521
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dld_link.Plo@am__quote@
522
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlopen.Plo@am__quote@
523
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dyld.Plo@am__quote@
559 524
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-lt__alloc.Plo@am__quote@
560 525
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-lt_dlloader.Plo@am__quote@
561 526
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-lt_error.Plo@am__quote@
562 527
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-ltdl.Plo@am__quote@
528
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-preopen.Plo@am__quote@
563 529
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdl_la-slist.Plo@am__quote@
564 530
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-lt__alloc.Plo@am__quote@
565 531
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-lt_dlloader.Plo@am__quote@
566 532
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-lt_error.Plo@am__quote@
567 533
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-ltdl.Plo@am__quote@
534
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-preopen.Plo@am__quote@
568 535
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libltdlc_la-slist.Plo@am__quote@
569
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/dld_link.Plo@am__quote@
570
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/dlopen.Plo@am__quote@
571
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/dyld.Plo@am__quote@
572
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/libltdl_la-preopen.Plo@am__quote@
573
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/libltdlc_la-preopen.Plo@am__quote@
574
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/load_add_on.Plo@am__quote@
575
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/loadlibrary.Plo@am__quote@
576
-@AMDEP_TRUE@@am__include@ @am__quote@loaders/$(DEPDIR)/shl_load.Plo@am__quote@
536
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_add_on.Plo@am__quote@
537
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadlibrary.Plo@am__quote@
538
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shl_load.Plo@am__quote@
577 539
 
578 540
 .c.o:
579
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
580
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
581
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
541
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
542
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
582 543
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
583 544
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
584 545
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
585
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
546
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
586 547
 
587 548
 .c.obj:
588
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
589
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
590
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
549
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
550
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
591 551
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
592 552
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
593 553
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
594
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
554
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
595 555
 
596 556
 .c.lo:
597
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
598
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
599
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
557
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
558
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
600 559
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
601 560
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
602 561
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
603 562
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
604 563
 
605
-loaders/libltdl_la-preopen.lo: loaders/preopen.c
606
-@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
607
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) loaders/$(DEPDIR)/libltdl_la-preopen.Tpo loaders/$(DEPDIR)/libltdl_la-preopen.Plo
564
+dld_link.lo: loaders/dld_link.c
565
+@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
566
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dld_link.Tpo $(DEPDIR)/dld_link.Plo
608 567
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
609
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='loaders/libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
568
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/dld_link.c' object='dld_link.lo' libtool=yes @AMDEPBACKSLASH@
610 569
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
611
-@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
570
+@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
571
+
572
+dlopen.lo: loaders/dlopen.c
573
+@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
574
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dlopen.Tpo $(DEPDIR)/dlopen.Plo
575
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
576
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/dlopen.c' object='dlopen.lo' libtool=yes @AMDEPBACKSLASH@
577
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
578
+@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
579
+
580
+dyld.lo: loaders/dyld.c
581
+@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
582
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dyld.Tpo $(DEPDIR)/dyld.Plo
583
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
584
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/dyld.c' object='dyld.lo' libtool=yes @AMDEPBACKSLASH@
585
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
586
+@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
587
+
588
+libltdl_la-preopen.lo: loaders/preopen.c
589
+@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
590
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-preopen.Tpo $(DEPDIR)/libltdl_la-preopen.Plo
591
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
592
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
593
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
594
+@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
612 595
 
613 596
 libltdl_la-lt__alloc.lo: lt__alloc.c
614 597
 @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
... ...
@@ -650,13 +631,13 @@ libltdl_la-slist.lo: slist.c
650 650
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
651 651
 @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
652 652
 
653
-loaders/libltdlc_la-preopen.lo: loaders/preopen.c
654
-@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
655
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) loaders/$(DEPDIR)/libltdlc_la-preopen.Tpo loaders/$(DEPDIR)/libltdlc_la-preopen.Plo
653
+libltdlc_la-preopen.lo: loaders/preopen.c
654
+@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
655
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-preopen.Tpo $(DEPDIR)/libltdlc_la-preopen.Plo
656 656
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
657
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='loaders/libltdlc_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
657
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/preopen.c' object='libltdlc_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@
658 658
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
659
-@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
659
+@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
660 660
 
661 661
 libltdlc_la-lt__alloc.lo: lt__alloc.c
662 662
 @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
... ...
@@ -698,12 +679,35 @@ libltdlc_la-slist.lo: slist.c
698 698
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
699 699
 @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
700 700
 
701
+load_add_on.lo: loaders/load_add_on.c
702
+@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
703
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/load_add_on.Tpo $(DEPDIR)/load_add_on.Plo
704
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
705
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/load_add_on.c' object='load_add_on.lo' libtool=yes @AMDEPBACKSLASH@
706
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
707
+@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
708
+
709
+loadlibrary.lo: loaders/loadlibrary.c
710
+@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
711
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadlibrary.Tpo $(DEPDIR)/loadlibrary.Plo
712
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
713
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/loadlibrary.c' object='loadlibrary.lo' libtool=yes @AMDEPBACKSLASH@
714
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
715
+@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
716
+
717
+shl_load.lo: loaders/shl_load.c
718
+@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
719
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shl_load.Tpo $(DEPDIR)/shl_load.Plo
720
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
721
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loaders/shl_load.c' object='shl_load.lo' libtool=yes @AMDEPBACKSLASH@
722
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
723
+@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
724
+
701 725
 mostlyclean-libtool:
702 726
 	-rm -f *.lo
703 727
 
704 728
 clean-libtool:
705 729
 	-rm -rf .libs _libs
706
-	-rm -rf loaders/.libs loaders/_libs
707 730
 install-includeHEADERS: $(include_HEADERS)
708 731
 	@$(NORMAL_INSTALL)
709 732
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
... ...
@@ -859,8 +863,6 @@ clean-generic:
859 859
 distclean-generic:
860 860
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
861 861
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
862
-	-rm -f loaders/$(DEPDIR)/$(am__dirstamp)
863
-	-rm -f loaders/$(am__dirstamp)
864 862
 
865 863
 maintainer-clean-generic:
866 864
 	@echo "This command is intended for maintainers to use"
... ...
@@ -872,7 +874,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) loaders/$(DEPDIR)
875
+	-rm -rf ./$(DEPDIR)
876 876
 	-rm -f Makefile
877 877
 distclean-am: clean-am distclean-compile distclean-generic \
878 878
 	distclean-tags
... ...
@@ -918,7 +920,7 @@ install-ps-am:
918 918
 installcheck-am:
919 919
 
920 920
 maintainer-clean: maintainer-clean-am
921
-	-rm -rf ./$(DEPDIR) loaders/$(DEPDIR)
921
+	-rm -rf ./$(DEPDIR)
922 922
 	-rm -f Makefile
923 923
 maintainer-clean-am: distclean-am maintainer-clean-generic
924 924
 
... ...
@@ -61,6 +61,126 @@ 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
+
64 184
 const char *filelist(const struct optstruct *opts, int *err)
65 185
 {
66 186
 	static char buff[1025];
67 187
deleted file mode 100644
... ...
@@ -1,159 +0,0 @@
1
-/*
2
- *  Copyright (C) 2007-2009 Sourcefire, Inc.
3
- *
4
- *  Authors: Tomasz Kojm
5
- *
6
- *  This program is free software; you can redistribute it and/or modify
7
- *  it under the terms of the GNU General Public License version 2 as
8
- *  published by the Free Software Foundation.
9
- *
10
- *  This program is distributed in the hope that it will be useful,
11
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
- *  GNU General Public License for more details.
14
- *
15
- *  You should have received a copy of the GNU General Public License
16
- *  along with this program; if not, write to the Free Software
17
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18
- *  MA 02110-1301, USA.
19
- */
20
-#if HAVE_CONFIG_H
21
-#include "clamav-config.h"
22
-#endif
23
-#include <clamav.h>
24
-#include <stdio.h>
25
-#include <stdlib.h>
26
-#ifdef	HAVE_UNISTD_H
27
-#include <unistd.h>
28
-#endif
29
-#include <string.h>
30
-#include <time.h>
31
-#include <sys/types.h>
32
-#include <sys/stat.h>
33
-#ifndef _WIN32
34
-#include <sys/socket.h>
35
-#endif
36
-#include <dirent.h>
37
-#include <fcntl.h>
38
-#include <ctype.h>
39
-#include <errno.h>
40
-#include "shared/optparser.h"
41
-#include "libclamav/others.h" /* for cli_rmdirs() */
42
-
43
-/* CL_NOLIBCLAMAV means to omit functions that depends on libclamav */
44
-char *freshdbdir(void)
45
-{
46
-	struct cl_cvd *d1, *d2;
47
-	struct optstruct *opts;
48
-	const struct optstruct *opt;
49
-	const char *dbdir;
50
-	char *retdir;
51
-
52
-
53
-    /* try to find the most up-to-date db directory */
54
-    dbdir = cl_retdbdir();
55
-    if((opts = optparse(CONFDIR_FRESHCLAM, 0, NULL, 0, OPT_FRESHCLAM, 0, NULL))) {
56
-	if((opt = optget(opts, "DatabaseDirectory"))->enabled) {
57
-	    if(strcmp(dbdir, opt->strarg)) {
58
-		    char *daily = (char *) malloc(strlen(opt->strarg) + strlen(dbdir) + 30);
59
-		sprintf(daily, "%s"PATHSEP"daily.cvd", opt->strarg);
60
-		if(access(daily, R_OK))
61
-		    sprintf(daily, "%s"PATHSEP"daily.cld", opt->strarg);
62
-
63
-		if(!access(daily, R_OK) && (d1 = cl_cvdhead(daily))) {
64
-		    sprintf(daily, "%s"PATHSEP"daily.cvd", dbdir);
65
-		    if(access(daily, R_OK))
66
-			sprintf(daily, "%s"PATHSEP"daily.cld", dbdir);
67
-
68
-		    if(!access(daily, R_OK) && (d2 = cl_cvdhead(daily))) {
69
-			free(daily);
70
-			if(d1->version > d2->version)
71
-			    dbdir = opt->strarg;
72
-			cl_cvdfree(d2);
73
-		    } else {
74
-			free(daily);
75
-			dbdir = opt->strarg;
76
-		    }
77
-		    cl_cvdfree(d1);
78
-		} else {
79
-		    free(daily);
80
-		}
81
-	    }
82
-	}
83
-    }
84
-
85
-    retdir = strdup(dbdir);
86
-
87
-    if(opts)
88
-	optfree(opts);
89
-
90
-    return retdir;
91
-}
92
-
93
-void print_version(const char *dbdir)
94
-{
95
-	char *fdbdir = NULL, *path;
96
-	const char *pt;
97
-	struct cl_cvd *daily;
98
-	time_t db_time;
99
-	unsigned int db_version = 0;
100
-
101
-
102
-    if(dbdir)
103
-	pt = dbdir;
104
-    else
105
-	pt = fdbdir = freshdbdir();
106
-
107
-    if(!pt) {
108
-	printf("ClamAV %s\n",get_version());
109
-	return;
110
-    }
111
-
112
-    if(!(path = malloc(strlen(pt) + 11))) {
113
-	if(!dbdir)
114
-	    free(fdbdir);
115
-	return;
116
-    }
117
-
118
-    sprintf(path, "%s"PATHSEP"daily.cvd", pt);
119
-    if(!access(path, R_OK)) {
120
-	daily = cl_cvdhead(path);
121
-	if(daily) {
122
-	    db_version = daily->version;
123
-	    db_time = daily->stime;
124
-	    cl_cvdfree(daily);
125
-	}
126
-    }
127
-
128
-    sprintf(path, "%s"PATHSEP"daily.cld", pt);
129
-    if(!access(path, R_OK)) {
130
-	daily = cl_cvdhead(path);
131
-	if(daily) {
132
-	    if(daily->version > db_version) {
133
-		db_version = daily->version;
134
-		db_time = daily->stime;
135
-	    }
136
-	    cl_cvdfree(daily);
137
-	}
138
-    }
139
-
140
-    if(!dbdir)
141
-	free(fdbdir);
142
-
143
-    if(db_version) {
144
-	printf("ClamAV %s/%u/%s", get_version(), db_version, ctime(&db_time));
145
-    } else {
146
-	printf("ClamAV %s\n",get_version());
147
-    }
148
-
149
-    free(path);
150
-}
151
-
152
-int check_flevel(void)
153
-{
154
-    if(cl_retflevel() < CL_FLEVEL) {
155
-	fprintf(stderr, "ERROR: This tool requires libclamav with functionality level %u or higher (current f-level: %u)\n", CL_FLEVEL, cl_retflevel());
156
-	return 1;
157
-    }
158
-    return 0;
159
-}
... ...
@@ -19,6 +19,18 @@
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 \
22 34
     vba.c \
23 35
     vba.h \
24 36
     sigtool.c
... ...
@@ -26,5 +38,5 @@ sigtool_SOURCES = \
26 26
 AM_CFLAGS=@WERR_CFLAGS@
27 27
 DEFS = @DEFS@ -DCL_NOTHREADS
28 28
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
29
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
29
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
30 30
 CLEANFILES=*.gcda *.gcno
... ...
@@ -76,7 +76,9 @@ CONFIG_CLEAN_FILES =
76 76
 CONFIG_CLEAN_VPATH_FILES =
77 77
 am__installdirs = "$(DESTDIR)$(bindir)"
78 78
 PROGRAMS = $(bin_PROGRAMS)
79
-am_sigtool_OBJECTS = vba.$(OBJEXT) sigtool.$(OBJEXT)
79
+am_sigtool_OBJECTS = output.$(OBJEXT) getopt.$(OBJEXT) \
80
+	optparser.$(OBJEXT) misc.$(OBJEXT) cdiff.$(OBJEXT) \
81
+	tar.$(OBJEXT) vba.$(OBJEXT) sigtool.$(OBJEXT)
80 82
 sigtool_OBJECTS = $(am_sigtool_OBJECTS)
81 83
 sigtool_LDADD = $(LDADD)
82 84
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -177,7 +179,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
177 177
 LIBLTDL = @LIBLTDL@
178 178
 LIBM = @LIBM@
179 179
 LIBOBJS = @LIBOBJS@
180
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
180
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
181 181
 LIBTOOL = @LIBTOOL@
182 182
 LIPO = @LIPO@
183 183
 LN_S = @LN_S@
... ...
@@ -279,6 +281,18 @@ 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 \
282 294
     vba.c \
283 295
     vba.h \
284 296
     sigtool.c
... ...
@@ -389,36 +403,135 @@ mostlyclean-compile:
389 389
 distclean-compile:
390 390
 	-rm -f *.tab.c
391 391
 
392
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiff.Po@am__quote@
393
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
394
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
395
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.Po@am__quote@
396
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
392 397
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigtool.Po@am__quote@
398
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tar.Po@am__quote@
393 399
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vba.Po@am__quote@
394 400
 
395 401
 .c.o:
396
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
397
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
398
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
402
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
403
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
399 404
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
400 405
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
401 406
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
402
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
407
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
403 408
 
404 409
 .c.obj:
405
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
406
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
407
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
410
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
411
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
408 412
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
409 413
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
410 414
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
411
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
415
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
412 416
 
413 417
 .c.lo:
414
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
415
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
416
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
418
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
419
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
417 420
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
418 421
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
419 422
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
420 423
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
421 424
 
425
+output.o: $(top_srcdir)/shared/output.c
426
+@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
427
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
428
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
429
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@
430
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
431
+@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
432
+
433
+output.obj: $(top_srcdir)/shared/output.c
434
+@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`
435
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/output.Tpo $(DEPDIR)/output.Po
436
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
437
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@
438
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
439
+@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`
440
+
441
+getopt.o: $(top_srcdir)/shared/getopt.c
442
+@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
443
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
444
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
445
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
446
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
447
+@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
448
+
449
+getopt.obj: $(top_srcdir)/shared/getopt.c
450
+@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`
451
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
452
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
453
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
454
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
455
+@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`
456
+
457
+optparser.o: $(top_srcdir)/shared/optparser.c
458
+@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
459
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
460
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
461
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.o' libtool=no @AMDEPBACKSLASH@
462
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
463
+@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
464
+
465
+optparser.obj: $(top_srcdir)/shared/optparser.c
466
+@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`
467
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po
468
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
469
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.obj' libtool=no @AMDEPBACKSLASH@
470
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
471
+@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`
472
+
473
+misc.o: $(top_srcdir)/shared/misc.c
474
+@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
475
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
476
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
477
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
478
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
479
+@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
480
+
481
+misc.obj: $(top_srcdir)/shared/misc.c
482
+@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`
483
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
484
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
485
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
486
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
487
+@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`
488
+
489
+cdiff.o: $(top_srcdir)/shared/cdiff.c
490
+@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
491
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
492
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
493
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.o' libtool=no @AMDEPBACKSLASH@
494
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
495
+@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
496
+
497
+cdiff.obj: $(top_srcdir)/shared/cdiff.c
498
+@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`
499
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cdiff.Tpo $(DEPDIR)/cdiff.Po
500
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
501
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/cdiff.c' object='cdiff.obj' libtool=no @AMDEPBACKSLASH@
502
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
503
+@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`
504
+
505
+tar.o: $(top_srcdir)/shared/tar.c
506
+@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
507
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
508
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
509
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.o' libtool=no @AMDEPBACKSLASH@
510
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
511
+@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
512
+
513
+tar.obj: $(top_srcdir)/shared/tar.c
514
+@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`
515
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tar.Tpo $(DEPDIR)/tar.Po
516
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
517
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/tar.c' object='tar.obj' libtool=no @AMDEPBACKSLASH@
518
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
519
+@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`
520
+
422 521
 mostlyclean-libtool:
423 522
 	-rm -f *.lo
424 523
 
... ...
@@ -471,27 +471,24 @@ distclean-compile:
471 471
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamd-check_clamd.Po@am__quote@
472 472
 
473 473
 .c.o:
474
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
475
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
476
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
474
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
475
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
477 476
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
478 477
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
479 478
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
480
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
479
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
481 480
 
482 481
 .c.obj:
483
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
484
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
485
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
482
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
483
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
486 484
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
487 485
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
488 486
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
489
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
487
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
490 488
 
491 489
 .c.lo:
492
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
493
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
494
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
490
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
491
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
495 492
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
496 493
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
497 494
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
... ...
@@ -427,9 +427,6 @@
427 427
 /* The archive extension */
428 428
 #define LT_LIBEXT "dll"
429 429
 
430
-/* The archive prefix */
431
-/* #undef LT_LIBPREFIX */
432
-
433 430
 /* Define to the extension used for runtime loadable modules, say, ".so". */
434 431
 #define LT_MODULE_EXT ".dll"
435 432
 
... ...
@@ -508,7 +505,7 @@
508 508
 /* #undef USE_SYSLOG */
509 509
 
510 510
 /* Version number of package */
511
-#define VERSION "devel-clamav-0.97-79-g404d30a"
511
+#define VERSION "devel-clamav-0.97-75-gd955dc2"
512 512
 
513 513
 /* Version suffix for package */
514 514
 #define VERSION_SUFFIX ""
... ...
@@ -153,6 +153,7 @@
153 153
   </ItemDefinitionGroup>
154 154
   <ItemGroup>
155 155
     <ClCompile Include="..\clambc\bcrun.c"/>
156
+    <ClCompile Include="..\shared\misc.c"/>
156 157
   </ItemGroup>
157 158
   <ItemGroup>
158 159
     <ResourceCompile Include="res\clambc.rc"/>
... ...
@@ -153,6 +153,7 @@
153 153
   </ItemDefinitionGroup>
154 154
   <ItemGroup>
155 155
     <ClCompile Include="..\clamconf\clamconf.c"/>
156
+    <ClCompile Include="..\shared\misc.c"/>
156 157
   </ItemGroup>
157 158
   <ItemGroup>
158 159
     <ResourceCompile Include="res\clamconf.rc"/>
... ...
@@ -163,6 +163,8 @@
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"/>
166 168
   </ItemGroup>
167 169
   <ItemGroup>
168 170
     <ProjectReference Include="libclamav.vcxproj">
... ...
@@ -155,9 +155,13 @@
155 155
     <ResourceCompile Include="res\clamdscan.rc"/>
156 156
   </ItemGroup>
157 157
   <ItemGroup>
158
+    <ClCompile Include="..\shared\clamdcom.c"/>
158 159
     <ClCompile Include="..\clamdscan\clamdscan.c"/>
159 160
     <ClCompile Include="..\clamdscan\client.c"/>
160 161
     <ClCompile Include="..\clamdscan\proto.c"/>
162
+    <ClCompile Include="..\shared\actions.c"/>
163
+    <ClCompile Include="..\shared\misc.c"/>
164
+    <ClCompile Include="..\shared\output.c"/>
161 165
   </ItemGroup>
162 166
   <ItemGroup>
163 167
     <ProjectReference Include="libclamav.vcxproj">
... ...
@@ -157,6 +157,9 @@
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"/>
160 163
   </ItemGroup>
161 164
   <ItemGroup>
162 165
     <ProjectReference Include="libclamav.vcxproj">
... ...
@@ -159,6 +159,7 @@
159 159
     <ResourceCompile Include="res\freshclam.rc"/>
160 160
   </ItemGroup>
161 161
   <ItemGroup>
162
+    <ClCompile Include="..\shared\clamdcom.c"/>
162 163
     <ClCompile Include="..\freshclam\dns.c"/>
163 164
     <ClCompile Include="..\freshclam\execute.c"/>
164 165
     <ClCompile Include="..\freshclam\freshclam.c"/>
... ...
@@ -166,6 +167,10 @@
166 166
     <ClCompile Include="..\freshclam\mirman.c"/>
167 167
     <ClCompile Include="..\freshclam\nonblock.c"/>
168 168
     <ClCompile Include="..\freshclam\notify.c"/>
169
+    <ClCompile Include="..\shared\cdiff.c"/>
170
+    <ClCompile Include="..\shared\misc.c"/>
171
+    <ClCompile Include="..\shared\output.c"/>
172
+    <ClCompile Include="..\shared\tar.c"/>
169 173
     <ClCompile Include="compat\resolv.c"/>
170 174
     <ClCompile Include="compat\strptime.c"/>
171 175
   </ItemGroup>
... ...
@@ -155,6 +155,10 @@
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"/>
158 162
     <ClCompile Include="..\sigtool\sigtool.c"/>
159 163
     <ClCompile Include="..\sigtool\vba.c"/>
160 164
   </ItemGroup>