X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=1c345a1441e5f927583a90b81c45dc8e467dc822;hb=5ae2fd5298d9c40f28ffcad764f1f1cf3489ff16;hp=98e8573669b5cc3aa5da65512b1addfef05599d4;hpb=a3e57d44a2c49305a1f6ba5652a0ca0a83123c48;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 98e8573669..1c345a1441 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 
 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