Compute dialog: Avoid double population

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9b1ef044d2a714dc305e96ced3cf4aa9b9d7ea2d..106c08fd0ecd60c194850f735b29365df3194511 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,8 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/gl \
        -DINSTALLDIR=\"$(bindir)\"
 
+AM_V_P ?= :
+
 AM_CFLAGS=
 
 if cc_is_gcc
@@ -20,7 +22,7 @@ endif
 
 .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 =
@@ -56,8 +58,8 @@ noinst_HEADERS = $(EXTRA_DIST)
 
 generate-changelog:
        if test -d $(top_srcdir)/.git; then                     \
-         $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27        \
-           > $(distdir)/cl-t;                                  \
+         $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27  --srcdir=$(top_srcdir) \
+           > $(distdir)/cl-t || exit 1;                                        \
          rm -f $(distdir)/ChangeLog;                           \
          mv $(distdir)/cl-t $(distdir)/ChangeLog;              \
        fi
@@ -72,7 +74,6 @@ 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