X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=28e9ffc6b250078acdc65da2ddebfc1bfee5dd52;hb=7eb7dbf40110277f4efd244eb81f0b3f32983159;hp=02ae7d5b2129e882d72e65559bf81c9d7d3ad5fd;hpb=0cb17272c79a90d8d9fb5f8bd3628bb9bba4fb0f;p=pspp-builds.git

diff --git a/Makefile.am b/Makefile.am
index 02ae7d5b..28e9ffc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,15 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.10.1 subdir-objects
+AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 
-SUBDIRS = gl
+SUBDIRS = gl po
 DISTCLEANFILES = ./po/stamp-po xconfigure 
 BUILT_SOURCES =
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gl \
 	-I$(top_builddir)/gl \
-	-DINSTALLDIR=\"$(bindir)\" \
-	-DDOCDIR=\"$(docdir)\"
+	-DINSTALLDIR=\"$(bindir)\"
 
 AM_CFLAGS=
 
@@ -29,11 +28,12 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = OChangeLog ONEWS pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
 ALL_LOCAL =
+CHECK_LOCAL =
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 noinst_LIBRARIES=
 noinst_LTLIBRARIES=
@@ -45,10 +45,11 @@ INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
+LDADD = gl/libgl.la
 
 generate-changelog:
 	if test -d $(top_srcdir)/.git; then			\
-	  $(top_srcdir)/gitlog-to-changelog --since=2008-07-27	\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27	\
 	    > $(distdir)/cl-t;					\
 	  rm -f $(distdir)/ChangeLog;				\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
@@ -60,9 +61,9 @@ DIST_HOOKS += generate-changelog
 include $(top_srcdir)/po/automake.mk
 include $(top_srcdir)/lib/automake.mk
 include $(top_srcdir)/doc/automake.mk
-include $(top_srcdir)/config/automake.mk
 include $(top_srcdir)/examples/automake.mk
 include $(top_srcdir)/src/automake.mk
+include $(top_srcdir)/utilities/automake.mk
 
 include $(top_srcdir)/tests/automake.mk
 
@@ -86,6 +87,7 @@ uninstall-hook: $(UNINSTALL_DATA_HOOKS)
 
 clean-local: $(CLEAN_LOCAL)
 all-local: $(ALL_LOCAL)
+check-local: $(CHECK_LOCAL)
 
 # A convenience target to build all the binaries
 programs: $(PROGRAMS)