pspp-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

patch: fix "make dist" when "make all" has not yet been run


From: Ben Pfaff
Subject: patch: fix "make dist" when "make all" has not yet been run
Date: Sun, 18 Mar 2007 17:33:49 -0700
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)

tests/libpspp/ll-test and other built objects are in TESTS, which
is in EXTRA_DIST.  This forces "make dist" to try to make those
targets.  However, if a full "make" has not yet run, then that
fails because gl/libgl.la hasn't yet been built (and won't be
built by that target, unfortunately).  

We don't really want to distribute those files anyway, so I
checked in the following to distinguish between tests that should
be distributed and those that should not:

--- automake.mk.~1.27.~ 2007-02-08 21:28:41.000000000 -0800
+++ automake.mk 2007-03-18 17:25:48.000000000 -0700
@@ -2,7 +2,7 @@
 
 TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
 TESTS_ENVIRONMENT += PERL='@PERL@'
-TESTS = \
+dist_TESTS = \
        tests/command/aggregate.sh \
        tests/command/autorecod.sh \
        tests/command/beg-data.sh \
@@ -130,12 +130,16 @@ TESTS = \
        tests/expressions/randist.sh \
        tests/expressions/valuelabel.sh \
        tests/expressions/variables.sh \
-       tests/expressions/vectors.sh \
+       tests/expressions/vectors.sh
+
+nodist_TESTS = \
        tests/libpspp/ll-test \
        tests/libpspp/llx-test \
        tests/libpspp/heap-test \
        tests/libpspp/abt-test
 
+TESTS = $(dist_TESTS) $(nodist_TESTS)
+
 check_PROGRAMS += \
        tests/libpspp/ll-test \
        tests/libpspp/llx-test \
@@ -173,7 +177,9 @@ tests_libpspp_abt_test_CPPFLAGS = $(AM_C
 
 tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
 
-EXTRA_DIST += $(TESTS) tests/weighting.data tests/data-list.data 
tests/list.data \
+EXTRA_DIST += \
+       $(dist_TESTS) \
+       tests/weighting.data tests/data-list.data tests/list.data \
        tests/no_case_size.sav \
        tests/coverage.sh tests/test_template \
        tests/v13.sav tests/v14.sav \
-- 
"Writing is easy.
 All you do is sit in front of a typewriter and open a vein."
--Walter Smith




reply via email to

[Prev in Thread] Current Thread [Next in Thread]