From f0c913cde1ffa7256c1211279b4522bd8fb96af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= <martin.sjolund@liu.se>
Date: Sun, 1 May 2011 16:59:16 +0000
Subject: [PATCH] - Add @CFLAGS@ to more Makefiles - Use gcc instead of rmlc to
 compile generated C-sources

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8764 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
---
 Compiler/Makefile.compiler_subdirs.common | 2 +-
 Compiler/modpar/Makefile.in               | 2 +-
 Compiler/omc_debug/Makefile.in            | 2 +-
 Compiler/omc_profiler/Makefile.in         | 2 +-
 Compiler/omc_release/Makefile.in          | 2 +-
 Compiler/runtime/Makefile.in              | 3 +--
 Parser/Makefile.common                    | 1 -
 Parser/Makefile.in                        | 1 +
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Compiler/Makefile.compiler_subdirs.common b/Compiler/Makefile.compiler_subdirs.common
index 7a0c30945f2..df527716f34 100644
--- a/Compiler/Makefile.compiler_subdirs.common
+++ b/Compiler/Makefile.compiler_subdirs.common
@@ -30,7 +30,7 @@ vpath %.mo $(MAIN_DIR)
 	time $(RMLHOME)/bin/rml $(RML_INCLUDE_ALL_DIRS) -fdump-depends $(SRCMO) > .depend
 
 $(SRCO): %.o : %.c %.h
-	$(RMLC) $(RMLCFLAGS) -c $<
+	$(CC) $(CFLAGS) $(RMLINC) -c $<
 
 %.c %.h : %.mo
 	$(RMLC) $(RMLCFLAGS) +C $<
diff --git a/Compiler/modpar/Makefile.in b/Compiler/modpar/Makefile.in
index 87ec3786df0..3c87230f0fd 100644
--- a/Compiler/modpar/Makefile.in
+++ b/Compiler/modpar/Makefile.in
@@ -38,7 +38,7 @@ libmodparomc.a: TaskGraphExt_stub_omc.o
 
 INCFLAGS =-I$(RMLINCLUDE) -I$(BOOST_HOME) -I$(top_builddir)/mosh/src
 
-CFLAGS = $(INCFLAGS) -g -Wall -DUNIX=1
+CFLAGS = @CFLAGS@ $(INCFLAGS) -Wall -DUNIX=1
 CXXFLAGS = $(CFLAGS)
 LIBS =
 
diff --git a/Compiler/omc_debug/Makefile.in b/Compiler/omc_debug/Makefile.in
index 30b64712e3c..806d3d7e96d 100644
--- a/Compiler/omc_debug/Makefile.in
+++ b/Compiler/omc_debug/Makefile.in
@@ -9,7 +9,7 @@ LIBLPSOLVE55 = @LIBLPSOLVE55@
 
 SHELL	= /bin/sh
 CC	= gcc
-CFLAGS	= $(USE_CORBA)
+CFLAGS	= $(USE_CORBA) @CFLAGS@
 RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
 
diff --git a/Compiler/omc_profiler/Makefile.in b/Compiler/omc_profiler/Makefile.in
index 78edc40a8c1..4ffe4d32a02 100644
--- a/Compiler/omc_profiler/Makefile.in
+++ b/Compiler/omc_profiler/Makefile.in
@@ -9,7 +9,7 @@ LIBLPSOLVE55 = @LIBLPSOLVE55@
 
 SHELL	= /bin/sh
 CC	= gcc
-CFLAGS	= $(USE_CORBA) -O3 -pg
+CFLAGS	= $(USE_CORBA) @CFLAGS@ -pg
 RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
 
diff --git a/Compiler/omc_release/Makefile.in b/Compiler/omc_release/Makefile.in
index 6afd4eaab67..3276dec3d38 100644
--- a/Compiler/omc_release/Makefile.in
+++ b/Compiler/omc_release/Makefile.in
@@ -12,7 +12,7 @@ USE_CORBA = @USE_CORBA@
 SHELL	= /bin/sh
 CC	= @CC@
 CXX	= @CXX@
-CFLAGS	= $(USE_CORBA) -O3
+CFLAGS	= $(USE_CORBA) @CFLAGS@
 RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
 
diff --git a/Compiler/runtime/Makefile.in b/Compiler/runtime/Makefile.in
index 3861e70f102..ccef169b783 100644
--- a/Compiler/runtime/Makefile.in
+++ b/Compiler/runtime/Makefile.in
@@ -7,7 +7,7 @@
 USE_CORBA = @USE_CORBA@
 
 RMLINCLUDE = @rmlinc@
-CFLAGS = @DEFS@ $(USE_CORBA)
+CFLAGS = @CFLAGS@ @DEFS@ $(USE_CORBA)
 
 ifdef USE_CORBA
   CORBASRC = omc_communication.cc omc_communication_impl.cpp Corba_rml.cpp
@@ -23,7 +23,6 @@ SHELL	= /bin/sh
 CC	= @CC@
 CXX	= @CXX@
 IDL	= @IDLCMD@
-CFLAGS	+=  @CFLAGS@
 CXXFLAGS = $(CFLAGS)
 CPPFLAGS = -I$(RMLINCLUDE) -I$(top_builddir)/c_runtime -I$(srcdir) -I. $(CORBAINCL) -Ilpsolve
 
diff --git a/Parser/Makefile.common b/Parser/Makefile.common
index c2e27d20d91..3f6201b99a5 100644
--- a/Parser/Makefile.common
+++ b/Parser/Makefile.common
@@ -3,7 +3,6 @@ BUILDINC = -I../build/include/omc
 RMLINC	= -I$(RMLHOME)/include/plain
 
 ANTLRCMD=java -cp ./antlr-3.2/lib/antlr-3.2.jar org.antlr.Tool -report
-CFLAGS=-O3 
 CPPFLAGS=-I$(COMPILERHOME) $(RMLINC) -I. -Iantlr-3.2/runtime/C -Iantlr-3.2/runtime/C/include $(BUILDINC)
 
 .PHONY: all
diff --git a/Parser/Makefile.in b/Parser/Makefile.in
index e41faccca25..a152706ff5d 100644
--- a/Parser/Makefile.in
+++ b/Parser/Makefile.in
@@ -1,6 +1,7 @@
 REAL_CC=@CC@
 CC=@CXX@
 CXX=@CXX@
+CFLAGS=@CFLAGS@
 RMLHOME=@rmlhome@
 OMC=../build/bin/omc