[PPL-devel] [GIT] ppl/ppl(ppl-0_11-branch): Do use $(interface_generator_files) when defined.
Roberto Bagnara
bagnara at cs.unipr.it
Wed May 18 10:20:30 CEST 2011
Module: ppl/ppl
Branch: ppl-0_11-branch
Commit: 26f7d1438309c4d0245d1777936b2406a124aa38
URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=26f7d1438309c4d0245d1777936b2406a124aa38
Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date: Wed May 18 09:24:37 2011 +0200
Do use $(interface_generator_files) when defined.
---
interfaces/C/Makefile.am | 4 ++--
interfaces/Java/jni/Makefile.am | 4 ++--
.../Java/parma_polyhedra_library/Makefile.am | 4 ++--
interfaces/Java/tests/Makefile.am | 6 ++----
interfaces/OCaml/Makefile.am | 4 ++--
interfaces/OCaml/tests/Makefile.am | 6 ++----
interfaces/Prolog/Makefile.am | 11 ++++-------
7 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/interfaces/C/Makefile.am b/interfaces/C/Makefile.am
index 678c7a5..431d6df 100644
--- a/interfaces/C/Makefile.am
+++ b/interfaces/C/Makefile.am
@@ -110,12 +110,12 @@ dist-hook:
mv -f $(distdir)/ppl_c.h $(distdir)/ppl_c.h.dist
interface_generator_dependencies = \
+$(interface_generator_files) \
$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../ppl_interface_generator_common.m4 \
../ppl_interface_generator_common_dat.m4 \
../ppl_interface_generator_copyright \
-../ppl_interface_generator_common_procedure_generators.m4 \
-$(interface_generator_files)
+../ppl_interface_generator_common_procedure_generators.m4
ppl_c_domains.h: $(interface_generator_dependencies)
$(M4) --prefix-builtin -I.. -I$(srcdir) -I$(srcdir)/.. \
diff --git a/interfaces/Java/jni/Makefile.am b/interfaces/Java/jni/Makefile.am
index db1ce4c..16799ef 100644
--- a/interfaces/Java/jni/Makefile.am
+++ b/interfaces/Java/jni/Makefile.am
@@ -26,13 +26,13 @@ ppl_interface_generator_java_classes_cc_files.m4 \
ppl_interface_generator_java_classes_cc_code.m4
interface_generator_dependencies = \
+$(interface_generator_files) \
$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../../ppl_interface_generator_common.m4 \
../../ppl_interface_generator_common_dat.m4 \
../../ppl_interface_generator_copyright \
../../ppl_interface_generator_common_procedure_generators.m4 \
-../ppl_interface_generator_java_procedure_generators.m4 \
-$(interface_generator_files)
+../ppl_interface_generator_java_procedure_generators.m4
EXTRA_DIST = \
$(interface_generator_files)
diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am
index 2560811..e5d72e4 100644
--- a/interfaces/Java/parma_polyhedra_library/Makefile.am
+++ b/interfaces/Java/parma_polyhedra_library/Makefile.am
@@ -201,13 +201,13 @@ $(fixed_java_sources) \
$(srcdir)/Fake_Class_for_Doxygen.java
interface_generator_dependencies = \
+$(interface_generator_files) \
$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../../ppl_interface_generator_common.m4 \
../../ppl_interface_generator_common_dat.m4 \
../../ppl_interface_generator_copyright \
../../ppl_interface_generator_common_procedure_generators.m4 \
-../ppl_interface_generator_java_procedure_generators.m4 \
-$(interface_generator_files)
+../ppl_interface_generator_java_procedure_generators.m4
BUILT_SOURCES = \
java_classes.stamp \
diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
index d34a662..64ba864 100644
--- a/interfaces/Java/tests/Makefile.am
+++ b/interfaces/Java/tests/Makefile.am
@@ -28,19 +28,19 @@ ppl_interface_generator_java_test_java.m4 \
ppl_interface_generator_java_test_java_code.m4
interface_generator_dependencies = \
+$(interface_generator_files) \
$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../../ppl_interface_generator_common.m4 \
../../ppl_interface_generator_common_dat.m4 \
../../ppl_interface_generator_copyright \
../../ppl_interface_generator_common_procedure_generators.m4 \
../ppl_interface_generator_java_procedure_generators.m4 \
-ppl_interface_generator_java_test_java.m4 \
-ppl_interface_generator_java_test_java_code.m4 \
ppl_java_tests_common
# Even if the Java sources are not really needed, they are built by m4,
# we need to include them to invoke the Automake Java build system.
EXTRA_DIST = \
+$(interface_generator_files) \
Test_Executor.java \
C_Polyhedron_test1.java \
NNC_Polyhedron_test1.java \
@@ -49,8 +49,6 @@ PIP_Problem_test1.java \
Parma_Polyhedra_Library_test1.java \
Parma_Polyhedra_Library_test2.java \
PPL_Test.java \
-ppl_interface_generator_java_test_java_code.m4 \
-ppl_interface_generator_java_test_java.m4 \
ppl_java_tests_common
check_JAVA = \
diff --git a/interfaces/OCaml/Makefile.am b/interfaces/OCaml/Makefile.am
index 29a29e4..c0c5ac7 100644
--- a/interfaces/OCaml/Makefile.am
+++ b/interfaces/OCaml/Makefile.am
@@ -185,11 +185,11 @@ $(WATCHDOG_INCLUDE_OPTIONS) \
@extra_includes@
interface_generator_dependencies = \
+$(interface_generator_files) \
$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../ppl_interface_generator_common.m4 \
../ppl_interface_generator_common_dat.m4 \
-../ppl_interface_generator_copyright \
-$(interface_generator_files)
+../ppl_interface_generator_copyright
ppl_ocaml.cma: ppl_ocaml_globals.cmo ppl_ocaml.cmo libppl_ocaml.a
$(OCAMLC_ENV) $(OCAMLC) -o $@ -a -custom \
diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am
index d8c8d54..9cd317c 100644
--- a/interfaces/OCaml/tests/Makefile.am
+++ b/interfaces/OCaml/tests/Makefile.am
@@ -48,15 +48,13 @@ $(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../../ppl_interface_generator_copyright \
../../ppl_interface_generator_common_procedure_generators.m4 \
../ppl_interface_generator_ocaml_procedure_generators.m4 \
-ppl_interface_generator_ocaml_test_ml.m4 \
-ppl_interface_generator_ocaml_test_ml_code.m4 \
+$(interface_generator_files) \
ppl_ocaml_tests_common
# Even if the OCaml sources are not really needed, they are built by m4,
# we need to include them to invoke the Automake OCaml build system.
EXTRA_DIST = \
-ppl_interface_generator_ocaml_test_ml_code.m4 \
-ppl_interface_generator_ocaml_test_ml.m4 \
+$(interface_generator_files) \
ppl_ocaml_tests_common
OCAMLC_ENV = OCAMLRUNPARAM='l=1M'
diff --git a/interfaces/Prolog/Makefile.am b/interfaces/Prolog/Makefile.am
index a4cad74..c7c1f87 100644
--- a/interfaces/Prolog/Makefile.am
+++ b/interfaces/Prolog/Makefile.am
@@ -100,16 +100,13 @@ ppl_prolog_domains.cc.stamp
nodist_noinst_DATA = Prolog_configured_interface.dox
interface_generator_dependencies = \
+$(interface_generator_files) \
+$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
../ppl_interface_generator_common.m4 \
../ppl_interface_generator_common_dat.m4 \
../ppl_interface_generator_copyright \
-../ppl_interface_generator_common_procedure_generators.m4 \
-ppl_interface_generator_prolog_procedure_generators.m4 \
-$(top_builddir)/interfaces/ppl_interface_instantiations.m4 \
-ppl_interface_generator_prolog_hh_files.m4 \
-ppl_interface_generator_prolog_hh_code.m4 \
-ppl_interface_generator_prolog_cc_files.m4 \
-ppl_interface_generator_prolog_cc_code.m4
+../ppl_interface_generator_common_procedure_generators.m4
+
ppl_prolog_domains.hh: $(interface_generator_dependencies)
$(M4) --prefix-builtin -I.. -I$(srcdir) -I$(srcdir)/.. \
More information about the PPL-devel
mailing list