tests: Update testsuite results to accomodate new Gnulib.

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 15a94b424b7d19b2d138a502828e221322022077..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,25 +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
-
-.q.c:
-       @$(MKDIR_P) `dirname $@`
-       $(AM_V_GEN)./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
-
-$(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
-all_q_sources =
+AM_CFLAGS=$(WARNING_FLAGS)
 
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
@@ -64,14 +52,12 @@ DIST_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
-SUFFIXES = .q
+SUFFIXES =
 LDADD = gl/libgl.la
 
 gl/libgl.la: config.h
        $(MAKE) -C gl
 
-dist: gl/libgl.la
-
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is
 # disabled by some particular "configure" run.  For more information, see:
@@ -97,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
@@ -161,3 +148,12 @@ distfiles: Makefile
          | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles
 PHONY += dist-hook-git
+
+$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) gl/libgl.la
+
+\f
+
+mimedir = $(datadir)/mime/packages
+mime_DATA =pspp.xml
+EXTRA_DIST += pspp.xml
+