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

Merge branch 'spark'

parents c10f2a74 9621c74a
......@@ -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
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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) \
......
......@@ -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
......
......@@ -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)
......
# 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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
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