build-sys: minor updates for newer automake.
authorKrisztian Litkey <kli@iki.fi>
Fri, 11 Oct 2013 15:38:31 +0000 (18:38 +0300)
committerKrisztian Litkey <kli@iki.fi>
Fri, 10 Jan 2014 15:07:39 +0000 (17:07 +0200)
configure.ac
src/Makefile.am

index ae3c43f..59506d6 100644 (file)
@@ -11,7 +11,7 @@ AC_INIT([speech-recognition],
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([src/config.h])
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 
index 5ab305c..38bceac 100644 (file)
@@ -4,8 +4,8 @@ bin_PROGRAMS       =
 plugindir          = $(libdir)/srs/plugins
 plugin_LTLIBRARIES =
 
-INCLUDES           = -I$(top_builddir)
-AM_CFLAGS          = $(INCLUDES) $(GLIB_CFLAGS)
+AM_CPPFLAGS        = -I$(top_builddir)
+AM_CFLAGS          = $(GLIB_CFLAGS)
 
 QUIET_GEN          = $(Q:@=@echo '  GEN   '$@;)