Makefile fixes

git-svn: trunk@3698
18 years ago · 0db944fcef
parent 5fc380f1cc
commit 0db944fcef
10 changed files with 17 additions and 7 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+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()
--- 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
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib

 bin_SCRIPTS=clamav-config

--- 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
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib
 bin_SCRIPTS = clamav-config
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libclamav.pc
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@ -55,7 +55,7 @@ target_triplet = @target@
@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
 subdir = libclamav
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+	$(srcdir)/Makefile.in COPYING
 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 \
--- a/libclamav/lzma/Makefile.am
+++ b/libclamav/lzma/Makefile.am
@ -24,3 +24,4 @@ liblzma_la_SOURCES = LzmaStateDecode.c \
 		     LzmaStateDecode.h \
 		     LzmaTypes.h

+EXTRA_DIST = lzma.txt
--- a/libclamav/lzma/Makefile.in
+++ b/libclamav/lzma/Makefile.in
@ -216,6 +216,7 @@ liblzma_la_SOURCES = LzmaStateDecode.c \
 		     LzmaStateDecode.h \
 		     LzmaTypes.h

+EXTRA_DIST = lzma.txt
 all: all-am

 .SUFFIXES:
--- a/libclamunrar/Makefile.am
+++ b/libclamunrar/Makefile.am
@ -32,5 +32,6 @@ libclamunrar_la_SOURCES = \
 	unrarhlp.h

 lib_LTLIBRARIES = libclamunrar.la
-EXTRA_DIST = libclamunrar.map
 endif
+
+EXTRA_DIST = libclamunrar.map
--- a/libclamunrar/Makefile.in
+++ b/libclamunrar/Makefile.in
@ -238,7 +238,7 @@ top_srcdir = @top_srcdir@
@ENABLE_UNRAR_TRUE@	unrarhlp.h

@ENABLE_UNRAR_TRUE@lib_LTLIBRARIES = libclamunrar.la
-@ENABLE_UNRAR_TRUE@EXTRA_DIST = libclamunrar.map
+EXTRA_DIST = libclamunrar.map
 all: all-am

 .SUFFIXES:
--- a/libclamunrar_iface/Makefile.am
+++ b/libclamunrar_iface/Makefile.am
@ -19,5 +19,6 @@ libclamunrar_iface_la_SOURCES = \
 	unrar_iface.h

 lib_LTLIBRARIES = libclamunrar_iface.la
-EXTRA_DIST = libclamunrar_iface.map
 endif
+
+EXTRA_DIST = libclamunrar_iface.map
--- 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@lib_LTLIBRARIES = libclamunrar_iface.la
-@ENABLE_UNRAR_TRUE@EXTRA_DIST = libclamunrar_iface.map
+EXTRA_DIST = libclamunrar_iface.map
 all: all-am

 .SUFFIXES: