X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=8ed323b399dfd088d2483fa3295532a14203fb23;hb=dcec2f97efd07617d7b33ebf5a4eebd3245c9e49;hp=b571440544eea389860dda85ffab45d3b32ce8a4;hpb=ee1bfc05f5ab73883df26e616019e07a1bfee873;p=pspp

diff --git a/Makefile.am b/Makefile.am
index b571440544..8ed323b399 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,9 @@
 
 ## 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)
@@ -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,7 +152,7 @@ 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