From 9624abfdffe94bd2519359526b4bb5abbaf95d66 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 17 May 2015 01:26:36 +0200 Subject: automake: Replace use of deprecated automake macro INCLUDES. This fixes the automake warnings: Makefile.am:11: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') ax25ipd/Makefile.am:58: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') ax25mond/Makefile.am:46: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') ax25rtd/Makefile.am:89: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') INCLUDES has been deprecated since automake 1.5. Signed-off-by: Ralf Baechle --- Makefile.am | 4 ++-- ax25ipd/Makefile.am | 4 ++-- ax25ipd/process.c | 4 ++-- ax25mond/Makefile.am | 4 ++-- ax25rtd/Makefile.am | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index e83e5b8..e330385 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,5 +8,5 @@ installconf: AX25_SYSCONFDIR=$(sysconfdir)/ax25 AX25_LOCALSTATEDIR=$(localstatedir)/ax25 -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" diff --git a/ax25ipd/Makefile.am b/ax25ipd/Makefile.am index 6b06d8f..6b4da75 100644 --- a/ax25ipd/Makefile.am +++ b/ax25ipd/Makefile.am @@ -55,5 +55,5 @@ installconf: AX25_SYSCONFDIR=$(sysconfdir)/ax25 AX25_LOCALSTATEDIR=$(localstatedir)/ax25 -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" diff --git a/ax25ipd/process.c b/ax25ipd/process.c index f0ac54d..07bd570 100644 --- a/ax25ipd/process.c +++ b/ax25ipd/process.c @@ -30,8 +30,8 @@ #define SETREPEATED(p) (*(p+6))|=0x80 #define SETLAST(p) (*(p+6))|=0x01 -unsigned char bcbuf[256]; /* Must be larger than bc_text!!! */ -int bclen; /* The size of bcbuf */ +static unsigned char bcbuf[256]; /* Must be larger than bc_text!!! */ +static int bclen; /* The size of bcbuf */ /* * Initialize the process variables diff --git a/ax25mond/Makefile.am b/ax25mond/Makefile.am index 577cf9d..e60db37 100644 --- a/ax25mond/Makefile.am +++ b/ax25mond/Makefile.am @@ -43,5 +43,5 @@ installconf: AX25_SYSCONFDIR=$(sysconfdir)/ax25 AX25_LOCALSTATEDIR=$(localstatedir)/ax25 -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" diff --git a/ax25rtd/Makefile.am b/ax25rtd/Makefile.am index 5ca9c4c..babb6df 100644 --- a/ax25rtd/Makefile.am +++ b/ax25rtd/Makefile.am @@ -86,5 +86,5 @@ ax25rtd_SOURCES = \ AX25_SYSCONFDIR=$(sysconfdir)/ax25 AX25_LOCALSTATEDIR=$(localstatedir)/ax25 -INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" +AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" -- cgit v1.2.3