X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=blobdiff_plain;f=Makefile.am;h=3fc689fc6cba6d8c348e584d818768359c3a695a;hp=b24afdaf7719b9575031ed8e1148ddfad4311721;hb=refs%2Fheads%2Fpivot-table2;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234

diff --git a/Makefile.am b/Makefile.am
index b24afdaf77..3fc689fc6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,17 @@
 ## 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_V_P ?= :
 
 AM_CFLAGS=
 
@@ -21,7 +22,7 @@ endif
 
 .q.c:
 	@$(MKDIR_P) `dirname $@`
-	./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
+	$(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 =
@@ -29,7 +30,7 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = ONEWS pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
@@ -41,15 +42,23 @@ noinst_LTLIBRARIES=
 noinst_PROGRAMS=
 check_PROGRAMS=
 bin_PROGRAMS=
+dist_man_MANS =
 DIST_HOOKS =
 INSTALL_DATA_HOOKS = 
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
+LDADD = 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:
+# http://article.gmane.org/gmane.comp.sysutils.automake.general/10891
+noinst_HEADERS = $(EXTRA_DIST)
 
 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;		\
@@ -58,11 +67,13 @@ generate-changelog:
 DIST_HOOKS += generate-changelog
 
 
+include $(top_srcdir)/build-aux/automake.mk
 include $(top_srcdir)/po/automake.mk
 include $(top_srcdir)/lib/automake.mk
 include $(top_srcdir)/doc/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
 
@@ -90,3 +101,40 @@ check-local: $(CHECK_LOCAL)
 
 # A convenience target to build all the binaries
 programs: $(PROGRAMS)
+
+# The following rules are from Open vSwitch.  The original copyright notice
+# and license are:
+#
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without warranty of any kind.
+
+# If we're checked out from a Git repository, make sure that every
+# file that is in Git is distributed.
+ALL_LOCAL += dist-hook-git
+dist-hook-git: distfiles
+	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
+	  (cd $(srcdir) && git ls-files)				    \
+	    | grep -vE '\.gitignore|README.Git|Smake'			    \
+	    | LC_ALL=C sort -u > gitfiles;				    \
+	  LC_ALL=C comm -1 -3 distfiles gitfiles > missing-distfiles;	    \
+	  if test -s missing-distfiles; then				    \
+	    echo "The distribution is missing the following files:";	    \
+	    cat missing-distfiles;					    \
+	    exit 1;							    \
+	  fi;								    \
+	fi
+# The following is based on commands for the Automake "distdir" target.
+distfiles: Makefile
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \
+	  | LC_ALL=C sort -u > $@
+CLEANFILES += distfiles gitfiles missing-distfiles
+.PHONY: dist-hook-git