From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 7 Sep 2014 13:19:06 +0000 (+0200)
Subject: build: change outdated automake syntax by new
X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=commitdiff_plain;h=35dee795ec17710cde6ebd939cb238850e8f7587

build: change outdated automake syntax by new

The two argument form for AM_INIT_AUTOMAKE is obsolete and
redundant.
Makefile.am:171: warning: 'INCLUDES' is the old name for
'AM_CPPFLAGS' (or '*_CPPFLAGS')
---

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index b1fab38..42ee168 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,16 +149,16 @@ EXTRA_chan_lcr_so_SOURCES = chan_lcr.c chan_lcr.h
 
 
 chan_lcr.po: chan_lcr.c chan_lcr.h
-	$(CC) $(INCLUDES) $(AST_CFLAGS) $(CPPFLAGS) $(CFLAGS) -D_GNU_SOURCE -fPIC -c $< -o $@
+	$(CC) $(AM_CPPFLAGS) $(AST_CFLAGS) $(CPPFLAGS) $(CFLAGS) -D_GNU_SOURCE -fPIC -c $< -o $@
 
 callerid.po: callerid.c callerid.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
+	$(CC) $(AM_CPPFLAGS) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 options.po: options.c options.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
+	$(CC) $(AM_CPPFLAGS) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 select.po: select.c select.h
-	$(CC) $(INCLUDES) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
+	$(CC) $(AM_CPPFLAGS) -D_GNU_SOURCE $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 install-exec-hook: chan_lcr.so
 	$(INSTALL) -d '$(DESTDIR)$(astmoddir)'
@@ -168,7 +168,7 @@ uninstall-hook:
 	cd '$(DESTDIR)$(astmoddir)' && rm -f chan_lcr.so
 endif
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include $(MISDN_INCLUDE) $(GSM_INCLUDE) $(SS5_INCLUDE) $(SIP_INCLUDE) -Wall $(INSTALLATION_DEFINES)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(MISDN_INCLUDE) $(GSM_INCLUDE) $(SS5_INCLUDE) $(SIP_INCLUDE) -Wall $(INSTALLATION_DEFINES)
 
 lcr_SOURCES = \
 	main.c select.c trace.c options.c tones.c alawulaw.c cause.c interface.c message.c callerid.c socket_server.c \
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/configure.ac b/configure.ac
index 1911187..7926b37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,12 @@ dnl 1st + 2nd argument is used for distribution package name
 AC_INIT(lcr, 1.14, andreas@eversberg.eu)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([main.c])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 
 # fix warnings from autoconf + automake
 AC_GNU_SOURCE
-# AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE(lcr,1.14)
+dnl AC_USE_SYSTEM_EXTENSIONS
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 
 
diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am
index ab49a1f..07390f9 100644
--- a/libgsmhr/Makefile.am
+++ b/libgsmhr/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS = -fPIC -Wall ${SYMBOL_VISIBILITY}
 
 LIBVERSION=0:0:0