Fixed the makefiles for simulationruntime

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11022 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

SimulationRuntime/c/Makefile.common

@@ -23,12 +23,18 @@ all : install
 #recompile all if a header changes!
 $(ALL_OBJS) : $(ALL_HEADERS)
 
-libSimulationRuntimeC.a: $(ALL_OBJS) libmeta
+libSimulationRuntimeC.a: $(ALL_OBJS)
 	@# You have to remove the old archive first or it may contain old objects
 	@rm -f $@
 	$(AR) $@ $(ALL_OBJS)
 	ranlib $@
 
+$(METAOBJSPATH):%.o: %.c $(METAHFILESPATH) $(COMMON_HEADERS)
+	$(CC) -c $(CFLAGS) -o $@ $< -I$(METAPATH)
+
+meta/meta_modelica_catch.o: meta/meta_modelica_catch.c
+	$(CC) -c $(CFLAGS) -o $@ $< -g
+
 $(UTILOBJSPATH):%.o: %.c $(UTILHFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $< -I$(UTILPATH) -I$(METAPATH)
 
@@ -43,9 +49,6 @@ $(RESULTSOBJSPATH):%.o: $(RESULTSFILESPATH) $(COMMON_HEADERS)
 $(SIMOBJSPATH):%.o: %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
 	$(CXX) -c $(CXXFLAGS) -o $@ $< -I$(SIMPATH) -I$(UTILPATH) -I$(MATHPATH) -I$(RESULTSPATH) -I$(SOLVERPATH) -Ilinearization/
 
-libmeta: $(METAHFILESPATH) $(COMMON_HEADERS)
-	$(MAKE) -C meta -f ${LIBMAKEFILE} 
-
 ModelicaExternalC/libModelicaExternalC.a: $(addprefix ModelicaExternalC/,ModelicaInternal.c ModelicaStrings.c ModelicaTablesImpl.c) $(HFILES)
 	$(MAKE) -C ModelicaExternalC -f $(EXTERNALCMAKEFILE)
 
@@ -85,5 +88,4 @@ clean:
 	rm -f $(ALL_PATHS_CLEAN_OBJS) *.a
 	$(MAKE) -C ModelicaExternalC -f ${LIBMAKEFILE} clean
 	$(MAKE) -C simulation/libf2c -f ${LIBMAKEFILE} clean
-	$(MAKE) -C meta -f ${LIBMAKEFILE} clean	
 

SimulationRuntime/c/Makefile.in

@@ -11,7 +11,7 @@ builddir_inc=$(top_builddir)/build/include/omc
 
 CC := @CC@
 CXX := @CXX@
-CFLAGS := @CFLAGS@
+CFLAGS := -g -O0 @CFLAGS@
 
 LIBMAKEFILE = Makefile
 INTERACTIVELIBS = "-lpthread"