diff --git a/src/Makefile b/src/Makefile index 2af2a3c6..f24c1861 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,7 +14,7 @@ ROOT := .. GTEST_DIR := googletest-release-1.10.0 GTEST_CODE := $(GTEST_DIR).tar.gz -all: mmo-compiler mmo-interfaces qss-engine qss-solver-gui qss-user-libs +all: mmo-compiler mmo-interfaces qss-engine qss-retqss-lib qss-solver-gui qss-user-libs mmo-interfaces: create-folders @echo BUILDING MMO-SBML INTERFACE @@ -22,7 +22,7 @@ mmo-interfaces: create-folders @echo Done qss-engine: create-folders lib-gtest - @echo BUILDING QSS LIBRARIES DEPS + @echo BUILDING QSS LIBRARY DEPS @cd engine && $(MAKE) cvode @cd engine && $(MAKE) ida @cd engine && $(MAKE) gsl @@ -33,6 +33,14 @@ qss-engine: create-folders lib-gtest @cd engine && $(MAKE) MODE=Debug @echo Done +qss-retqss-lib: create-folders + @echo BUILDING QSS RETQSS LIBRARY + @cd lib/retqss && $(MAKE) MODE=Release + @echo Done + @echo BUILDING QSS RETQSS DEBUG LIBRARY + @cd lib/retqss && $(MAKE) MODE=Debug RETQSS_DEBUG=True + @echo Done + qss-user-libs: create-folders qss-engine @echo BUILDING USER LIBS @cd usr && $(MAKE) MODE=$(MODE) -j $(CORES) ENGINE=../engine @@ -79,21 +87,23 @@ create-folders: install: @echo "Installing engine libraries." - ln -s $(ROOT)/src/engine/usr/lib/*.a $(ROOT)/lib/ + @install $(ROOT)/src/engine/usr/lib/*.a $(ROOT)/lib/ @echo "Installing MicroModelica Compiler." - ln -s $(ROOT)/src/mmoc/usr/bin/mmoc $(ROOT)/bin/ + @install $(ROOT)/src/mmoc/usr/bin/mmoc $(ROOT)/bin/ @echo "Installing SBML translator." - ln -s $(ROOT)/src/interfaces/sbml/usr/bin/translate-sbml $(ROOT)/bin/ + @install $(ROOT)/src/interfaces/sbml/usr/bin/translate-sbml $(ROOT)/bin/ @echo "Installing solver GUI." @install $(ROOT)/src/gui/usr/bin/qss-solver $(ROOT)/bin/ @echo "Installing user libraries." - ln -s $(ROOT)/src/usr/lib/* $(ROOT)/lib/ + @install $(ROOT)/src/usr/lib/* $(ROOT)/lib/ @install $(ROOT)/deploy/linux/qss-solver.ini.in $(ROOT)/bin/qss-solver.ini @install $(ROOT)/src/engine/3rd-party/partitioners/hmetis/khmetis $(ROOT)/bin/ @install $(ROOT)/src/engine/3rd-party/partitioners/patoh/Linux-x86_64/libpatoh.a $(ROOT)/lib/ @install $(ROOT)/src/engine/3rd-party/partitioners/metis/Linux-x86_64/libmetis.a $(ROOT)/lib/ + @echo "Installing RET QSS libraries." + @install $(ROOT)/src/lib/retqss/usr/lib/* $(ROOT)/lib/ @echo "Installing GTEST libraries." - ln -s $(ROOT)/src/3rd-party/gtest/usr/lib/*.a $(ROOT)/lib/ + @install $(ROOT)/src/3rd-party/gtest/usr/lib/*.a $(ROOT)/lib/ .PHONY: clean all @@ -103,6 +113,7 @@ clean: @cd usr && $(MAKE) clean @cd gui && $(MAKE) clean @cd interfaces/sbml && $(MAKE) clean + @cd lib/retqss && $(MAKE) clean help: @echo "make MODE= sbg_branch= build_sbg= repo_checkout="