X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=a0b145747b4f9f2fbc15751605b99d4c2b9fd2b6;hb=a306948c079462223c692225141b92a76801df03;hp=5967656765c580e84dfe9554036ad2a48f7596af;hpb=f22edc385038b2d29f72af8f9fa882574493f72c;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 5967656765..a0b145747b 100644
--- 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)