From 078d913120384eb52e53d6f4f739b782f65937cf Mon Sep 17 00:00:00 2001 From: Sam Simmons Date: Tue, 24 Jan 2017 21:17:34 -0600 Subject: [PATCH] Change automake init macros and includes var per automake warnings --- configure.ac | 5 +++-- src/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f191f183..a60ce53f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ -AC_INIT(configure.ac) +AC_INIT([ncmpcpp], [0.8_dev]) +AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE(ncmpcpp, 0.8_dev) +AM_INIT_AUTOMAKE([subdir-objects]) m4_include([m4/ax_lib_readline.m4]) diff --git a/src/Makefile.am b/src/Makefile.am index 5cce592b..de1ed213 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,7 @@ ncmpcpp_SOURCES = \ title.cpp # set the include path found by configure -INCLUDES= $(all_includes) +AM_CPPFLAGS= $(all_includes) # the library search path. ncmpcpp_LDFLAGS = $(all_libraries)