From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 23 Jul 2013 19:01:59 +0000 (+0200)
Subject: Clean up generation of ert_main.c
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/ert_linux.git/commitdiff_plain/54c073669bb4037d48a10e412f4cafec2e54c55e

Clean up generation of ert_main.c

Note: It seems that there is a race condition when using external mode
and the model is executed with -w (wait for connection) parameter.
---

diff --git a/ert_linux/ert_linux_file_process.tlc b/ert_linux/ert_linux_file_process.tlc
index 3f61f51..7fbfc82 100644
--- a/ert_linux/ert_linux_file_process.tlc
+++ b/ert_linux/ert_linux_file_process.tlc
@@ -39,13 +39,8 @@
     %endif
 %endforeach
 
-%% Single-tasking
-/% %if solverMode == "SingleTasking" %/
-/%     %include "linux_ert_target_singletasking_main.tlc" %/
-/% %else %/
-%% Multi-tasking
-    %include "ert_linux_multitasking_main.tlc"
-/% %endif %/
+%% Generate ert_main.c
+%include "ert_linux_main.tlc"
 
 %openfile buff
 %<generateDeclarations()>
@@ -57,5 +52,3 @@
 %<generateMain()>
 %closefile buff
 %<LibSetSourceFileSection(ert_mainC, "Functions", buff)>
-
-%% [EOF] linux_ert_target_generate_main.tlc
diff --git a/ert_linux/ert_linux_multitasking_main.tlc b/ert_linux/ert_linux_main.tlc
similarity index 100%
rename from ert_linux/ert_linux_multitasking_main.tlc
rename to ert_linux/ert_linux_main.tlc