Browse code

Clean up distcheck. (bb #2342)

Remove *.pyc, and win32/clamav-for-windows from dist.

Török Edvin authored on 2010/11/05 00:08:25
Showing 4 changed files
... ...
@@ -35,3 +35,5 @@ lcov:
35 35
 quick-check:
36 36
 	($(MAKE); cd unit_tests; $(MAKE) quick-check)
37 37
 
38
+dist-hook:
39
+	rm -rf $(distdir)/win32/clamav-for-windows $(distdir)/win32/build
... ...
@@ -708,6 +708,9 @@ distdir: $(DISTFILES)
708 708
 	      || exit 1; \
709 709
 	  fi; \
710 710
 	done
711
+	$(MAKE) $(AM_MAKEFLAGS) \
712
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
713
+	  dist-hook
711 714
 	-test -n "$(am__skip_mode_fix)" \
712 715
 	|| find "$(distdir)" -type d ! -perm -755 \
713 716
 		-exec chmod u+rwx,go+rx {} \; -o \
... ...
@@ -933,8 +936,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
933 933
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
934 934
 	all all-am am--refresh check check-am clean clean-generic \
935 935
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
936
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
937
-	distcheck distclean distclean-generic distclean-hdr \
936
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
937
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
938 938
 	distclean-libtool distclean-tags distcleancheck distdir \
939 939
 	distuninstallcheck dvi dvi-am html html-am info info-am \
940 940
 	install install-am install-binSCRIPTS install-data \
... ...
@@ -954,6 +957,9 @@ lcov:
954 954
 quick-check:
955 955
 	($(MAKE); cd unit_tests; $(MAKE) quick-check)
956 956
 
957
+dist-hook:
958
+	rm -rf $(distdir)/win32/clamav-for-windows $(distdir)/win32/build
959
+
957 960
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
958 961
 # Otherwise a system limit (for SysV at least) may be exceeded.
959 962
 .NOEXPORT:
... ...
@@ -894,6 +894,7 @@ if MAINTAINER_MODE
894 894
 	rm -f llvm/include/llvm/Intrinsics.gen
895 895
 endif
896 896
 	rm -f llvm/test/site.exp llvm/test/site.bak llvm/test/*.out llvm/test/*.sum llvm/test/*.log
897
+	rm -f $(top_srcdir)/llvm/utils/lit/lit/*.pyc
897 898
 
898 899
 distclean-local:
899 900
 	rm -f llvm/docs/doxygen.cfg llvm/test/Unit/.dir llvm/test/Unit/lit.site.cfg
... ...
@@ -924,9 +925,8 @@ $(top_builddir)/llvm/config.status: llvm/configure
924 924
 
925 925
 endif
926 926
 # rm configure generated files
927
-dist-hook:
927
+dist-hook: clean-local
928 928
 	make -C llvm dist-hook
929 929
 	rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
930 930
 	rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in
931 931
 	rm -f $(distdir)/llvm/include/llvm/System/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
932
-
... ...
@@ -8495,6 +8495,7 @@ uninstall-am:
8495 8495
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@	rm -f *.inc
8496 8496
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@	rm -f llvm/include/llvm/Intrinsics.gen
8497 8497
 @BUILD_EXTERNAL_LLVM_FALSE@	rm -f llvm/test/site.exp llvm/test/site.bak llvm/test/*.out llvm/test/*.sum llvm/test/*.log
8498
+@BUILD_EXTERNAL_LLVM_FALSE@	rm -f $(top_srcdir)/llvm/utils/lit/lit/*.pyc
8498 8499
 
8499 8500
 @BUILD_EXTERNAL_LLVM_FALSE@distclean-local:
8500 8501
 @BUILD_EXTERNAL_LLVM_FALSE@	rm -f llvm/docs/doxygen.cfg llvm/test/Unit/.dir llvm/test/Unit/lit.site.cfg
... ...
@@ -8519,7 +8520,7 @@ uninstall-am:
8519 8519
 @BUILD_EXTERNAL_LLVM_FALSE@	(cd llvm; ./config.status --recheck; ./config.status)
8520 8520
 
8521 8521
 # rm configure generated files
8522
-dist-hook:
8522
+dist-hook: clean-local
8523 8523
 	make -C llvm dist-hook
8524 8524
 	rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
8525 8525
 	rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in