build-sys: silence/fix warnings from autotools.

diff --git a/Makefile.am b/Makefile.am
index b3937c8..425875f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS  = . utils src doc
 doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
 

diff --git a/configure.ac b/configure.ac
index e243a99..b184d9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,14 +4,12 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([murphy],
-        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
-        [krisztian.litkey at intel.com])
+AC_INIT([murphy], m4_esyscmd([build-aux/git-version-gen .tarball-version]))
 
 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([-Wno-portability])
 
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 

diff --git a/src/Makefile.am b/src/Makefile.am
index beb9fb2..1fc0134 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,9 +3,7 @@ SUBDIRS         = murphy-db . \
                  core/lua-decision/tests resolver/tests \
                  daemon/tests  plugins/tests
 
-BUILT_SOURCES   =
-
-AM_CFLAGS       = $(WARNING_CFLAGS) $(INCLUDES) \
+AM_CFLAGS       = $(WARNING_CFLAGS) $(AM_CPPFLAGS) \
                  -DSYSCONFDIR=\"@SYSCONFDIR@\" -DLIBDIR=\"@LIBDIR@\"
 MURPHY_CFLAGS   =
 pkgconfigdir    = ${libdir}/pkgconfig
@@ -20,7 +18,7 @@ QUIET_GEN      = $(Q:@=@echo '  GEN   '$@;)
 LEXCOMPILE      = $(LEX) $(LFLAGS) $(AM_LFLAGS)
 YACCCOMPILE     = $(YACC) $(YFLAGS) $(AM_YFLAGS)
 
-INCLUDES        = -I$(top_builddir) -I$(top_builddir)/src \
+AM_CPPFLAGS     = -I$(top_builddir) -I$(top_builddir)/src \
                  -I$(top_builddir)/src/murphy-db/include
 BUILT_SOURCES   =
 

diff --git a/src/core/lua-decision/tests/Makefile.am b/src/core/lua-decision/tests/Makefile.am
index d77e7ac..b3ddeb2 100644 (file)
--- a/src/core/lua-decision/tests/Makefile.am
+++ b/src/core/lua-decision/tests/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES  = -I$(top_builddir)/src/murphy-db/include -I$(top_builddir)
-AM_CFLAGS = $(WARNING_CFLAGS) $(INCLUDES)
+AM_CPPFLAGS = -I$(top_builddir)/src/murphy-db/include -I$(top_builddir)
+AM_CFLAGS   = $(WARNING_CFLAGS) $(AM_CPPFLAGS)
 
 
 noinst_PROGRAMS  = decision-test