Module: ppl/ppl Branch: master Commit: b4e8a607e5a61dd8a9e9b0da3f30a405371bb2ed URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b4e8a607e5a61...
Author: Roberto Bagnara bagnara@cs.unipr.it Date: Mon Feb 14 16:45:57 2011 +0100
Fixed a number of wrong conditionals.
---
interfaces/Prolog/Ciao/Makefile.am | 8 ++------ interfaces/Prolog/GNU/Makefile.am | 12 ++++++------ interfaces/Prolog/SICStus/Makefile.am | 20 ++++++-------------- interfaces/Prolog/SWI/Makefile.am | 24 ++++++++---------------- interfaces/Prolog/XSB/Makefile.am | 10 +++------- interfaces/Prolog/YAP/Makefile.am | 10 +++++----- 6 files changed, 30 insertions(+), 54 deletions(-)
diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index ec2c121..50ff920 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -225,14 +225,10 @@ ciao_clpq2: .libs/libppl_ciao.so ppl_ciao.po ciao_clpq.pl ../tests/clpq2.pl | ci
ciao_prolog_generated_test: .libs/libppl_ciao.so ppl_ciao.po ciao_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl | ciao_pl_check - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl .; \ - fi + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . cp -f ../tests/ppl_prolog_generated_test_main.pl . ciaoc -o $@ ciao_prolog_generated_test.pl - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ - fi + rm -f ppl_prolog_generated_test_common.pl rm -f ppl_prolog_generated_test_main.pl
CLPQ_TESTS_NONSTRICT = \ diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am index c772687..f0ebf97 100644 --- a/interfaces/Prolog/GNU/Makefile.am +++ b/interfaces/Prolog/GNU/Makefile.am @@ -282,11 +282,11 @@ clpq2_test: gp_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2
ppl_prolog_generated_test: gnu_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + if [ $(abs_srcdir) != `pwd` ]; then \ cp -f $(srcdir)/gnu_prolog_generated_test.pl . ; \ fi - cp -f ../tests/ppl_prolog_generated_test_main.pl . ; \ + cp -f ../tests/ppl_prolog_generated_test_main.pl . echo "['ppl_prolog_generated_test_main.pl', 'gnu_prolog_generated_test.pl']." \ >script_pgt echo "main." >>script_pgt @@ -295,11 +295,11 @@ ppl_prolog_generated_test: gnu_prolog_generated_test.pl ../tests/ppl_prolog_gen $(WATCHDOG_DLOPEN) \ -dlopen libppl_gprolog.la \ ./ppl_gprolog <script_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ + rm -f ppl_prolog_generated_test_common.pl + if [ $(abs_srcdir) != `pwd` ]; then \ rm -f gnu_prolog_generated_test.pl; \ fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt
CLEANFILES = \ diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am index b4d7146..b8e0f57 100644 --- a/interfaces/Prolog/SICStus/Makefile.am +++ b/interfaces/Prolog/SICStus/Makefile.am @@ -263,18 +263,14 @@ endif !ASSERTIONS_ENABLED check-local: pl_check_test clpq_test clpq2_test ppl_prolog_generated_test
pl_check_test: ppl_sicstus ppl_sicstus.pl sp_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK) - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/pl_check.pl . ;\ - fi + cp -f $(srcdir)/../tests/pl_check.pl . $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ ./ppl_sicstus -l $(srcdir)/sp_pl_check.pl \ --goal "main." \ >obtained_pchk - if [ $(srcdir) != `pwd` ]; then \ - rm -f pl_check.pl ;\ - fi + rm -f pl_check.pl diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
$(CLPQ_TESTS): @@ -303,20 +299,16 @@ clpq2_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq2.pl ../tests/scr diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2
ppl_prolog_generated_test: ppl_sicstus ppl_sicstus.pl sp_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ - fi - cp -f ../tests/ppl_prolog_generated_test_main.pl . ; \ + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + cp -f ../tests/ppl_prolog_generated_test_main.pl . $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ ./ppl_sicstus -l $(srcdir)/sp_prolog_generated_test.pl \ --goal "main." \ >obtained_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ - fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_common.pl + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt
CLEANFILES = \ diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 078fac0..dfebe4d 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -276,18 +276,14 @@ endif !ASSERTIONS_ENABLED check-local: pl_check_test clpq_test clpq2_test ppl_prolog_generated_test
pl_check_test: swi_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK) - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/pl_check.pl . ; \ - fi ;\ - echo "ensure_loaded('$(srcdir)/swi_pl_check'). main." > script_pchk + cp -f $(srcdir)/../tests/pl_check.pl . + echo "ensure_loaded('$(srcdir)/swi_pl_check'). main." > script_pchk $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ -dlopen libppl_swiprolog.la \ $(CHECKER) ./ppl_pl < script_pchk - if [ $(srcdir) != `pwd` ]; then \ - rm -f pl_check.pl; \ - fi + rm -f pl_check.pl diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
$(CLPQ_TESTS): @@ -310,20 +306,16 @@ clpq2_test: pl_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2
ppl_prolog_generated_test: swi_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl ../tests/ppl_prolog_generated_test_common.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ - fi - cp -f ../tests/ppl_prolog_generated_test_main.pl . ; \ - echo "ensure_loaded('$(srcdir)/swi_prolog_generated_test'). main." > script_pgt + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + cp -f ../tests/ppl_prolog_generated_test_main.pl . + echo "ensure_loaded('$(srcdir)/swi_prolog_generated_test'). main." > script_pgt $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ -dlopen libppl_swiprolog.la \ $(CHECKER) ./ppl_pl <script_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ - fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_common.pl + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt
CLEANFILES = \ diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am index d5bff8b..4db977c 100644 --- a/interfaces/Prolog/XSB/Makefile.am +++ b/interfaces/Prolog/XSB/Makefile.am @@ -286,9 +286,7 @@ pl_check_test: libppl_xsb.la ppl_xsb.xwam xsb_pl_check.P ../tests/pl_check.pl diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk
ppl_prolog_generated_test: libppl_xsb.la ppl_xsb.xwam xsb_prolog_generated_test.P ../tests/ppl_prolog_generated_test_main.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ - fi + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . cp -f ../tests/ppl_prolog_generated_test_main.pl . rm -f xsb_prolog_generated_test.xwam $(LIBTOOL) --mode=execute \ @@ -296,10 +294,8 @@ ppl_prolog_generated_test: libppl_xsb.la ppl_xsb.xwam xsb_prolog_generated_test. $(WATCHDOG_DLOPEN) \ xsb xsb_prolog_generated_test \ >obtained_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl ; \ - fi - rm -f ppl_prolog_generated_test_main.pl ; \ + rm -f ppl_prolog_generated_test_common.pl + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt
diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am index dd133ce..c71adac 100644 --- a/interfaces/Prolog/YAP/Makefile.am +++ b/interfaces/Prolog/YAP/Makefile.am @@ -249,8 +249,8 @@ clpq2_test: yap_clpq2.pl ppl_yap.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EX diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2
ppl_prolog_generated_test: yap_prolog_generated_test.pl ppl_yap.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + if [ $(abs_srcdir) != `pwd` ]; then \ cp -f $(srcdir)/yap_prolog_generated_test.pl . ; \ cp -f $(srcdir)/ppl_yap.pl . ; \ fi @@ -262,12 +262,12 @@ ppl_prolog_generated_test: yap_prolog_generated_test.pl ppl_yap.pl ../tests/exp -dlopen ppl_yap.la \ $(YAP_PROLOG) -l yap_prolog_generated_test.pl \ <script_pgt >obtained_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ + rm -f ppl_prolog_generated_test_common.pl + if [ $(abs_srcdir) != `pwd` ]; then \ rm -f yap_prolog_generated_test.pl; \ rm -f ppl_yap.pl; \ fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt
endif ENABLE_SHARED