summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 23eb0d9..ecd0727 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,12 +54,11 @@ curl_flags = --compressed --connect-timeout 300 -g -L -m 3600 --retry 5
wget_flags = -T 300 -t 5
libstdcxx_tag_url = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
+.DELETE_ON_ERROR:
+
# Download the GNU libstdc++ Doxygen tag file from the GCC site
tags/libstdc++.tag:
- if test -n "$(CURL)"; then \
- $(CURL) $(curl_flags) -o '$@' '$(libstdcxx_tag_url)'; \
- elif test -n "$(WGET)"; then \
- $(WGET) $(wget_flags) -O '$@' '$(libstdcxx_tag_url)'; \
- fi
+ $(if $(CURL),$(CURL) $(curl_flags) -o '$@' '$(libstdcxx_tag_url)',$(if\
+ $(WGET),$(WGET) $(wget_flags) -O '$@' '$(libstdcxx_tag_url)',exit 1))
include $(top_srcdir)/build/dist-changelog.am
diff --git a/configure.ac b/configure.ac
index 42a2a1b..ad4fe77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_INIT([mm-common], [0.1], [gtkmm-list@gnome.org], [mm-common])
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([build/compile-binding.am])
-AM_INIT_AUTOMAKE([1.9 no-define nostdinc tar-ustar])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability no-define nostdinc tar-ustar])
AM_MAINTAINER_MODE
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])