summarylogtreecommitdiffstats
path: root/0001-Fix-automake-warnings.patch
blob: 8360c6456c52738ff568da78c4b2dbb8d8a44f44 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
From f86958231c2e5d3172554976a88f8cb552109079 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@vdwaa.nl>
Date: Wed, 21 Jun 2017 21:42:57 +0200
Subject: [PATCH] Fix automake warnings

Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
---
 Makefile.am       | 2 --
 configure.ac      | 3 ++-
 doc/Makefile.am   | 2 --
 tests/Makefile.am | 2 --
 tools/Makefile.am | 2 --
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 12a85d3..c137e1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,6 @@ katepc_DATA+=misc/pkgconfig/oggkate.pc
 noinst_DATA+=misc/pkgconfig/oggkate-uninstalled.pc
 endif
 
-LIBTOOLFLAGS=--silent
-
 AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
 
 lib_libkate_la_SOURCES=\
diff --git a/configure.ac b/configure.ac
index 58ff478..0234255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects -Wno-portability])
 AC_CONFIG_HEADERS([include/config.h])
 
 ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -27,6 +27,7 @@ dnl     then set AGE to 0.
 LIBKATE_SHARED_VERSION="4:0:3"
 LIBOGGKATE_SHARED_VERSION="3:2:2"
 
+AM_PROG_AR
 AC_PROG_CC_C_O
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 693f2fc..f519c08 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-LIBTOOLFLAGS=--silent
-
 man_MANS=man/kateenc.1 man/katedec.1 man/katalyzer.1 man/KateDJ.1
 
 # dependency to get doc to be built
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4fa768a..31d3434 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-LIBTOOLFLAGS=--silent
-
 AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
 
 LIBKATE=../lib/libkate.la
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2be12a3..01c3d7b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,8 +2,6 @@ if HAVE_PYTHON
 SUBDIRS=KateDJ
 endif
 
-LIBTOOLFLAGS=--silent
-
 AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include -I $(top_srcdir)/tools
 
 noinst_HEADERS=\
-- 
2.13.1