X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=3f4a9c6250a943e6e2b41d5c829ef31e91777895;hb=5945ce59bf14d8e5ffa50ef82ce56e79800a9bb2;hp=6e60789d2b860f89fc7245451853d94c188a2709;hpb=ffeabe9db40ea836e3d5adbd3a5de1c557342593;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 6e60789d2b..3f4a9c6250 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,25 @@
+## PSPP - a program for statistical analysis.
+## Copyright (C) 2019 Free Software Foundation, Inc.
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 
 SUBDIRS = gl po
-DISTCLEANFILES = ./po/stamp-po xconfigure 
+DISTCLEANFILES = ./po/stamp-po xconfigure
 BUILT_SOURCES =
 
 AM_CPPFLAGS = \
@@ -11,6 +27,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gl \
 	-DINSTALLDIR=\"$(bindir)\"
 
+AM_V_P ?= :
+
 AM_CFLAGS=
 
 if cc_is_gcc
@@ -20,7 +38,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 =
@@ -28,9 +46,9 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS pspp-mode.el
+EXTRA_DIST = ONEWS
 
-CLEANFILES = 
+CLEANFILES =
 CLEAN_LOCAL =
 ALL_LOCAL =
 CHECK_LOCAL =
@@ -42,7 +60,7 @@ check_PROGRAMS=
 bin_PROGRAMS=
 dist_man_MANS =
 DIST_HOOKS =
-INSTALL_DATA_HOOKS = 
+INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
@@ -56,8 +74,8 @@ noinst_HEADERS = $(EXTRA_DIST)
 
 generate-changelog:
 	if test -d $(top_srcdir)/.git; then			\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27	\
-	    > $(distdir)/cl-t;					\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27  --srcdir=$(top_srcdir) \
+	    > $(distdir)/cl-t || exit 1;					\
 	  rm -f $(distdir)/ChangeLog;				\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
 	fi
@@ -72,13 +90,8 @@ 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
 
-if WITH_GUI_TOOLS
-include $(top_srcdir)/glade/automake.mk
-endif
-
 if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
 endif
@@ -99,3 +112,46 @@ 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.
+# The debian package is now also maintained in git and that contains
+# the distribution files. Do not run this check if we are
+# in a debian package git repository, because the check fails there
+ALL_LOCAL += dist-hook-git
+dist-hook-git: distfiles
+	@if test -e $(srcdir)/.git &&                                       \
+	    test ! -d $(srcdir)/debian &&                                   \
+            (git --version) >/dev/null 2>&1; then                           \
+	  (cd $(srcdir) && git ls-files)				    \
+	    | grep -vE '\.gitignore|README.Git|Smake|Bug-administration'    \
+	    | grep -vE '\.gitattributes'                                    \
+	    | 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