|
yann@3233
|
1 |
commit 10e0afa8fa25c9e0e8eaac9a0d730ab325086010
|
|
yann@3233
|
2 |
Author: Roberto Bagnara <bagnara@cs.unipr.it>
|
|
yann@3233
|
3 |
Date: Sun Feb 12 08:48:59 2012 +0100
|
|
yann@3233
|
4 |
|
|
yann@3233
|
5 |
Prolog sources must go under .../share/ppl as these files are architecture independent.
|
|
yann@3233
|
6 |
Moreover, new versions of Automake no longer accept pkglib_DATA.
|
|
yann@3233
|
7 |
|
|
yann@3233
|
8 |
diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am
|
|
yann@3233
|
9 |
index c8dd56e..8dcf17e 100644
|
|
yann@3233
|
10 |
--- a/interfaces/Prolog/Ciao/Makefile.am
|
|
yann@3233
|
11 |
+++ b/interfaces/Prolog/Ciao/Makefile.am
|
|
yann@3233
|
12 |
@@ -170,7 +170,7 @@ $(NO_UNDEFINED_FLAG) \
|
|
yann@3233
|
13 |
-module \
|
|
yann@3233
|
14 |
-avoid-version
|
|
yann@3233
|
15 |
|
|
yann@3233
|
16 |
-pkglib_DATA = ppl_ciao.po
|
|
yann@3233
|
17 |
+pkgdata_DATA = ppl_ciao.po
|
|
yann@3233
|
18 |
|
|
yann@3233
|
19 |
ppl_ciao.pl: $(interface_generator_dependencies)
|
|
yann@3233
|
20 |
$(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \
|
|
yann@3233
|
21 |
diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am
|
|
yann@3233
|
22 |
index 5904bf1..2ba45ee 100644
|
|
yann@3233
|
23 |
--- a/interfaces/Prolog/GNU/Makefile.am
|
|
yann@3233
|
24 |
+++ b/interfaces/Prolog/GNU/Makefile.am
|
|
yann@3233
|
25 |
@@ -169,7 +169,7 @@ ppl_gprolog.pl: $(interface_generator_dependencies)
|
|
yann@3233
|
26 |
$(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \
|
|
yann@3233
|
27 |
$(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@
|
|
yann@3233
|
28 |
|
|
yann@3233
|
29 |
-pkglib_DATA = ppl_gprolog.pl
|
|
yann@3233
|
30 |
+pkgdata_DATA = ppl_gprolog.pl
|
|
yann@3233
|
31 |
|
|
yann@3233
|
32 |
bin_PROGRAMS = ppl_gprolog
|
|
yann@3233
|
33 |
|
|
yann@3233
|
34 |
diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am
|
|
yann@3233
|
35 |
index 17a54c7..22f809f 100644
|
|
yann@3233
|
36 |
--- a/interfaces/Prolog/SICStus/Makefile.am
|
|
yann@3233
|
37 |
+++ b/interfaces/Prolog/SICStus/Makefile.am
|
|
yann@3233
|
38 |
@@ -69,7 +69,7 @@ ppl_sicstus_SOURCES =
|
|
yann@3233
|
39 |
|
|
yann@3233
|
40 |
if ENABLE_SHARED
|
|
yann@3233
|
41 |
|
|
yann@3233
|
42 |
-pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o
|
|
yann@3233
|
43 |
+pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o
|
|
yann@3233
|
44 |
|
|
yann@3233
|
45 |
ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la
|
|
yann@3233
|
46 |
$(LIBTOOL) --mode=link --tag=CXX \
|
|
yann@3233
|
47 |
@@ -87,7 +87,7 @@ install-data-local: ppl_sicstus.so
|
|
yann@3233
|
48 |
|
|
yann@3233
|
49 |
else !ENABLE_SHARED
|
|
yann@3233
|
50 |
|
|
yann@3233
|
51 |
-pkglib_DATA = ppl_sicstus.pl
|
|
yann@3233
|
52 |
+pkgdata_DATA = ppl_sicstus.pl
|
|
yann@3233
|
53 |
|
|
yann@3233
|
54 |
endif !ENABLE_SHARED
|
|
yann@3233
|
55 |
|
|
yann@3233
|
56 |
diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am
|
|
yann@3233
|
57 |
index f5bcbe8..5e4e0e4 100644
|
|
yann@3233
|
58 |
--- a/interfaces/Prolog/SWI/Makefile.am
|
|
yann@3233
|
59 |
+++ b/interfaces/Prolog/SWI/Makefile.am
|
|
yann@3233
|
60 |
@@ -189,7 +189,7 @@ $(NO_UNDEFINED_FLAG) \
|
|
yann@3233
|
61 |
bin_PROGRAMS = ppl_pl
|
|
yann@3233
|
62 |
ppl_pl_SOURCES = ppl_pl.cc
|
|
yann@3233
|
63 |
|
|
yann@3233
|
64 |
-pkglib_DATA = ppl_swiprolog.pl
|
|
yann@3233
|
65 |
+pkgdata_DATA = ppl_swiprolog.pl
|
|
yann@3233
|
66 |
|
|
yann@3233
|
67 |
CLPQ_TESTS_NONSTRICT = \
|
|
yann@3233
|
68 |
ack.clpq \
|
|
yann@3233
|
69 |
diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am
|
|
yann@3233
|
70 |
index 18648eb..1bc1e67 100644
|
|
yann@3233
|
71 |
--- a/interfaces/Prolog/XSB/Makefile.am
|
|
yann@3233
|
72 |
+++ b/interfaces/Prolog/XSB/Makefile.am
|
|
yann@3233
|
73 |
@@ -188,7 +188,7 @@ $(NO_UNDEFINED_FLAG) \
|
|
yann@3233
|
74 |
-module \
|
|
yann@3233
|
75 |
-avoid-version
|
|
yann@3233
|
76 |
|
|
yann@3233
|
77 |
-pkglib_DATA = ppl_xsb.xwam
|
|
yann@3233
|
78 |
+pkgdata_DATA = ppl_xsb.xwam
|
|
yann@3233
|
79 |
|
|
yann@3233
|
80 |
ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la
|
|
yann@3233
|
81 |
cp -f ppl_xsb.cc ppl_xsb.c
|
|
yann@3233
|
82 |
diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am
|
|
yann@3233
|
83 |
index fab59c2..34d89e9 100644
|
|
yann@3233
|
84 |
--- a/interfaces/Prolog/YAP/Makefile.am
|
|
yann@3233
|
85 |
+++ b/interfaces/Prolog/YAP/Makefile.am
|
|
yann@3233
|
86 |
@@ -179,7 +179,7 @@ $(NO_UNDEFINED_FLAG) \
|
|
yann@3233
|
87 |
-module \
|
|
yann@3233
|
88 |
-avoid-version
|
|
yann@3233
|
89 |
|
|
yann@3233
|
90 |
-pkglib_DATA = ppl_yap.pl
|
|
yann@3233
|
91 |
+pkgdata_DATA = ppl_yap.pl
|
|
yann@3233
|
92 |
|
|
yann@3233
|
93 |
CLPQ_TESTS_NONSTRICT = \
|
|
yann@3233
|
94 |
ack.clpq \
|