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

diff --git a/Makefile.am b/Makefile.am
index 725ee50624..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 = \
@@ -30,9 +46,9 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = ONEWS pspp-mode.el
+EXTRA_DIST = ONEWS
 
-CLEANFILES = 
+CLEANFILES =
 CLEAN_LOCAL =
 ALL_LOCAL =
 CHECK_LOCAL =
@@ -44,7 +60,7 @@ check_PROGRAMS=
 bin_PROGRAMS=
 dist_man_MANS =
 DIST_HOOKS =
-INSTALL_DATA_HOOKS = 
+INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
@@ -76,10 +92,6 @@ 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
@@ -113,11 +125,17 @@ programs: $(PROGRAMS)
 
 # 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 && (git --version) >/dev/null 2>&1; then \
+	@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				    \