- moved math-support

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

SimulationRuntime/c/Makefile.common

@@ -10,7 +10,7 @@ include Makefile.objs
 
 LIBS = libsim.a libsolver.a libmath-support.a libutil.a libmeta.a libf2c.a libresult.a libModelicaExternalC.a libsendData.a
 
-LIBSPATH= simulation/libsim.a simulation/math-support/libmath-support.a simulation/solver/libsolver.a simulation/results/libresult.a meta/libmeta.a util/libutil.a 
+LIBSPATH= simulation/libsim.a math-support/libmath-support.a simulation/solver/libsolver.a simulation/results/libresult.a meta/libmeta.a util/libutil.a 
 
 
 .PHONY : libsim.a libmath-support.a libsolver.a libutil.a libmeta.a libf2c.a libresult.a libModelicaExternalC.a libsendData.a clean install
@@ -23,7 +23,7 @@ libSimulationCRuntime.a: $(LIBS) $(LIBSPATH)
 	ranlib $@
 
 libmath-support.a: 
-	$(MAKE) -C simulation/math-support -f ${LIBMAKEFILE}
+	$(MAKE) -C math-support -f ${LIBMAKEFILE}
 
 libsolver.a:
 	$(MAKE) -C simulation/solver -f ${LIBMAKEFILE}
@@ -50,15 +50,15 @@ install: libSimulationCRuntime.a $(LIBS) omdevinstall
 	cp libSimulationCRuntime.a $(builddir_lib)
 	cp ./ModelicaExternalC/libModelicaExternalC.a $(builddir_lib)
 	cp ./ModelicaExternalC/ModelicaUtilities.h $(builddir_inc)
-	cp openmodelica.h $(builddir_inc)
-	cp openmodelica_func.h $(builddir_inc)
+	cp ./openmodelica.h $(builddir_inc)
+	cp ./openmodelica_func.h $(builddir_inc)
 	cp ../interactive/libinteractive.a $(builddir_lib)
-	cp meta/*.h $(builddir_inc)
-	cp util/*.h $(builddir_inc)
-	cp simulation/*.h $(builddir_inc)
-	cp simulation/math-support/*.h $(builddir_inc)
-	cp simulation/results/*.h $(builddir_inc)
-	cp simulation/solver/*.h $(builddir_inc)
+	cp ./meta/*.h $(builddir_inc)
+	cp ./util/*.h $(builddir_inc)
+	cp ./simulation/*.h $(builddir_inc)
+	cp ./math-support/*.h $(builddir_inc)
+	cp ./simulation/results/*.h $(builddir_inc)
+	cp ./simulation/solver/*.h $(builddir_inc)
 	test -z "$(LIBF2C)" || cp simulation/libf2c/libf2c.* $(builddir_lib)/
 	test -z "$(LIBSENDDATA)" || cp sendData/release/$(LIBSENDDATA) $(builddir_lib)/
 	@$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) && \

SimulationRuntime/c/simulation/math-support/Makefile.in → SimulationRuntime/c/math-support/Makefile.common

@@ -1,41 +1,32 @@
-# Adrian Pop, adrpo@ida.liu.se, Martin Sjölund, marsj@ida.liu.se
-# - Use make -f Makefile.omdev.mingw if you want to compile on Windows/MinGW
-# - Please leave the UNIX Makefile as it is if you are not using UNIX/Linux
-# If you need to add files, etc, you modify Makefile.common - a common file
-# for both UNIX/Linux and Windows platforms.
-
-CC = @CC@
-ANSI= #-ansi
-CFLAGS   := @CFLAGS@ -Wall $(ANSI) -pedantic $(EXTRA_CFLAGS) -mfpmath=sse -c -I..
-CPPFLAGS := @CPPFLAGS@ -Wall $(ANSI) $(EXTRA_CFLAGS) -I. -I.. -I../../ -I../solver -I../../util -I../../linearization -I../results
-AR = ar -ru
-FFLAGS  = -O -fexceptions
-
-include ../../Makefile.objs
-
-HFILES = blaswrap.h \
-matrix.h \
-ringbuffer.h \
-simulation_delay.h \
-simulation_events.h \
-simulation_init.h \
-list.h \
-
-
-LIBS = libmath-support.a
-
-.PHONY : libmath-support.a clean
-
-all : libmath-support.a
-
-libmath-support.a : $(MATH_OBJS) $(HFILES)
-	$(AR) $@ $(MATH_OBJS)
-	ranlib $@
-
-clean :
-	rm -f libmath-support.a
-	rm -f $(MATH_OBJS)
-
-Makefile: Makefile.in
-	cd ../../../../; ./config.status
-
+# Adrian Pop, adrpo@ida.liu.se, Martin Sj�lund, marsj@ida.liu.se
+# - Use make -f Makefile.omdev.mingw if you want to compile on Windows/MinGW
+# - Please leave the UNIX Makefile as it is if you are not using UNIX/Linux
+# If you need to add files, etc, you modify Makefile.common - a common file
+# for both UNIX/Linux and Windows platforms.
+
+include ../Makefile.objs
+
+HFILES = blaswrap.h \
+matrix.h \
+ringbuffer.h \
+simulation_delay.h \
+simulation_events.h \
+simulation_init.h \
+list.h \
+
+
+LIBS = libmath-support.a
+
+.PHONY : libmath-support.a clean
+
+all : libmath-support.a
+
+libmath-support.a : $(MATH_OBJS) $(HFILES)
+	$(AR) $@ $(MATH_OBJS)
+	ranlib $@
+
+clean :
+	rm -f libmath-support.a
+	rm -f $(MATH_OBJS)
+
+

SimulationRuntime/c/math-support/Makefile.in

@@ -0,0 +1,17 @@
+# Adrian Pop, adrpo@ida.liu.se, Martin Sjölund, marsj@ida.liu.se
+# - Use make -f Makefile.omdev.mingw if you want to compile on Windows/MinGW
+# - Please leave the UNIX Makefile as it is if you are not using UNIX/Linux
+# If you need to add files, etc, you modify Makefile.common - a common file
+# for both UNIX/Linux and Windows platforms.
+
+CC = @CC@
+ANSI= #-ansi
+CFLAGS   := @CFLAGS@ -Wall $(ANSI) -pedantic $(EXTRA_CFLAGS) -mfpmath=sse -c -I..
+CPPFLAGS := @CPPFLAGS@ -Wall $(ANSI) $(EXTRA_CFLAGS) -I. -I.. -I../ -I../simulation/solver -I../util -I../linearization -I../simulation/results
+AR = ar -ru
+FFLAGS  = -O -fexceptions
+
+include Makefile.common
+
+Makefile: Makefile.in
+	cd ../../../; ./config.status