diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-17 00:56:08 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-17 00:56:08 +0200 |
| commit | fa4d9ef122e1246ecf9c3164281e01c0e2fea464 (patch) | |
| tree | 769dd1563700987df0bd2cc9fe8e43e1cc780b64 | |
| parent | a87ac777a6a4c8b14fac8c151e44b49fceedb3cb (diff) | |
automake: Replace use of deprecated automake macro INCLUDES.
This fixes the automake warnings:
6pack/Makefile.am:10: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
ax25/Makefile.am:26: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
hdlcutil/Makefile.am:16: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
kiss/Makefile.am:11: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
netrom/Makefile.am:28: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
rose/Makefile.am:15: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
tcpip/Makefile.am:27: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
INCLUDES has been deprecated since automake 1.5.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | 6pack/Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | ax25/Makefile.am | 4 | ||||
| -rw-r--r-- | hdlcutil/Makefile.am | 4 | ||||
| -rw-r--r-- | kiss/Makefile.am | 4 | ||||
| -rw-r--r-- | netrom/Makefile.am | 4 | ||||
| -rw-r--r-- | rose/Makefile.am | 4 | ||||
| -rw-r--r-- | tcpip/Makefile.am | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/6pack/Makefile.am b/6pack/Makefile.am index a5ad261..505ce3a 100644 --- a/6pack/Makefile.am +++ b/6pack/Makefile.am @@ -7,8 +7,8 @@ LDADD= $(AX25_LIB) dist_man_MANS = m6pack.8 -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ diff --git a/Makefile.am b/Makefile.am index 25f36bc..55c5745 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,8 @@ SUBDIRS = ax25 hdlcutil kiss 6pack netrom rose tcpip user_call yamdrv dmascc EXTRA_DIST = pathnames.h ax25-tools.spec -INCLUDES = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \ - -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \ + -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" AX25_SYSCONFDIR=@sysconfdir@/ax25/ AX25_LOCALSTATEDIR=@localstatedir@/ax25/ diff --git a/ax25/Makefile.am b/ax25/Makefile.am index 327510e..029217c 100644 --- a/ax25/Makefile.am +++ b/ax25/Makefile.am @@ -23,8 +23,8 @@ bin_PROGRAMS = mheard LDADD = $(AX25_LIB) axspawn_LDADD = $(AX25_LIB) $(UTIL_LIB) -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=$(sysconfdir)/ax25/ AX25_LOCALSTATEDIR=$(localstatedir)/ax25/ diff --git a/hdlcutil/Makefile.am b/hdlcutil/Makefile.am index fd94b2a..adffda4 100644 --- a/hdlcutil/Makefile.am +++ b/hdlcutil/Makefile.am @@ -13,8 +13,8 @@ smdiag_SOURCES = smdiag.c hdrvcomm.c hdrvcomm.h usersmdiag.h soundmodem.h smdiag_LDADD = $(X_LIBS) -lX11 $(X_EXTRA_LIBS) -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=$(sysconfdir)/ax25/ AX25_LOCALSTATEDIR=$(localstatedir)/ax25/ diff --git a/kiss/Makefile.am b/kiss/Makefile.am index 1fcdc6a..0fd5db1 100644 --- a/kiss/Makefile.am +++ b/kiss/Makefile.am @@ -8,8 +8,8 @@ LDADD= $(AX25_LIB) dist_man_MANS = kissattach.8 spattach.8 kissnetd.8 kissparms.8 mkiss.8 \ net2kiss.8 -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ diff --git a/netrom/Makefile.am b/netrom/Makefile.am index 97e1741..3153cf7 100644 --- a/netrom/Makefile.am +++ b/netrom/Makefile.am @@ -25,8 +25,8 @@ netromd_SOURCES = \ netromt.c -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ diff --git a/rose/Makefile.am b/rose/Makefile.am index 2a2e95b..da72b2b 100644 --- a/rose/Makefile.am +++ b/rose/Makefile.am @@ -12,8 +12,8 @@ dist_man_MANS = rose.4 rsattach.8 rsparms.8 rsdwnlnk.8 rsuplnk.8 EXTRA_DIST = $(sbin_SCRIPTS) -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ diff --git a/tcpip/Makefile.am b/tcpip/Makefile.am index 847c42f..b09b355 100644 --- a/tcpip/Makefile.am +++ b/tcpip/Makefile.am @@ -24,8 +24,8 @@ rip98d_SOURCES = \ rip98d_LDADD = $(AX25_LIB) -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ |