Commit 8c2b325e authored by yoogx's avatar yoogx
Browse files

Merge branch 'spark'

parents c10f2a74 9621c74a
...@@ -24,7 +24,7 @@ po_hi_doc_dir=${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/share/doc/ocarina'} ...@@ -24,7 +24,7 @@ po_hi_doc_dir=${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/share/doc/ocarina'}
install-data-local: install-data-local:
$(MAKE) -C examples DESTDIR="$(DESTDIR)" install $(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 $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(po_hi_doc_dir)/ChangeLog_polyorb_hi_ada
uninstall-local: uninstall-local:
...@@ -43,3 +43,6 @@ release: ...@@ -43,3 +43,6 @@ release:
$(MAKE) dist $(MAKE) dist
cp -f $(DIST_ARCHIVES) release/$(DIST_ARCHIVES) 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
...@@ -203,7 +203,7 @@ uninstall-local: ...@@ -203,7 +203,7 @@ uninstall-local:
rm -rf $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html rm -rf $(DESTDIR)$(po_hi_doc_dir)/$(GUIDE).html
clean-local: 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} @-rm -f ${SRC_CODE} ${DOC_CODE} ${AADL_MODELS}
realclean: clean realclean: clean
......
...@@ -20,11 +20,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -20,11 +20,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
if HAS_GNATMAKE_FOR_LEON_GNAT if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
......
...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(srcdir)/import.c $(REF_OUTPUTS) $(srcdir)/import.c
......
...@@ -22,11 +22,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -22,11 +22,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -28,11 +28,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -28,11 +28,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
if HAS_GNATMAKE_FOR_LEON_GNAT if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
......
...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -31,11 +31,10 @@ CHECKABLE_SCENARIO_FILES = ...@@ -31,11 +31,10 @@ CHECKABLE_SCENARIO_FILES =
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -25,12 +25,11 @@ if HAS_GNATMAKE_FOR_LEON ...@@ -25,12 +25,11 @@ if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
endif endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
......
...@@ -20,11 +20,10 @@ CHECKABLE_SCENARIO_FILES = ...@@ -20,11 +20,10 @@ CHECKABLE_SCENARIO_FILES =
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES += $(srcdir)/scenario_local.aadl SCENARIO_FILES += $(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES += $(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES += $(srcdir)/scenario_local.aadl
endif endif
endif
if HAS_GNATMAKE_FOR_LEON_GNAT if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES += $(srcdir)/scenario_local_gnat.aadl SCENARIO_FILES += $(srcdir)/scenario_local_gnat.aadl
......
...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
# BEGIN: DO NOT DELETE THIS LINE # BEGIN: DO NOT DELETE THIS LINE
ADA_SPECS_WITH_BODY = $(srcdir)/ping.ads $(srcdir)/pinged.ads 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) ADA_BODIES = $(ADA_SPECS_WITH_BODY:.ads=.adb)
AADL_SOURCES = $(srcdir)/beeper.aadl $(srcdir)/generic_native.aadl \ AADL_SOURCES = $(srcdir)/beeper.aadl $(srcdir)/generic_native.aadl \
$(srcdir)/software.aadl $(srcdir)/system_demo.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 # END: DO NOT DELETE THIS LINE
......
...@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(srcdir)/import.c $(REF_OUTPUTS) $(srcdir)/import.c
......
...@@ -22,11 +22,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -22,11 +22,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -32,11 +32,10 @@ endif ...@@ -32,11 +32,10 @@ endif
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
if HAS_GNATMAKE_FOR_LEON_GNAT if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
......
...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -21,11 +21,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -31,11 +31,10 @@ CHECKABLE_SCENARIO_FILES = ...@@ -31,11 +31,10 @@ CHECKABLE_SCENARIO_FILES =
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_leon_local.aadl
endif endif
endif
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \ EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILES) \
$(REF_OUTPUTS) $(REF_OUTPUTS)
......
...@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES= ...@@ -23,11 +23,10 @@ CHECKABLE_SCENARIO_FILES=
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif
if HAS_TSIM_FOR_LEON if HAS_TSIM_FOR_LEON
CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl CHECKABLE_SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
endif endif
endif
if HAS_GNATMAKE_FOR_LEON_GNAT if HAS_GNATMAKE_FOR_LEON_GNAT
SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl SCENARIO_FILES+=$(srcdir)/scenario_local_gnat.aadl
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment