From c8b9a63cb4e8ebf46b79b9983a2c5ab0d862c5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= <martin.sjolund@liu.se>
Date: Mon, 13 Dec 2010 11:32:03 +0000
Subject: [PATCH] - Some fixes for the build system (call simcode and
 OpenModelicaBootstrapping.h targets)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7374 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
---
 Compiler/GenerateOMCHeader.mos | 47 +++-------------------------------
 Compiler/Makefile.common       | 14 +++++-----
 Compiler/Makefile.in           |  8 +++---
 3 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/Compiler/GenerateOMCHeader.mos b/Compiler/GenerateOMCHeader.mos
index 486e5ea5d7e..514e3cd186b 100644
--- a/Compiler/GenerateOMCHeader.mos
+++ b/Compiler/GenerateOMCHeader.mos
@@ -1,48 +1,7 @@
-loadFile("Absyn.mo");
-loadFile("Interactive.mo");
-loadFile("Values.mo");
+loadFile("FrontEnd/Absyn.mo");
+loadFile("Script/Interactive.mo");
+loadFile("FrontEnd/Values.mo");
 
-/*loadFile("AbsynDep.mo");
-loadFile("BackendDAE.mo");
-loadFile("CevalFunction.mo");
-loadFile("Ceval.mo");
-loadFile("CevalScript.mo");
-loadFile("ClassInf.mo");
-loadFile("CompiledTemplates.mo");
-loadFile("ConnectionGraph.mo");
-loadFile("Connect.mo");
-loadFile("DAE.mo");
-loadFile("DAEUtil.mo");
-loadFile("Dump.mo");
-loadFile("Env.mo");
-loadFile("Error.mo");
-loadFile("ExpressionSimplify.mo");
-loadFile("Graphviz.mo");
-loadFile("InnerOuter.mo");
-loadFile("InstanceHierarchy.mo");
-loadFile("Inst.mo");
-loadFile("IOStream.mo");
-loadFile("Lookup.mo");
-loadFile("MetaUtil.mo");
-loadFile("MMath.mo");
-loadFile("Prefix.mo");
-loadFile("SCodeFlatten.mo");
-loadFile("SCode.mo");
-loadFile("SCodeUtil.mo");
-loadFile("SimCodeC.mo");
-loadFile("SimCode.mo");
-loadFile("Static.mo");
-loadFile("TemplCG.mo");
-loadFile("TplAbsyn.mo");
-loadFile("TplCodegen.mo");
-loadFile("TplMain.mo");
-loadFile("Tpl.mo");
-loadFile("TplParser.mo");
-loadFile("Types.mo");
-loadFile("UnitAbsyn.mo");
-loadFile("Util.mo");
-loadFile("Values.mo");
-loadFile("VarTransform.mo");*/
 if getErrorString() == "" then loadOK := true; end if;
 a:=loadOK; // Will cause exit(1) if loadOK is undefined
 b3:=generateHeader("OpenModelicaBootstrappingHeader.h.new");
diff --git a/Compiler/Makefile.common b/Compiler/Makefile.common
index caf8581f8da..cc16cceba48 100644
--- a/Compiler/Makefile.common
+++ b/Compiler/Makefile.common
@@ -160,10 +160,10 @@ BackendDAEEXT.mo \
 
 
 # all modules
-SRCMO = $(FRONTEND) $(BACKEND) $(TEMPLATE) $(UTIL) $(SCRIPT) $(MAIN)
-ALLMO = $(SRCMO) $(EXTERNAL)
-SRCC = $(SRCMO:%.mo=%.c)
-SRCH=	$(SRCC:%.c=%.h)
-SRCSIG=	$(ALLMO:%.mo=%.sig)
-SRCSIGX=	$(ALLMO:%.mo=%.sigx)
-SRCO=	$(SRCC:.c=.o)
+SRCMO   = $(FRONTEND) $(BACKEND) $(TEMPLATE) $(UTIL) $(SCRIPT) $(MAIN)
+ALLMO   = $(SRCMO) $(EXTERNAL)
+SRCC    = $(SRCMO:%.mo=%.c)
+SRCH    = $(SRCC:%.c=%.h)
+SRCSIG  = $(ALLMO:%.mo=%.sig)
+SRCSIGX = $(ALLMO:%.mo=%.sigx)
+SRCO    = $(SRCC:.c=.o)
diff --git a/Compiler/Makefile.in b/Compiler/Makefile.in
index fa5542f2d4f..bb6f5d76abb 100644
--- a/Compiler/Makefile.in
+++ b/Compiler/Makefile.in
@@ -74,13 +74,13 @@ dinstall: install_scripts $(PROGD)
 nodepend:
 	(cd omc_release && $(MAKE))
 
-omc_release:
+omc_release: simcode
 	(cd omc_release && $(MAKE))
 
-omc_debug:
+omc_debug: simcode
 	(cd omc_debug && $(MAKE))
 
-omc_profiler:
+omc_profiler: simcode
 	(cd omc_profiler && $(MAKE))
 
 #vctarget:
@@ -146,7 +146,7 @@ else
 simcode: OpenModelicaBootstrappingHeader.h
 	$(MAKE) -C susan_codegen/
 	$(MAKE) -C susan_codegen/SimCode/
-OpenModelicaBootstrappingHeader.h: Absyn.mo Interactive.mo Values.mo GenerateOMCHeader.mos
+OpenModelicaBootstrappingHeader.h: FrontEnd/Absyn.mo Script/Interactive.mo FrontEnd/Values.mo GenerateOMCHeader.mos
 	../build/bin/omc +g=MetaModelica GenerateOMCHeader.mos > $@.log || (cat $@.log && false)
 	@mv $@.new $@
 endif