work on docs

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0d40442dd888285d24b7b440ec9a885a3962bf3c..b571440544eea389860dda85ffab45d3b32ce8a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## PSPP - a program for statistical analysis.
-## Copyright (C) 2019 Free Software Foundation, Inc.
+## Copyright (C) 2019, 2020 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
@@ -19,36 +19,25 @@
 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 =
+built-sources: $(BUILT_SOURCES)
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/gl \
-       -I$(top_builddir)/gl \
+       -I"$(top_srcdir)/gl" \
+       -I"$(top_builddir)/gl" \
        -DINSTALLDIR=\"$(bindir)\"
 
 AM_V_P ?= :
 
-AM_CFLAGS=
-
-if cc_is_gcc
-AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
--Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
-endif
-
-.q.c:
-       @$(MKDIR_P) `dirname $@`
-       $(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 =
+AM_CFLAGS=$(WARNING_FLAGS)
 
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = ONEWS pspp-mode.el
+EXTRA_DIST = ONEWS
 
-CLEANFILES = 
+CLEANFILES =
 CLEAN_LOCAL =
 ALL_LOCAL =
 CHECK_LOCAL =
@@ -60,12 +49,15 @@ check_PROGRAMS=
 bin_PROGRAMS=
 dist_man_MANS =
 DIST_HOOKS =
-INSTALL_DATA_HOOKS = 
+INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
-SUFFIXES = .q
+SUFFIXES =
 LDADD = gl/libgl.la
 
+gl/libgl.la: config.h
+       $(MAKE) -C gl
+
 # 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:
@@ -86,15 +78,12 @@ 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
-
-if WITH_GUI_TOOLS
-include $(top_srcdir)/glade/automake.mk
-endif
+include $(top_srcdir)/doc/automake.mk
+include $(top_srcdir)/Windows/automake.mk
 
 if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
@@ -129,11 +118,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 +147,13 @@ 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
+
+$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) gl/libgl.la
+
+\f
+
+mimedir = $(datadir)/mime/packages
+mime_DATA =pspp.xml
+EXTRA_DIST += pspp.xml
+