[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit e9ef98ebcb9ad923f744bf78c5cc35ab9372d12a
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:56 2008 +0100

    Revert "Makefile fixes"
    
    This reverts commit fe9a503248ff00426627c4b4544ec6bff614acd1.

diff --git a/ChangeLog b/ChangeLog
index eee1082..bca55d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-Fri Mar  7 15:10:47 CET 2008 (tk)
----------------------------------
-  * Makefile.am,libclamav/lzma/Makefile.am: add licence texts to EXTRA_DIST
-  * libclamunrar/Makefile.am,libclamunrar_iface/Makefile.am: move EXTRA_DIST
-    outside conditional block
-
 Thu Mar  6 20:24:54 CET 2008 (tk)
 ---------------------------------
   * libclamav: always check return value of cli_gentemp()
diff --git a/Makefile.am b/Makefile.am
index c2ee6d4..57a2bac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 
 ACLOCAL_AMFLAGS=-I m4
 SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file
 
 bin_SCRIPTS=clamav-config
 
diff --git a/Makefile.in b/Makefile.in
index 33eb492..7af095d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -248,7 +248,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file
 bin_SCRIPTS = clamav-config
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libclamav.pc
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index b9d5bf7..24467b9 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -55,7 +55,7 @@ target_triplet = @target@
 @VERSIONSCRIPT_TRUE at am__append_1 = -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/libclamav/libclamav.map
 subdir = libclamav
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in COPYING
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
diff --git a/libclamav/lzma/Makefile.am b/libclamav/lzma/Makefile.am
index 6b6d6d4..7f44ce1 100644
--- a/libclamav/lzma/Makefile.am
+++ b/libclamav/lzma/Makefile.am
@@ -24,4 +24,3 @@ liblzma_la_SOURCES = LzmaStateDecode.c \
 		     LzmaStateDecode.h \
 		     LzmaTypes.h
 
-EXTRA_DIST = lzma.txt
diff --git a/libclamav/lzma/Makefile.in b/libclamav/lzma/Makefile.in
index 854efa7..8881030 100644
--- a/libclamav/lzma/Makefile.in
+++ b/libclamav/lzma/Makefile.in
@@ -216,7 +216,6 @@ liblzma_la_SOURCES = LzmaStateDecode.c \
 		     LzmaStateDecode.h \
 		     LzmaTypes.h
 
-EXTRA_DIST = lzma.txt
 all: all-am
 
 .SUFFIXES:
diff --git a/libclamunrar/Makefile.am b/libclamunrar/Makefile.am
index d2e8df3..aca8534 100644
--- a/libclamunrar/Makefile.am
+++ b/libclamunrar/Makefile.am
@@ -32,6 +32,5 @@ libclamunrar_la_SOURCES = \
 	unrarhlp.h
 
 lib_LTLIBRARIES = libclamunrar.la
-endif
-
 EXTRA_DIST = libclamunrar.map
+endif
diff --git a/libclamunrar/Makefile.in b/libclamunrar/Makefile.in
index 101688f..ee52e0b 100644
--- a/libclamunrar/Makefile.in
+++ b/libclamunrar/Makefile.in
@@ -238,7 +238,7 @@ top_srcdir = @top_srcdir@
 @ENABLE_UNRAR_TRUE@	unrarhlp.h
 
 @ENABLE_UNRAR_TRUE at lib_LTLIBRARIES = libclamunrar.la
-EXTRA_DIST = libclamunrar.map
+ at ENABLE_UNRAR_TRUE@EXTRA_DIST = libclamunrar.map
 all: all-am
 
 .SUFFIXES:
diff --git a/libclamunrar_iface/Makefile.am b/libclamunrar_iface/Makefile.am
index 69f1b06..d1dd53f 100644
--- a/libclamunrar_iface/Makefile.am
+++ b/libclamunrar_iface/Makefile.am
@@ -19,6 +19,5 @@ libclamunrar_iface_la_SOURCES = \
 	unrar_iface.h
 
 lib_LTLIBRARIES = libclamunrar_iface.la
-endif
-
 EXTRA_DIST = libclamunrar_iface.map
+endif
diff --git a/libclamunrar_iface/Makefile.in b/libclamunrar_iface/Makefile.in
index da001e2..cd424df 100644
--- a/libclamunrar_iface/Makefile.in
+++ b/libclamunrar_iface/Makefile.in
@@ -219,7 +219,7 @@ top_srcdir = @top_srcdir@
 @ENABLE_UNRAR_TRUE@	unrar_iface.h
 
 @ENABLE_UNRAR_TRUE at lib_LTLIBRARIES = libclamunrar_iface.la
-EXTRA_DIST = libclamunrar_iface.map
+ at ENABLE_UNRAR_TRUE@EXTRA_DIST = libclamunrar_iface.map
 all: all-am
 
 .SUFFIXES:

-- 
Debian repository for ClamAV