X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=b2df75983bc26238fcade0ebe42400803dc6787b;hb=fe824bb6dd7cc73462f2dbcdda4c054ce1c1cea0;hp=4e9daebf9da898227d7e8f58224e836deb1dfdc9;hpb=facb4a1ad3c9e8b2cdf55824680eed2afb91aebe;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 4e9daebf9d..b2df75983b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,7 +46,7 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = ONEWS pspp-mode.el
+EXTRA_DIST = ONEWS
 
 CLEANFILES =
 CLEAN_LOCAL =
@@ -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