pivot table procedure conceptually works

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4fb848d2621ab33e748a4d5538f700736874eb0f..3fc689fc6cba6d8c348e584d818768359c3a695a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,17 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
+AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 
 SUBDIRS = gl po
 DISTCLEANFILES = ./po/stamp-po xconfigure 
 BUILT_SOURCES =
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/gl \
+       -I$(top_builddir)/gl \
+       -DINSTALLDIR=\"$(bindir)\"
+
+AM_V_P ?= :
 
 AM_CFLAGS=
 
@@ -15,44 +20,60 @@ AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
 -Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
 endif
 
-CC_FOR_BUILD = @CC_FOR_BUILD@
-EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 .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 =
 
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = ONEWS pspp-mode.el
 
 CLEANFILES = 
+CLEAN_LOCAL =
+ALL_LOCAL =
+CHECK_LOCAL =
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 noinst_LIBRARIES=
 noinst_LTLIBRARIES=
 noinst_PROGRAMS=
 check_PROGRAMS=
 bin_PROGRAMS=
+dist_man_MANS =
 DIST_HOOKS =
+INSTALL_DATA_HOOKS = 
+UNINSTALL_DATA_HOOKS =
 PHONY =
+SUFFIXES = .q
+LDADD = gl/libgl.la
+
+# 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:
+# http://article.gmane.org/gmane.comp.sysutils.automake.general/10891
+noinst_HEADERS = $(EXTRA_DIST)
 
-DIST_HOOKS += generate-changelog
 generate-changelog:
        if test -d $(top_srcdir)/.git; then                     \
-         $(top_srcdir)/gitlog-to-changelog --since=2008-07-27  \
+         $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27        \
            > $(distdir)/cl-t;                                  \
          rm -f $(distdir)/ChangeLog;                           \
          mv $(distdir)/cl-t $(distdir)/ChangeLog;              \
        fi
 
+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)/config/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
 
@@ -60,8 +81,60 @@ if WITH_GUI_TOOLS
 include $(top_srcdir)/glade/automake.mk
 endif
 
+if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
+endif
+
+PHONY += $(DIST_HOOKS) $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS)
 
-PHONY += $(DIST_HOOKS)
-dist-hook: $(DIST_HOOKS)
 .PHONY: $(PHONY)
+
+dist-hook: $(DIST_HOOKS)
+
+install-data-hook: $(INSTALL_DATA_HOOKS)
+
+uninstall-hook: $(UNINSTALL_DATA_HOOKS)
+
+clean-local: $(CLEAN_LOCAL)
+all-local: $(ALL_LOCAL)
+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.
+ALL_LOCAL += dist-hook-git
+dist-hook-git: distfiles
+       @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
+         (cd $(srcdir) && git ls-files)                                    \
+           | grep -vE '\.gitignore|README.Git|Smake'                       \
+           | 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