summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-06-21 11:37:28 -0400
committerDave Reisner <dreisner@archlinux.org>2014-06-27 09:06:21 -0400
commitf0925de16bb70da0bf87332521f54f1defd23500 (patch)
tree745f9e0b5e3024f1bb2eba05087e44515277e964 /src
parent13ea2cb622f48c528b36970eff5e2cf42b3769fc (diff)
downloadirssi-f0925de16bb70da0bf87332521f54f1defd23500.zip
s/INCLUDES/AM_CPPFLAGS/g
Silences warnings on recent automake such as: src/core/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Diffstat (limited to 'src')
-rw-r--r--src/core/Makefile.am2
-rw-r--r--src/fe-common/core/Makefile.am2
-rw-r--r--src/fe-common/irc/Makefile.am2
-rw-r--r--src/fe-common/irc/dcc/Makefile.am2
-rw-r--r--src/fe-common/irc/notifylist/Makefile.am2
-rw-r--r--src/fe-none/Makefile.am2
-rw-r--r--src/fe-text/Makefile.am2
-rw-r--r--src/irc/core/Makefile.am2
-rw-r--r--src/irc/dcc/Makefile.am2
-rw-r--r--src/irc/flood/Makefile.am2
-rw-r--r--src/irc/notifylist/Makefile.am2
-rw-r--r--src/irc/proxy/Makefile.am2
-rw-r--r--src/lib-config/Makefile.am2
-rw-r--r--src/perl/Makefile.am2
14 files changed, 14 insertions, 14 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 59ae0a8d..fc32e17e 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libcore.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
$(GLIB_CFLAGS) \
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index eb826414..e755b510 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libfe_common_core.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 9ca9ccfa..463f145c 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = dcc notifylist
noinst_LIBRARIES = libfe_common_irc.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index 7161f262..e0ad6296 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libfe_irc_dcc.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index 94f5a791..b990dcd2 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libfe_irc_notifylist.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
index d06f04e1..1233fc91 100644
--- a/src/fe-none/Makefile.am
+++ b/src/fe-none/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = botti
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index b8ec634e..b9538e60 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = irssi
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/fe-common/core/ \
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index fa4ca3f9..3db5cf0e 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_core.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index a2ca19e2..cf1e2ff5 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_dcc.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index a5ba65b0..1c4d786a 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_flood.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index c4a7f4a0..abd9d18d 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_notifylist.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am
index 8a5b5046..4eb73bb8 100644
--- a/src/irc/proxy/Makefile.am
+++ b/src/irc/proxy/Makefile.am
@@ -1,7 +1,7 @@
moduledir = $(libdir)/irssi/modules
module_LTLIBRARIES = libirc_proxy.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
index 4831ae66..06c7787c 100644
--- a/src/lib-config/Makefile.am
+++ b/src/lib-config/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libirssi_config.a
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
$(GLIB_CFLAGS)
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 909f4a81..a09c49a5 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -14,7 +14,7 @@ libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
perl-core.lo: irssi-core.pl.h
perl-signals.lo: perl-signals-list.h
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core \