tests: Update testsuite results to accomodate new Gnulib.

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9254dd8b682243e2bfed0088fbac2cf473ea413b..a0b145747b4f9f2fbc15751605b99d4c2b9fd2b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
+AUTOMAKE_OPTIONS = std-options check-news 1.11 subdir-objects
 
 SUBDIRS = gl po
 DISTCLEANFILES = ./po/stamp-po xconfigure
@@ -24,18 +24,13 @@ BUILT_SOURCES =
 built-sources: $(BUILT_SOURCES)
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/gl \
-       -I$(top_builddir)/gl \
+       -I"$(top_srcdir)/gl" \
+       -I"$(top_builddir)/gl" \
        -DINSTALLDIR=\"$(bindir)\"
 
 AM_V_P ?= :
 
-AM_CFLAGS=
-
-if cc_is_gcc
-AM_CFLAGS+=-Wall -Wextra -Wwrite-strings -Wstrict-prototypes \
--Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
-endif
+AM_CFLAGS=$(WARNING_FLAGS)
 
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
@@ -88,6 +83,7 @@ include $(top_srcdir)/src/automake.mk
 include $(top_srcdir)/utilities/automake.mk
 include $(top_srcdir)/tests/automake.mk
 include $(top_srcdir)/doc/automake.mk
+include $(top_srcdir)/Windows/automake.mk
 
 if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk