Remove some -I flags so the headers copied from simulation runtime wo…

…rks without changes

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

SimulationRuntime/c/Makefile.common

@@ -8,7 +8,7 @@ include Makefile.objs
 
 OMC_MINIMAL_RUNTIME=
 
-CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc -I$(top_builddir)/Compiler/runtime -I$(top_builddir)/3rdParty/gc/include -I$(top_builddir)/3rdParty/FMIL/install/include/ -I$(top_builddir)/3rdParty/lis-1.4.12/include/ -I$(top_builddir)/3rdParty/Ipopt-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
+CPPFLAGS = -I. -I$(top_builddir)/Compiler/runtime -I$(top_builddir)/3rdParty/gc/include -I$(top_builddir)/3rdParty/FMIL/install/include/ -I$(top_builddir)/3rdParty/lis-1.4.12/include/ -I$(top_builddir)/3rdParty/Ipopt-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
 override CFLAGS += $(CPPFLAGS) $(CONFIG_CFLAGS) $(EXTRA_CFLAGS)
 
 ifeq ($(OMC_MINIMAL_RUNTIME),)
@@ -156,32 +156,32 @@ libOpenModelicaFMIRuntimeC.dylib: $(FMIOBJSPATH) Makefile.objs
 	$(CC) -shared -o $@ $(FMIOBJSPATH) $(LDFLAGS_SIM) -undefined dynamic_lookup -install_name '@rpath/$@'
 
 $(METAOBJSPATH):%$(OBJ_EXT): %.c $(METAHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c  -I$(METAPATH) -I$(UTILPATH) $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 meta/meta_modelica_catch$(OBJ_EXT): meta/meta_modelica_catch.c
 	$(CC) -c $(CFLAGS) -o $@ $< -g
 
 $(UTILOBJSPATH):%$(OBJ_EXT): %.c $(UTILHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c -I$(UTILPATH) -I$(METAPATH) $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(MATHOBJSPATH):%$(OBJ_EXT): %.c $(MATHHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c -I$(MATHPATH) -I$(UTILPATH) $(CFLAGS) $(FPMATHFORTRAN) -o $@ $<
+	$(CC) -c $(CFLAGS) $(FPMATHFORTRAN) -o $@ $<
 
 $(SOLVEROBJSPATH):%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(RESULTSHFILESPATH) $(INITIALIZATIONHFILESPATH) $(OPTIMIZATIONHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(OPTIMIZATIONPATH) -I$(RESULTSPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH) $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(INITIALIZATIONOBJSPATH):%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH) $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(RESULTSOBJSPATH):%$(OBJ_EXT): %.cpp $(RESULTSFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(SIMOBJSPATH):%$(OBJ_EXT): %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
-	$(CXX) -c -I$(SIMPATH) -I$(UTILPATH) -I$(MATHPATH) -I$(RESULTSPATH) -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -Ilinearization/ $(CXXFLAGS) -o $@ $<
+	$(CXX) -c -Ilinearization/ $(CXXFLAGS) -o $@ $<
 
 $(SIMOBJSPATHC):%$(OBJ_EXT): %.c $(SIMHFILESPATH) $(COMMON_HEADERS)
 	@echo Deps: $(SIMHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c -I$(SIMPATH) -I$(UTILPATH) -I$(MATHPATH) -I$(RESULTSPATH) -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -Ilinearization/ $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(OPTIMIZATIONOBJSPATH):%$(OBJ_EXT): %.c $(OPTIMIZATIONHFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $<

SimulationRuntime/c/linearization/linearize.cpp

@@ -28,7 +28,7 @@
  *
  */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_data.h"
 #include "openmodelica_func.h"
 #include "linearize.h"

SimulationRuntime/c/math-support/pivot.c

@@ -2,7 +2,7 @@
  provides a simple function to do a full pivot search while doing an LU factorization
 */
 
-#include "modelica.h"
+#include "util/modelica.h"
 
 #include <math.h>
 #include <assert.h>

SimulationRuntime/c/meta/meta_modelica.c

@@ -35,7 +35,7 @@
 #include "openmodelica.h"
 #include "meta_modelica.h"
 #include "meta_modelica_builtin.h"
-#include "base_array.h"
+#include "util/base_array.h"
 #include <stdio.h>
 #include <limits.h>
 #include <stdlib.h>

SimulationRuntime/c/meta/meta_modelica_builtin.h

@@ -37,7 +37,7 @@
 #define META_MODELICA_BUILTIN_H_
 
 #include "openmodelica.h"
-#include "omc_msvc.h"
+#include "util/omc_msvc.h"
 
 #if defined(__cplusplus)
 extern "C" {

SimulationRuntime/c/meta/meta_modelica_segv.c

@@ -34,7 +34,7 @@
 #define _GNU_SOURCE 1
 /* for pthread_getattr_np */
 #endif
-#include <meta_modelica.h>
+#include "meta_modelica.h"
 
 pthread_key_t mmc_stack_overflow_jumper;
 

SimulationRuntime/c/optimization/DataManagement/InitialGuess.c

@@ -34,9 +34,9 @@
 #include "../OptimizerData.h"
 #include "../OptimizerLocalFunction.h"
 
-#include "../simulation/solver/dassl.h"
-#include "../../simulation/options.h"
-#include "../../simulation/results/simulation_result.h"
+#include "simulation/solver/dassl.h"
+#include "simulation/options.h"
+#include "simulation/results/simulation_result.h"
 #include "simulation/solver/external_input.h"
 #include "simulation/solver/model_help.h"
 

SimulationRuntime/c/optimization/optimizer_main.c

@@ -35,7 +35,7 @@
 #include "OptimizerData.h"
 #include "OptimizerLocalFunction.h"
 #include "simulation_data.h"
-#include "../../simulation/options.h"
+#include "simulation/options.h"
 
 static inline void optimizationWithIpopt(OptData*optData);
 static inline void freeOptimizerData(OptData*optData);

SimulationRuntime/c/simulation/modelinfo.c

@@ -28,13 +28,13 @@
  *
  */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_data.h"
-#include "rtclock.h"
+#include "util/rtclock.h"
 #include "modelinfo.h"
 #include "simulation_info_xml.h"
 #include "simulation_runtime.h"
-#include "omc_mmap.h"
+#include "util/omc_mmap.h"
 
 
 #include <errno.h>
@@ -43,7 +43,7 @@
 #include <time.h>
 #include <assert.h>
 #include <stdint.h>
-#include "read_matlab4.h"
+#include "util/read_matlab4.h"
 
 /* UNDEF to debug the gnuplot file */
 #define NO_PIPE

SimulationRuntime/c/simulation/options.c

@@ -29,7 +29,7 @@
  */
 
 #include "options.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 
 #include <string.h>
 #include <stdio.h>

SimulationRuntime/c/simulation/results/simulation_result_csv.cpp

@@ -38,9 +38,9 @@
  *
  */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_result_csv.h"
-#include "rtclock.h"
+#include "util/rtclock.h"
 
 #include <stdio.h>
 #include <errno.h>

SimulationRuntime/c/simulation/results/simulation_result_ia.cpp

@@ -41,9 +41,9 @@
  * A message with ID=6 indicates that the simulation is completed.
  */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_result_ia.h"
-#include "rtclock.h"
+#include "util/rtclock.h"
 
 #include <fstream>
 #include <iostream>

SimulationRuntime/c/simulation/results/simulation_result_mat.cpp

@@ -28,9 +28,9 @@
  *
  */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_result_mat.h"
-#include "rtclock.h"
+#include "util/rtclock.h"
 
 #include <fstream>
 #include <iostream>

SimulationRuntime/c/simulation/results/simulation_result_plt.cpp

@@ -38,9 +38,9 @@
  *
  */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_result_plt.h"
-#include "rtclock.h"
+#include "util/rtclock.h"
 
 #include <stdio.h>
 #include <errno.h>

SimulationRuntime/c/simulation/results/simulation_result_wall.cpp

@@ -30,9 +30,9 @@
 
 /* The recon wall format is optimized for writing */
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_result_wall.h"
-#include "rtclock.h"
+#include "util/rtclock.h"
 #include "meta/meta_modelica.h"
 
 #include <fstream>

SimulationRuntime/c/simulation/simulation_info_json.c

@@ -28,17 +28,12 @@
  *
  */
 
-#ifndef _GNU_SOURCE
-  #define _GNU_SOURCE /* for asprintf */
-#endif
-
 #include "simulation_info_json.h"
 #include "simulation_runtime.h"
-#include "omc_msvc.h" /* for asprintf */
 #include <expat.h>
 #include <errno.h>
 #include <string.h>
-#include "uthash.h"
+#include "util/uthash.h"
 #include <stdio.h>
 #include "util/rtclock.h"
 #include "util/omc_mmap.h"

SimulationRuntime/c/simulation/simulation_info_xml.c

@@ -36,11 +36,11 @@
 #include "simulation_info_json.h"
 
 #include "simulation_runtime.h"
-#include "omc_msvc.h" /* for asprintf */
+#include "util/omc_msvc.h" /* for asprintf */
 #include <expat.h>
 #include <errno.h>
 #include <string.h>
-#include "uthash.h"
+#include "util/uthash.h"
 #include <stdio.h>
 #include "util/rtclock.h"
 

SimulationRuntime/c/simulation/simulation_input_xml.cpp

@@ -43,7 +43,7 @@
 #include "simulation_input_xml.h"
 #include "simulation_runtime.h"
 #include "options.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "meta/meta_modelica.h"
 
 #include <fstream>

SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -28,7 +28,7 @@
  *
  */
 
-#include "omc_msvc.h"
+#include "util/omc_msvc.h"
 
 #include <setjmp.h>
 #include <string>
@@ -59,30 +59,30 @@
   extern Socket sim_communication_port;
 #endif
 
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "simulation_data.h"
 #include "openmodelica_func.h"
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 
 #include "linearize.h"
 #include "options.h"
 #include "simulation_runtime.h"
 #include "simulation_input_xml.h"
-#include "simulation_result_plt.h"
-#include "simulation_result_csv.h"
-#include "simulation_result_mat.h"
-#include "simulation_result_wall.h"
-#include "simulation_result_ia.h"
-#include "solver_main.h"
+#include "simulation/results/simulation_result_plt.h"
+#include "simulation/results/simulation_result_csv.h"
+#include "simulation/results/simulation_result_mat.h"
+#include "simulation/results/simulation_result_wall.h"
+#include "simulation/results/simulation_result_ia.h"
+#include "simulation/solver/solver_main.h"
 #include "simulation_info_xml.h"
 #include "modelinfo.h"
-#include "model_help.h"
-#include "mixedSystem.h"
-#include "linearSystem.h"
-#include "nonlinearSystem.h"
-#include "rtclock.h"
+#include "simulation/solver/model_help.h"
+#include "simulation/solver/mixedSystem.h"
+#include "simulation/solver/linearSystem.h"
+#include "simulation/solver/nonlinearSystem.h"
+#include "util/rtclock.h"
 #include "omc_config.h"
-#include "initialization.h"
+#include "simulation/solver/initialization/initialization.h"
 
 #ifdef _OMC_QSS_LIB
   #include "solver_qss/solver_qss.h"

SimulationRuntime/c/simulation/solver/dassl.c

@@ -47,7 +47,7 @@
 #include "simulation/solver/epsilon.h"
 
 #include "simulation/solver/dassl.h"
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 
 
 static const char *dasslJacobianMethodStr[DASSL_JAC_MAX] = {"unknown",

SimulationRuntime/c/simulation/solver/initialization/initialization.c

@@ -37,16 +37,16 @@
 #include "util/omc_error.h"
 #include "openmodelica.h"
 #include "openmodelica_func.h"
-#include "model_help.h"
-#include "read_matlab4.h"
-#include "events.h"
-#include "stateset.h"
+#include "simulation/solver/model_help.h"
+#include "util/read_matlab4.h"
+#include "simulation/solver/events.h"
+#include "simulation/solver/stateset.h"
 #include "meta/meta_modelica.h"
 
-#include "mixedSystem.h"
-#include "linearSystem.h"
-#include "nonlinearSystem.h"
-#include "delay.h"
+#include "simulation/solver/mixedSystem.h"
+#include "simulation/solver/linearSystem.h"
+#include "simulation/solver/nonlinearSystem.h"
+#include "simulation/solver/delay.h"
 
 #include <stdio.h>
 #include <stdlib.h>

SimulationRuntime/c/simulation/solver/kinsolSolver.c

@@ -34,20 +34,20 @@
 #include "omc_config.h"
 #include "nonlinearSystem.h"
 #include "kinsolSolver.h"
-#include "simulation_info_xml.h"
-#include "omc_error.h"
+#include "simulation/simulation_info_xml.h"
+#include "util/omc_error.h"
 
 #ifdef WITH_SUNDIALS
 
   #include <math.h>
   #include <stdlib.h>
   #include <string.h> /* memcpy */
 
-  #include "varinfo.h"
+  #include "util/varinfo.h"
   #include "openmodelica.h"
   #include "openmodelica_func.h"
   #include "model_help.h"
-  #include "read_matlab4.h"
+  #include "util/read_matlab4.h"
   #include "events.h"
 
   #include <string.h>

SimulationRuntime/c/simulation/solver/linearSolverLapack.c

@@ -36,10 +36,10 @@
 #include <string.h> /* memcpy */
 
 #include "simulation_data.h"
-#include "simulation_info_xml.h"
-#include "omc_error.h"
+#include "simulation/simulation_info_xml.h"
+#include "util/omc_error.h"
 #include "omc_math.h"
-#include "varinfo.h"
+#include "util/varinfo.h"
 #include "model_help.h"
 
 #include "linearSystem.h"

SimulationRuntime/c/simulation/solver/linearSolverLis.c

@@ -36,9 +36,9 @@
 #include <string.h>
 
 #include "simulation_data.h"
-#include "simulation_info_xml.h"
-#include "omc_error.h"
-#include "varinfo.h"
+#include "simulation/simulation_info_xml.h"
+#include "util/omc_error.h"
+#include "util/varinfo.h"
 #include "model_help.h"
 
 #include "linearSystem.h"