Try to fix fmil dependency in Compiler/runtime

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25828 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 29, 2015 · 50157ff · 50157ff
1 parent cd70933
commit 50157ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Makefile.common b/Makefile.common
@@ -52,7 +52,7 @@ mkbuilddirs:
 
 release: omc-diff omc
 
-bootstrap-dependencies: graphstream
+bootstrap-dependencies: graphstream $(BOOTSTRAP_FMIL_DEP)
 	# NOTE: OpenModelicaBootstrappingHeader.h has to be regenerated without any other process writing to so/etc or you get bus errors
 	$(MAKE) -f $(defaultMakefileTarget) -C Compiler OpenModelicaBootstrappingHeader.h
 	$(MAKE) -f $(defaultMakefileTarget) -C Compiler/runtime install

diff --git a/Makefile.in b/Makefile.in
@@ -51,6 +51,10 @@ CMINPACKLIB_SHARED = @CMINPACKLIB_SHARED@
 MODELICA_SPEC_PLATFORM=@MODELICA_SPEC_PLATFORM@
 SHREXT = @SHREXT@
 BOOST_INCLUDE = @BOOST_INCLUDE@
+WITH_FMIL=@WITH_FMIL@
+ifeq ($(WITH_FMIL),yes)
+BOOTSTRAP_FMIL_DEP=fmil
+endif
 
 include Makefile.common