@@ -40,5 +40,3 @@ lcov:

 quick-check:

 	($(MAKE); cd unit_tests; $(MAKE) quick-check)

-dist-hook:

-	make -C libclamav/c++ dist-hook

@@ -741,9 +741,6 @@ distdir: $(DISTFILES)

 	      || exit 1; \

 	  fi; \

 	done

-	$(MAKE) $(AM_MAKEFLAGS) \

-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \

-	  dist-hook

 	-test -n "$(am__skip_mode_fix)" \

 	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

@@ -968,8 +965,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

 	all all-am am--refresh check check-am clean clean-generic \

 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \

-	dist-zip distcheck distclean distclean-generic distclean-hdr \

+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \

+	distcheck distclean distclean-generic distclean-hdr \

 	distclean-libtool distclean-tags distcleancheck distdir \

 	distuninstallcheck dvi dvi-am html html-am info info-am \

 	install install-am install-binSCRIPTS install-data \

@@ -989,9 +986,6 @@ lcov:

 quick-check:

 	($(MAKE); cd unit_tests; $(MAKE) quick-check)

-dist-hook:

-	make -C libclamav/c++ dist-hook

-

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT:

@@ -65,7 +65,7 @@ LLVM_INCLUDES=-I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include

 LLVM_DEFS=-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE

 LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings

-EXTRA_DIST=llvm

+EXTRA_DIST=$(top_srcdir)/llvm llvmdejagnu.sh

 libllvmsystem_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)

 libllvmsystem_la_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions

@@ -709,7 +709,6 @@ llvmunittest_ExecutionEngine_SOURCES=\

 check_LTLIBRARIES=libllvmbitreader.la libllvmasmprinter.la libllvmbitwriter.la libllvmasmparser.la libgoogletest.la libllvminterpreter.la

 check_PROGRAMS=lli llc llvm-as llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT

 check_SCRIPTS=llvmdejagnu.sh

-

 TESTS_ENVIRONMENT=export GMAKE=@GMAKE@;

 TESTS=llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT

 @ifGNUmake@ TESTS+=llvmdejagnu.sh

@@ -767,7 +766,11 @@ build-llvm-for-check:

 	+$(GMAKE) -C llvm OPTIMIZE_OPTION=-O2 tools-only

 clean-local:

-	+$(GMAKE) -C llvm clean

+	+$(GMAKE) -C llvm/test clean

+	rm -rf llvm/Release llvm/Debug

+	rm -f *.inc

+	rm -f llvm/include/llvm/Intrinsics.gen

+	rm -f llvm/test/site.exp llvm/test/site.bak llvm/test/*.out llvm/test/*.sum llvm/test/*.log

 check-llvm: build-llvm-for-check

 	+$(GMAKE) -C llvm check

@@ -775,6 +778,9 @@ check-llvm: build-llvm-for-check

 # rm configure generated files

 dist-hook:

-	rm -f llvm/Release/bin/* llvm/Debug/bin/*

-	rm -f llvm/include/llvm/Config/*.h llvm/include/llvm/Config/*.def llvm/Makefile.config llvm/llvm.spec llvm/docs/doxygen.cfg llvm/tools/llvmc/plugins/Base/Base.td tools/llvm-config/llvm-config.in

+	make -C llvm dist-hook

+	rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec

+	rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in

+	rm -f $(distdir)/llvm/include/llvm/Intrinsics.gen

+	rm -f $(distdir)/llvm/include/llvm/Support/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status

@@ -966,7 +966,7 @@ LLVM_INCLUDES = -I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include

 # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE

 LLVM_DEFS = -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE

 LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings

-EXTRA_DIST = llvm

+EXTRA_DIST = $(top_srcdir)/llvm llvmdejagnu.sh

 libllvmsystem_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS)

 libllvmsystem_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions

 libllvmsystem_la_LDFLAGS = -pthread

@@ -6202,7 +6202,11 @@ build-llvm-for-check:

 	+$(GMAKE) -C llvm OPTIMIZE_OPTION=-O2 tools-only

 clean-local:

-	+$(GMAKE) -C llvm clean

+	+$(GMAKE) -C llvm/test clean

+	rm -rf llvm/Release llvm/Debug

+	rm -f *.inc

+	rm -f llvm/include/llvm/Intrinsics.gen

+	rm -f llvm/test/site.exp llvm/test/site.bak llvm/test/*.out llvm/test/*.sum llvm/test/*.log

 check-llvm: build-llvm-for-check

 	+$(GMAKE) -C llvm check

@@ -6210,8 +6214,11 @@ check-llvm: build-llvm-for-check

 # rm configure generated files

 dist-hook:

-	rm -f llvm/Release/bin/* llvm/Debug/bin/*

-	rm -f llvm/include/llvm/Config/*.h llvm/include/llvm/Config/*.def llvm/Makefile.config llvm/llvm.spec llvm/docs/doxygen.cfg llvm/tools/llvmc/plugins/Base/Base.td tools/llvm-config/llvm-config.in

+	make -C llvm dist-hook

+	rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec

+	rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in

+	rm -f $(distdir)/llvm/include/llvm/Intrinsics.gen

+	rm -f $(distdir)/llvm/include/llvm/Support/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.