Makefiles: Use $(PHONY) instead of .PHONY.

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0d40442dd888285d24b7b440ec9a885a3962bf3c..b2df75983bc26238fcade0ebe42400803dc6787b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 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 = \
@@ -32,7 +32,7 @@ AM_V_P ?= :
 AM_CFLAGS=
 
 if cc_is_gcc
-AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
+AM_CFLAGS+=-Wall -Wextra -Wwrite-strings -Wstrict-prototypes \
 -Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
 endif
 
@@ -46,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 =
@@ -60,7 +60,7 @@ check_PROGRAMS=
 bin_PROGRAMS=
 dist_man_MANS =
 DIST_HOOKS =
-INSTALL_DATA_HOOKS = 
+INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
@@ -92,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
@@ -129,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                                \
@@ -152,4 +154,4 @@ distfiles: Makefile
              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \
          | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles
-.PHONY: dist-hook-git
+PHONY += dist-hook-git