- Clean compilation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10429 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 11, 2011 · 9795f98 · 9795f98
1 parent 3d57a30
commit 9795f98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -40,10 +40,14 @@ debug: .testvariables mkbuilddirs settings omcd
 profiler: .testvariables mkbuilddirs settings omc_profiler
 release: omc
 
-c_runtime: mkbuilddirs
+oldc_runtime: mkbuilddirs
 	$(MAKE) -C c_runtime -f $(defaultMakefileTarget)
-	$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget)
+newc_runtime: mkbuilddirs
 	$(MAKE) -C SimulationRuntime/interactive -f $(defaultMakefileTarget)
+	# Depends on libinteractive.a
+	$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget)
+
+c_runtime: oldc_runtime newc_runtime
 
 docs: mkbuilddirs omlibrary
 	(cp -p doc/*.pdf doc/*.txt doc/OpenModelicaAPI-Howto/*.pdf $(builddir_doc)/omc)

diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -46,7 +46,7 @@ libsim.a:
 libModelicaExternalC.a: 
 	$(MAKE) -C ModelicaExternalC -f ${LIBMAKEFILE}
 
-install: libSimulationCRuntime.a omdevinstall
+install: libSimulationCRuntime.a $(LIBS) omdevinstall
 	cp libSimulationCRuntime.a $(builddir_lib)
 	cp ./ModelicaExternalC/libModelicaExternalC.a $(builddir_lib)
 	cp ./ModelicaExternalC/ModelicaUtilities.h $(builddir_inc)