- correncted Makefile.common in SimulationRuntime/c

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10375 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 9, 2011 · 257b1eb · 257b1eb
1 parent eb8cb5a
commit 257b1eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -26,29 +26,28 @@ $(LIBSPATH): $(LIBS)
 
 
 libmath-support.a: 
-	$(MAKE) -C simulation/math-support -f $(LIBMAKEFILE}
+	$(MAKE) -C simulation/math-support -f ${LIBMAKEFILE}
 
-libsolver.a: 
-	$(MAKE) -C simulation/solver -f $(LIBMAKEFILE}
+libsolver.a:
+	$(MAKE) -C simulation/solver -f ${LIBMAKEFILE}
 
 libresult.a: 
-	$(MAKE) -C simulation/results -f $(LIBMAKEFILE}
+	$(MAKE) -C simulation/results -f ${LIBMAKEFILE}
 
 libf2c.a: 
-	$(MAKE) -C simulation/libf2c -f $(LIBMAKEFILE}
+	$(MAKE) -C simulation/libf2c -f ${LIBMAKEFILE}
 
 libmeta.a: 
-	$(MAKE) -C meta -f $(LIBMAKEFILE}
+	$(MAKE) -C meta -f ${LIBMAKEFILE}
 
 libutil.a: 
-	$(MAKE) -C util -f $(LIBMAKEFILE}
+	$(MAKE) -C util -f ${LIBMAKEFILE}
 
 libsim.a: 
-	$(MAKE) -C simulation -f $(LIBMAKEFILE}
-
+	$(MAKE) -C simulation -f ${LIBMAKEFILE}
 
 libModelicaExternalC.a: 
-	$(MAKE) -C ModelicaExternalC -f $(LIBMAKEFILE}
+	$(MAKE) -C ModelicaExternalC -f ${LIBMAKEFILE}
 
 clean:
 	$(MAKE) -C ModelicaExternalC clean

diff --git a/SimulationRuntime/c/Makefile.in b/SimulationRuntime/c/Makefile.in
@@ -13,10 +13,7 @@ CC := @CC@
 CXX := @CXX@
 CFLAGS := @CFLAGS@
 
-LIBF2CMAKEFILE = makefile.u
-JAVAMAKEFILE = Makefile
-INTERACTIVEMAKEFILE = Makefile
-EXTERNALCMAKEFILE = Makefile
+LIBMAKEFILE = Makefile
 INTERACTIVELIBS = "-lpthread"
 LIBSENDDATA = @LIBSENDDATA@
 QMAKE=@QMAKE@