X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=90540f2f872618972a6530878d9265b5ae1cdb22;hb=refs%2Fheads%2Fctables10;hp=15a94b424b7d19b2d138a502828e221322022077;hpb=a22d8a1df1395841b1eeb83bdb81675f45e157ef;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 15a94b424b..90540f2f87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,33 +16,21 @@
 
 ## 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.14 subdir-objects
 
-SUBDIRS = gl po
+SUBDIRS = po
 DISTCLEANFILES = ./po/stamp-po xconfigure
 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)
 
@@ -50,6 +38,10 @@ pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 EXTRA_DIST = ONEWS
 
 CLEANFILES =
+MOSTLYCLEANDIRS =
+MOSTLYCLEANFILES =
+MAINTAINERCLEANFILES =
+
 CLEAN_LOCAL =
 ALL_LOCAL =
 CHECK_LOCAL =
@@ -64,14 +56,9 @@ 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:
@@ -88,8 +75,10 @@ generate-changelog:
 
 DIST_HOOKS += generate-changelog
 
+GL_CFLAG_GNULIB_WARNINGS = -Wno-missing-prototypes -Wno-unused-parameter
 
 include $(top_srcdir)/build-aux/automake.mk
+include $(top_srcdir)/gl/automake.mk
 include $(top_srcdir)/po/automake.mk
 include $(top_srcdir)/lib/automake.mk
 include $(top_srcdir)/examples/automake.mk
@@ -97,6 +86,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 +151,12 @@ distfiles: Makefile
 	  | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles
 PHONY += dist-hook-git
+
+$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) config.h
+
+
+
+mimedir = $(datadir)/mime/packages
+mime_DATA = org.fsf.pspp.xml
+EXTRA_DIST += org.fsf.pspp.xml
+