diff --git a/regression_test/compileonly/mfgen-tpd/splitting/Makefile b/regression_test/compileonly/mfgen-tpd/splitting/Makefile
index 98e883120f4a024dfd1004f07a7b451c78ccdc0b..03ecaba2a0388168b6ece27fac8b2e531e98270d 100644
--- a/regression_test/compileonly/mfgen-tpd/splitting/Makefile
+++ b/regression_test/compileonly/mfgen-tpd/splitting/Makefile
@@ -22,7 +22,7 @@ MAKEPROG := ${MAKE}
all: Normal Recursive RecursiveDynamic
Normal:
- cd a && \
+ rm -rf binDefault ../b/binDefault ../c/binDefault && cd a && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -f $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -b None && cd binDefault && make && cd .. && rm -rf binDefault && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -f $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
@@ -31,7 +31,7 @@ Normal:
-t a.tpd -b Number && cd binDefault && make && cd .. && rm -rf binDefault
Recursive:
- cd a && \
+ rm -rf binDefault ../b/binDefault ../c/binDefault && cd a && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -rgpcb None && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault && \
@@ -43,15 +43,15 @@ Recursive:
rm -rf binDefault ../b/binDefault ../c/binDefault
RecursiveDynamic:
- cd a && \
+ rm -rf binDefault ../b/binDefault ../c/binDefault && cd a && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
- -t a.tpd -rcplb None && cd binDefault && make && cd .. && \
+ -t a.tpd -rcpb None-Dyn && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
- -t a.tpd -rcplb Type && cd binDefault && make && cd .. && \
+ -t a.tpd -rcpb Type-Dyn && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
- -t a.tpd -rcplb Number && cd binDefault && make && cd .. && \
+ -t a.tpd -rcpb Number-Dyn && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault
diff --git a/regression_test/compileonly/mfgen-tpd/splitting/a/a.tpd b/regression_test/compileonly/mfgen-tpd/splitting/a/a.tpd
index 3ca6ec6e91f984c8488b979f90369045ab56bd27..69ac8e37592eacee05b7bfb5ee2539ab385cbc7f 100644
--- a/regression_test/compileonly/mfgen-tpd/splitting/a/a.tpd
+++ b/regression_test/compileonly/mfgen-tpd/splitting/a/a.tpd
@@ -46,10 +46,10 @@
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
- <Configuration name="Empty">
+ <Configuration name="Type">
<ProjectProperties>
<MakefileSettings>
- <codeSplitting></codeSplitting>
+ <codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
@@ -58,18 +58,62 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
- <requiredConfiguration>Empty</requiredConfiguration>
+ <requiredConfiguration>Type</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
- <requiredConfiguration>Empty</requiredConfiguration>
+ <requiredConfiguration>Type</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
- <Configuration name="Type">
+ <Configuration name="Number">
<ProjectProperties>
<MakefileSettings>
+ <codeSplitting>5</codeSplitting>
+ <targetExecutable>binDefault/binDefault</targetExecutable>
+ </MakefileSettings>
+ <LocalBuildSettings>
+ <workingDirectory>binDefault</workingDirectory>
+ </LocalBuildSettings>
+ <ConfigurationRequirements>
+ <configurationRequirement>
+ <projectName>b</projectName>
+ <requiredConfiguration>Number</requiredConfiguration>
+ </configurationRequirement>
+ <configurationRequirement>
+ <projectName>c</projectName>
+ <requiredConfiguration>Number</requiredConfiguration>
+ </configurationRequirement>
+ </ConfigurationRequirements>
+ </ProjectProperties>
+ </Configuration>
+ <Configuration name="None-Dyn">
+ <ProjectProperties>
+ <MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
+ <codeSplitting>none</codeSplitting>
+ <targetExecutable>binDefault/binDefault</targetExecutable>
+ </MakefileSettings>
+ <LocalBuildSettings>
+ <workingDirectory>binDefault</workingDirectory>
+ </LocalBuildSettings>
+ <ConfigurationRequirements>
+ <configurationRequirement>
+ <projectName>b</projectName>
+ <requiredConfiguration>None-Dyn</requiredConfiguration>
+ </configurationRequirement>
+ <configurationRequirement>
+ <projectName>c</projectName>
+ <requiredConfiguration>None-Dyn</requiredConfiguration>
+ </configurationRequirement>
+ </ConfigurationRequirements>
+ </ProjectProperties>
+ </Configuration>
+ <Configuration name="Type-Dyn">
+ <ProjectProperties>
+ <MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
@@ -79,18 +123,19 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
- <requiredConfiguration>Type</requiredConfiguration>
+ <requiredConfiguration>Type-Dyn</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
- <requiredConfiguration>Type</requiredConfiguration>
+ <requiredConfiguration>Type-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
- <Configuration name="Number">
+ <Configuration name="Number-Dyn">
<ProjectProperties>
<MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
@@ -100,11 +145,11 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
- <requiredConfiguration>Number</requiredConfiguration>
+ <requiredConfiguration>Number-Dyn</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
- <requiredConfiguration>Number</requiredConfiguration>
+ <requiredConfiguration>Number-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
diff --git a/regression_test/compileonly/mfgen-tpd/splitting/b/b.tpd b/regression_test/compileonly/mfgen-tpd/splitting/b/b.tpd
index 85ebb626ec65e4b33bdf9c35a9cdbcb6ae2054ad..3cd27d154122d3fc912ed5227b38d40d754af9dd 100644
--- a/regression_test/compileonly/mfgen-tpd/splitting/b/b.tpd
+++ b/regression_test/compileonly/mfgen-tpd/splitting/b/b.tpd
@@ -41,10 +41,10 @@
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
- <Configuration name="Empty">
+ <Configuration name="Type">
<ProjectProperties>
<MakefileSettings>
- <codeSplitting></codeSplitting>
+ <codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
@@ -53,14 +53,50 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
- <requiredConfiguration>Empty</requiredConfiguration>
+ <requiredConfiguration>Type</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
- <Configuration name="Type">
+ <Configuration name="Number">
<ProjectProperties>
<MakefileSettings>
+ <codeSplitting>5</codeSplitting>
+ <targetExecutable>binDefault/binDefault</targetExecutable>
+ </MakefileSettings>
+ <LocalBuildSettings>
+ <workingDirectory>binDefault</workingDirectory>
+ </LocalBuildSettings>
+ <ConfigurationRequirements>
+ <configurationRequirement>
+ <projectName>c</projectName>
+ <requiredConfiguration>Number</requiredConfiguration>
+ </configurationRequirement>
+ </ConfigurationRequirements>
+ </ProjectProperties>
+ </Configuration>
+ <Configuration name="None-Dyn">
+ <ProjectProperties>
+ <MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
+ <codeSplitting>none</codeSplitting>
+ <targetExecutable>binDefault/binDefault</targetExecutable>
+ </MakefileSettings>
+ <LocalBuildSettings>
+ <workingDirectory>binDefault</workingDirectory>
+ </LocalBuildSettings>
+ <ConfigurationRequirements>
+ <configurationRequirement>
+ <projectName>c</projectName>
+ <requiredConfiguration>None-Dyn</requiredConfiguration>
+ </configurationRequirement>
+ </ConfigurationRequirements>
+ </ProjectProperties>
+ </Configuration>
+ <Configuration name="Type-Dyn">
+ <ProjectProperties>
+ <MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
@@ -70,14 +106,15 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
- <requiredConfiguration>Type</requiredConfiguration>
+ <requiredConfiguration>Type-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
- <Configuration name="Number">
+ <Configuration name="Number-Dyn">
<ProjectProperties>
<MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
@@ -87,7 +124,7 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
- <requiredConfiguration>Number</requiredConfiguration>
+ <requiredConfiguration>Number-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
diff --git a/regression_test/compileonly/mfgen-tpd/splitting/c/c.tpd b/regression_test/compileonly/mfgen-tpd/splitting/c/c.tpd
index 3cbb46181aec71b6730e32d3dddcf83b8e11b4ac..d2ca4130701c09a5ca497850e7ebecd147cc4c65 100644
--- a/regression_test/compileonly/mfgen-tpd/splitting/c/c.tpd
+++ b/regression_test/compileonly/mfgen-tpd/splitting/c/c.tpd
@@ -32,10 +32,10 @@
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
- <Configuration name="Empty">
+ <Configuration name="Type">
<ProjectProperties>
<MakefileSettings>
- <codeSplitting></codeSplitting>
+ <codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
@@ -43,9 +43,33 @@
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
- <Configuration name="Type">
+ <Configuration name="Number">
<ProjectProperties>
<MakefileSettings>
+ <codeSplitting>5</codeSplitting>
+ <targetExecutable>binDefault/binDefault</targetExecutable>
+ </MakefileSettings>
+ <LocalBuildSettings>
+ <workingDirectory>binDefault</workingDirectory>
+ </LocalBuildSettings>
+ </ProjectProperties>
+ </Configuration>
+ <Configuration name="None-Dyn">
+ <ProjectProperties>
+ <MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
+ <codeSplitting>none</codeSplitting>
+ <targetExecutable>binDefault/binDefault</targetExecutable>
+ </MakefileSettings>
+ <LocalBuildSettings>
+ <workingDirectory>binDefault</workingDirectory>
+ </LocalBuildSettings>
+ </ProjectProperties>
+ </Configuration>
+ <Configuration name="Type-Dyn">
+ <ProjectProperties>
+ <MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
@@ -54,9 +78,10 @@
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
- <Configuration name="Number">
+ <Configuration name="Number-Dyn">
<ProjectProperties>
<MakefileSettings>
+ <dynamicLinking>true</dynamicLinking>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>