Merge branch 'spark'

Makefile.am

@@ -24,7 +24,7 @@ po_hi_doc_dir=${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/share/doc/ocarina'}
 
 install-data-local:
 	$(MAKE) -C examples DESTDIR="$(DESTDIR)" install
-	$(INSTALL) -d $(DESTDIR)$(po_hi_doc_dir) 
+	$(INSTALL) -d $(DESTDIR)$(po_hi_doc_dir)
 	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(po_hi_doc_dir)/ChangeLog_polyorb_hi_ada
 
 uninstall-local:
@@ -43,3 +43,6 @@ release:
 	$(MAKE) dist
 	cp -f $(DIST_ARCHIVES) release/$(DIST_ARCHIVES)
 
+# We disable checking of the distclean rule, it is a nuisance
+distcleancheck:
+	@:
\ No newline at end of file

doc/Makefile.am

@@ -203,7 +203,7 @@ uninstall-local:
 	rm -rf  $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html
 
 clean-local:
-	@-rm -f *.aux *.log *.dvi *.bbl *.blg *~ *.bak *.toc 
+	@-rm -f *.aux *.log *.dvi *.bbl *.blg *~ *.bak *.toc
 	@-rm -f ${SRC_CODE} ${DOC_CODE} ${AADL_MODELS}
 
 realclean: clean

examples/aadlv1/d3.1.3-1/Makefile.am

@@ -20,11 +20,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
   SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
   CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 if HAS_GNATMAKE_FOR_LEON_GNAT
   SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl

examples/aadlv1/delayed_connections/Makefile.am

@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv1/import/Makefile.am

@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
 	$(REF_OUTPUTS) $(srcdir)/import.c

examples/aadlv1/multiple_instances/Makefile.am

@@ -22,11 +22,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv1/ping/Makefile.am

@@ -28,11 +28,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 if HAS_GNATMAKE_FOR_LEON_GNAT
    SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl

examples/aadlv1/prime_numbers/Makefile.am

@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv1/ravenscar_example/Makefile.am

@@ -31,11 +31,10 @@ CHECKABLE_SCENARIO_FILES =
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv1/sunseeker/Makefile.am

@@ -25,12 +25,11 @@ if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
 
+if HAS_GNATMAKE_FOR_LEON_GNAT
+   SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
-
-if HAS_GNATMAKE_FOR_LEON_GNAT
-   SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
 endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \

examples/aadlv2/d3.1.3-1/Makefile.am

@@ -20,11 +20,10 @@ CHECKABLE_SCENARIO_FILES =
 
 if HAS_GNATMAKE_FOR_LEON
   SCENARIO_FILES += $(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
   CHECKABLE_SCENARIO_FILES += $(srcdir)/scenario_local.aadl
 endif
+endif
 
 if HAS_GNATMAKE_FOR_LEON_GNAT
   SCENARIO_FILES += $(srcdir)/scenario_local_gnat.aadl

examples/aadlv2/delayed_connections/Makefile.am

@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv2/device_drivers/Makefile.am

 # BEGIN: DO NOT DELETE THIS LINE
 ADA_SPECS_WITH_BODY = $(srcdir)/ping.ads $(srcdir)/pinged.ads
 
-ADA_SPECS = $(ADA_SPECS_WITH_BODY)
+ADA_SPECS = $(ADA_SPECS_WITH_BODY) $(srcdir)/pohicdriver_ip.ads	\
+	$(srcdir)/adaasn1rtl.ads
 
 ADA_BODIES = $(ADA_SPECS_WITH_BODY:.ads=.adb)
 
 AADL_SOURCES = $(srcdir)/beeper.aadl $(srcdir)/generic_native.aadl	\
 	$(srcdir)/software.aadl $(srcdir)/system_demo.aadl		\
-	$(srcdir)/tcp_protocol.aadl $(srcdir)/scenario.aadl
+	$(srcdir)/tcp_protocol.aadl $(srcdir)/scenario.aadl		\
+	$(srcdir)/generic_bus.aadl
 
 # END: DO NOT DELETE THIS LINE
 

examples/aadlv2/import/Makefile.am

@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
 	$(REF_OUTPUTS) $(srcdir)/import.c

examples/aadlv2/multiple_instances/Makefile.am

@@ -22,11 +22,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv2/ping/Makefile.am

@@ -32,11 +32,10 @@ endif
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 if HAS_GNATMAKE_FOR_LEON_GNAT
    SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl

examples/aadlv2/prime_numbers/Makefile.am

@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv2/ravenscar_example/Makefile.am

@@ -31,11 +31,10 @@ CHECKABLE_SCENARIO_FILES =
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
 endif
+endif
 
 EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
         $(REF_OUTPUTS)

examples/aadlv2/sunseeker/Makefile.am

@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES=
 
 if HAS_GNATMAKE_FOR_LEON
    SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
-endif
-
 if HAS_TSIM_FOR_LEON
    CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
 endif
+endif
 
 if HAS_GNATMAKE_FOR_LEON_GNAT
    SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl