[PPL-devel] [GIT] ppl/ppl(master): Fixed parallel make.
Abramo Bagnara
abramo.bagnara at gmail.com
Thu Apr 2 17:28:00 CEST 2009
Module: ppl/ppl
Branch: master
Commit: ab09fc64171cec6b1571b5a6e01411ce1c91bd58
URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab09fc64171cec6b1571b5a6e01411ce1c91bd58
Author: Abramo Bagnara <abramo.bagnara at gmail.com>
Date: Thu Apr 2 16:34:17 2009 +0200
Fixed parallel make.
---
interfaces/Prolog/Ciao/Makefile.am | 11 +++++------
interfaces/Prolog/GNU/Makefile.am | 11 +++++------
interfaces/Prolog/SICStus/Makefile.am | 11 +++++------
interfaces/Prolog/SWI/Makefile.am | 11 +++++------
interfaces/Prolog/XSB/Makefile.am | 7 ++++---
interfaces/Prolog/YAP/Makefile.am | 11 +++++------
6 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am
index 1968a35..203717e 100644
--- a/interfaces/Prolog/Ciao/Makefile.am
+++ b/interfaces/Prolog/Ciao/Makefile.am
@@ -271,9 +271,10 @@ pl_check_test: ciao_pl_check$(EXEEXT) .libs/libppl_ciao.so $(EXPECTED_PCHK)
>obtained_pchk
diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
-clpq_test: ciao_clpq$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq $(EXPECTED_CLPQ)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+$(CLPQ_TESTS):
+ cp -f $(srcdir)/../tests/$@ .
+
+clpq_test: ciao_clpq$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS)
GLOBALSTKSIZE=1000000 \
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
@@ -283,9 +284,7 @@ clpq_test: ciao_clpq$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq $(EXPECT
<$(srcdir)/../tests/script_clpq >obtained_clpq
diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq
-clpq2_test: ciao_clpq2$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq2 $(EXPECTED_CLPQ2)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+clpq2_test: ciao_clpq2$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS)
GLOBALSTKSIZE=100000 \
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am
index a18a389..b1d4dd2 100644
--- a/interfaces/Prolog/GNU/Makefile.am
+++ b/interfaces/Prolog/GNU/Makefile.am
@@ -257,9 +257,10 @@ pl_check_test: gnu_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK)
./ppl_gprolog <script_pchk
diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
-clpq_test: gp_clpq ../tests/script_clpq $(EXPECTED_CLPQ)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+$(CLPQ_TESTS):
+ cp -f $(srcdir)/../tests/$@ .
+
+clpq_test: gp_clpq ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS)
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
$(WATCHDOG_DLOPEN) \
@@ -267,9 +268,7 @@ clpq_test: gp_clpq ../tests/script_clpq $(EXPECTED_CLPQ)
./gp_clpq <$(SCRIPT_CLPQ) >obtained_clpq
diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq
-clpq2_test: gp_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+clpq2_test: gp_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS)
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
$(WATCHDOG_DLOPEN) \
diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am
index c691141..f1f6edb 100644
--- a/interfaces/Prolog/SICStus/Makefile.am
+++ b/interfaces/Prolog/SICStus/Makefile.am
@@ -272,11 +272,12 @@ pl_check_test: ppl_sicstus ppl_sicstus.pl sp_pl_check.pl ../tests/pl_check.pl $(
fi
diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
+$(CLPQ_TESTS):
+ cp -f $(srcdir)/../tests/$@ .
+
# FIXME: the last prerequisite is to get around a bug of `spld': see
# http://www.cs.unipr.it/pipermail/ppl-devel/2006-January/007610.html
-clpq_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) | pl_check_test
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+clpq_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS) | pl_check_test
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
$(WATCHDOG_DLOPEN) \
@@ -287,9 +288,7 @@ clpq_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq.pl ../tests/scrip
# FIXME: the last prerequisite is to get around a bug of `spld': see
# http://www.cs.unipr.it/pipermail/ppl-devel/2006-January/007610.html
-clpq2_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) | clpq_test
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+clpq2_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) | clpq_test
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
$(WATCHDOG_DLOPEN) \
diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am
index 41db227..fb00411 100644
--- a/interfaces/Prolog/SWI/Makefile.am
+++ b/interfaces/Prolog/SWI/Makefile.am
@@ -285,9 +285,10 @@ pl_check_test: swi_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK)
fi
diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
-clpq_test: pl_clpq ../tests/script_clpq $(EXPECTED_CLPQ)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+$(CLPQ_TESTS):
+ cp -f $(srcdir)/../tests/$@ .
+
+clpq_test: pl_clpq ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS)
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
$(WATCHDOG_DLOPEN) \
@@ -295,9 +296,7 @@ clpq_test: pl_clpq ../tests/script_clpq $(EXPECTED_CLPQ)
$(CHECKER) ./pl_clpq <$(srcdir)/../tests/script_clpq >obtained_clpq
diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq
-clpq2_test: pl_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+clpq2_test: pl_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS)
$(LIBTOOL) --mode=execute \
-dlopen ../../../src/libppl.la \
$(WATCHDOG_DLOPEN) \
diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am
index 2cbd801..1c6d5f5 100644
--- a/interfaces/Prolog/XSB/Makefile.am
+++ b/interfaces/Prolog/XSB/Makefile.am
@@ -228,9 +228,10 @@ EXPECTED_PCHK = $(srcdir)/../tests/expected_pchk_$(COEFFICIENT_MNEMONIC)
endif !ASSERTIONS_ENABLED
-check-local: libppl_xsb.la xsb_clpq.P ../tests/clpq.pl ../tests/script_clpq xsb_clpq2.P ../tests/clpq2.pl ../tests/script_clpq2 pl_check_test ppl_prolog_generated_test
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+$(CLPQ_TESTS):
+ cp -f $(srcdir)/../tests/$@ .
+
+check-local: libppl_xsb.la xsb_clpq.P ../tests/clpq.pl ../tests/script_clpq xsb_clpq2.P ../tests/clpq2.pl ../tests/script_clpq2 pl_check_test ppl_prolog_generated_test (CLPQ_TESTS)
if [ $(abs_srcdir) != `pwd` ]; then \
cp -f $(srcdir)/xsb_clpq.P . ; \
fi
diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am
index 45c28d2..c147428 100644
--- a/interfaces/Prolog/YAP/Makefile.am
+++ b/interfaces/Prolog/YAP/Makefile.am
@@ -217,9 +217,10 @@ pl_check_test: yap_pl_check.pl ppl_yap.pl ../tests/pl_check.pl $(EXPECTED_PCHK)
<script_pchk >obtained_pchk
diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
-clpq_test: yap_clpq.pl ppl_yap.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+$(CLPQ_TESTS):
+ cp -f $(srcdir)/../tests/$@ .
+
+clpq_test: yap_clpq.pl ppl_yap.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS)
echo "main." >script_clpq
cat $(srcdir)/../tests/script_clpq >>script_clpq
$(LIBTOOL) --mode=execute \
@@ -230,9 +231,7 @@ clpq_test: yap_clpq.pl ppl_yap.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECT
<script_clpq >obtained_clpq
diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq
-clpq2_test: yap_clpq2.pl ppl_yap.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2)
- LANG=C; \
- for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done
+clpq2_test: yap_clpq2.pl ppl_yap.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS)
echo "main." >script_clpq2
cat $(srcdir)/../tests/script_clpq2 >>script_clpq2
$(LIBTOOL) --mode=execute \
More information about the PPL-devel
mailing list