Fixes #3332, ParModelica install paths

OpenModelica · May 23, 2015 · dff6c83 · dff6c83
1 parent 04badce
commit dff6c83
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/SimulationRuntime/ParModelica/auto/Makefile.common b/SimulationRuntime/ParModelica/auto/Makefile.common
@@ -1,9 +1,8 @@
 TOP_BUILDDIR = ../../../build/
 
-OPENMODELICA_INC=$(TOP_BUILDDIR)/include/omc/c/
+OPENMODELICA_INC=$(OMBUILDDIR)/include/omc/c/
 PARMODELICAAUTO_INC=$(OPENMODELICA_INC)/ParModelica/auto/
-OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/omc/
-OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/
+OPENMODELICA_BIN=$(OMBUILDDIR)/bin/
 
 # cp -u is a GNU extension. Do not rely on it.
 COPY=cp -rp
@@ -13,7 +12,7 @@ SRCS = $(OS_SRCS) \
 om_pm_equation.cpp \
 pm_utility.cpp \
 om_pm_interface.cpp \
-om_pm_model.cpp 
+om_pm_model.cpp
 # ParModelicaTaskGrapExt_rml.cpp
 # ParModelicaTaskGrapExt_omc.cpp \
 
@@ -28,18 +27,18 @@ DPFLAGS = -MM
 libom_pm_autort.a: $(OBJS)
 	@rm -f $@
 	$(AR_) $@ $(OBJS)
-    
+
 .cpp.o: $(DPFILE)
-	$(CC) $(CPPFLAGS) $(INCDIRS) -c $<    
-    
+	$(CC) $(CPPFLAGS) $(INCDIRS) -c $<
+
 test: test_task_graph.cpp transfer
-	$(CXX) $(CPPFLAGS) -I. $(INCDIRS) test_task_graph.cpp -o gen_graph$(EXEEXT) libom_pm_autort.a -L$(TBB_LIB) -ltbb 
+	$(CXX) $(CPPFLAGS) -I. $(INCDIRS) test_task_graph.cpp -o gen_graph$(EXEEXT) libom_pm_autort.a -L$(TBB_LIB) -ltbb
 
 clean :
 	rm -f *.o *.a
 	touch $(DPFILE)
-    
+
 $(DPFILE) depend : $(HDRS) $(SRCS)
-	$(CC) $(DPFLAGS) $(CPPFLAGS) $(SRCS) > $(DPFILE)    
-    
-include $(DPFILE)
+	$(CC) $(DPFLAGS) $(CPPFLAGS) $(SRCS) > $(DPFILE)
+
+include $(DPFILE)
diff --git a/SimulationRuntime/ParModelica/auto/Makefile.in b/SimulationRuntime/ParModelica/auto/Makefile.in
@@ -1,10 +1,12 @@
 BOOST_HOME = @BOOSTHOME@
-INCDIRS = -I"../../c" -I$(BOOST_HOME) -I"../pugixml-1.2/src/" 
+INCDIRS = -I"../../c" -I$(BOOST_HOME) -I"../pugixml-1.2/src/"
 
 CC=@CC@
 CXX=@CXX@
 CFLAGS=@CFLAGS@ $(INCDIRS)
-CPPFLAGS= -O3 -Wall -fPIC 
+CPPFLAGS=@CPPFLAGS@
+OMBUILDDIR=@OMBUILDDIR@
+OPENMODELICA_LIB=$(OMBUILDDIR)/lib/@host_short@/omc/
 
 OS_SRCS = pm_posix_timer.cpp
 

diff --git a/SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw b/SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw
@@ -2,12 +2,13 @@ BOOST_HOME = $(OMDEV)/lib/3rdParty/boost-1_49
 
 TBB_INC = $(OMC_TBB_INC)
 TBB_LIB = $(OMC_TBB_LIB)
-INCDIRS = -I"../../c" -I$(TBB_INC) -I$(BOOST_HOME) -I"../pugixml-1.2/src/" 
+INCDIRS = -I"../../c" -I$(TBB_INC) -I$(BOOST_HOME) -I"../pugixml-1.2/src/"
 
 CC=gcc
 CXX=g++
-CFLAGS= -O3 -Wall 
+CFLAGS= -O3 -Wall
 CPPFLAGS= -O3 -Wall
+OPENMODELICA_LIB=$(OMBUILDDIR)/lib/omc/
 
 OS_SRCS = pm_win_timer.cpp
 
@@ -21,7 +22,7 @@ transfer: libom_pm_autort.a
 	mkdir -p $(PARMODELICAAUTO_INC)
 	$(COPY) om_pm_interface.hpp $(PARMODELICAAUTO_INC)
 	$(COPY) om_pm_model.hpp $(PARMODELICAAUTO_INC)
-    
+
 include Makefile.common