summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorP. F. Chimento <philip.chimento@gmail.com>2013-04-24 08:16:24 -0700
committerP. F. Chimento <philip.chimento@gmail.com>2013-04-24 08:16:24 -0700
commitbb6bd3b5dbd59d6a3bae1ad7b3878d55ceadc60b (patch)
treee8ac6a28baec9638949279f14b47ff2555cbb201
parent5fd320085624acecbacb29e86f8f32b8702cc3e6 (diff)
parent1a23b3ce2f6bccda647a8cf42febad3ac084ca33 (diff)
Merge pull request #27 from endlessm/issues/26
Issues/26
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac6
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index a6a5e33..601741a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,9 @@ stamp*
/Makefile
/Makefile.in
/aclocal.m4
+/ar-lib
/autom4te.cache
+/compile
/config.*
/configure
/depcomp
diff --git a/Makefile.am b/Makefile.am
index e483381..b9c1b1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@
## Please keep this file well-commented.
# Subdirectories where we also want to run make
-SUBDIRS = po docs/reference/endless
+# (Make sure that the library is built before the docs)
+SUBDIRS = po . docs/reference/endless
# Our Autoconf macros are kept in the m4/ directory
ACLOCAL_AMFLAGS = -I m4
@@ -84,7 +85,7 @@ endif
include $(top_srcdir)/test/Makefile.am
# Run tests when running 'make check'
-TESTS_ENVIRONMENT = gtester -k -o test-results.xml
+TESTS_ENVIRONMENT = gtester -k -o test-results.xml --verbose
TESTS = test/run-tests
CLEANFILES += test-results.xml
diff --git a/configure.ac b/configure.ac
index 08f32f1..95618a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,12 @@ AC_INIT([Open Endless SDK], [_EOS_SDK_VERSION_MACRO],
dnl AC_CONFIG_SRCDIR([src/hello.c])
# Initialize Automake: enable all warnings and do not insist on GNU standards
# Automake >= 1.11 required for silent rules
-AM_INIT_AUTOMAKE([-Wall foreign 1.11])
+# no-portability suppresses warnings about syntax specific to GNU make
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign 1.11])
# Avoid spewing garbage over the terminal ('make V=1' to see the garbage)
AM_SILENT_RULES([yes])
# Initialize Libtool; don't build static libraries
+AM_PROG_AR dnl must call before LT_INIT
LT_INIT([disable-static])
# Keep Autotools macros local to this source tree
AC_CONFIG_MACRO_DIR([m4])
@@ -131,6 +133,8 @@ AC_SUBST(STRICT_CFLAGS)
# --------------------
# C compiler
AC_PROG_CC
+# Make sure the C compiler supports per-target CFLAGS
+AM_PROG_CC_C_O
# Library configuration tool
PKG_PROG_PKG_CONFIG
# Gettext