Commit ff46a3f5 authored by Richard Angersbach's avatar Richard Angersbach
Browse files

Merge branch 'devel/fix_exa_lib_name' into 'master'

Add "lib" suffix to makefile target for generated exa libraries

See merge request exastencils/exastencils!107
parents 0041fa4d ee4ad859
......@@ -89,7 +89,7 @@ object MakefileGenerator extends BuildfileGenerator {
printer <<< ".PHONY: all"
val allTarget = ListBuffer("all:", "${BINARY}")
if (Settings.makefile_makeLibs)
allTarget += "${BINARY}.a"
allTarget += "lib${BINARY}.a"
printer <<< mkStringTrimFlat(allTarget)
printer <<< ""
......@@ -97,7 +97,7 @@ object MakefileGenerator extends BuildfileGenerator {
printer <<< "clean:"
val cleanTargetCmd = ListBuffer("rm -f", "${BINARY}", "${ALL_OBJ}")
if (Settings.makefile_makeLibs)
cleanTargetCmd += "${BINARY}.a"
cleanTargetCmd += "lib${BINARY}.a"
printer <<< "\t" + mkStringTrimFlat(cleanTargetCmd)
printer <<< ""
......@@ -106,8 +106,8 @@ object MakefileGenerator extends BuildfileGenerator {
printer <<< ""
if (Settings.makefile_makeLibs) {
printer <<< mkStringTrimFlat("${BINARY}.a:", "${ALL_OBJ}")
printer <<< "\t" + mkStringTrimFlat("ar -cvr ${BINARY}.a", "${ALL_OBJ}", "${LDLIBS}")
printer <<< mkStringTrimFlat("lib${BINARY}.a:", "${ALL_OBJ}")
printer <<< "\t" + mkStringTrimFlat("ar -cvr lib${BINARY}.a", "${ALL_OBJ}", "${LDLIBS}")
printer <<< ""
}
printer <<< ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment