X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=90540f2f872618972a6530878d9265b5ae1cdb22;hb=refs%2Fheads%2Fctables11;hp=8b44e82efcd760cfbd17ac186e088339494b3d8e;hpb=08588e75a1df413eff334c30d62a93d04cb214cf;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 8b44e82efc..90540f2f87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,16 +16,16 @@
 
 ## 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 ?= :
@@ -38,6 +38,10 @@ pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 EXTRA_DIST = ONEWS
 
 CLEANFILES =
+MOSTLYCLEANDIRS =
+MOSTLYCLEANFILES =
+MAINTAINERCLEANFILES =
+
 CLEAN_LOCAL =
 ALL_LOCAL =
 CHECK_LOCAL =
@@ -55,9 +59,6 @@ PHONY =
 SUFFIXES =
 LDADD = gl/libgl.la
 
-gl/libgl.la: config.h
-	$(MAKE) -C gl
-
 # 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:
@@ -74,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
@@ -149,11 +152,11 @@ distfiles: Makefile
 CLEANFILES += distfiles gitfiles missing-distfiles
 PHONY += dist-hook-git
 
-$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) gl/libgl.la
+$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) config.h
 
 
 
 mimedir = $(datadir)/mime/packages
-mime_DATA =pspp.xml
-EXTRA_DIST += pspp.xml
+mime_DATA = org.fsf.pspp.xml
+EXTRA_DIST += org.fsf.pspp.xml