Skip to content

Commit

Permalink
Compile libraries by default
Browse files Browse the repository at this point in the history
- Libraries no longer require python
- You can configure to install all or only a subset of libraries needed for the testsuite
  • Loading branch information
sjoelund committed May 5, 2015
1 parent f3d3696 commit c1bb0c3
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Makefile.in
@@ -1,11 +1,15 @@
all:
$(MAKE) omc
$(MAKE) omc @OMLIBRARY_TARGET@
$(MAKE) omplot

.PRECIOUS: Makefile

omc:
$(MAKE) -C OMCompiler
omlibrary-core:
$(MAKE) -C libraries core
omlibrary-all:
$(MAKE) -C libraries all
omplot:
$(MAKE) -C OMPlot

Expand Down
2 changes: 1 addition & 1 deletion OMCompiler
23 changes: 23 additions & 0 deletions configure.ac
Expand Up @@ -7,6 +7,29 @@ m4_include([common/m4/pre-commit.m4])
m4_include([common/m4/ombuilddir.m4])
cp common/install-sh common/config.guess common/config.sub ./

AC_SUBST(OMLIBRARY_TARGET)
AC_ARG_WITH(omlibrary, [ --with-omlibrary=[core,all,no] (which libraries to build; default is core; the libraries used by the testsuite)],[OMLIBRARY_TARGET="$withval"],[OMLIBRARY_TARGET="core"])

AC_MSG_CHECKING([for omlibrary target])
case "$OMLIBRARY_TARGET" in
"yes"|"core")
OMLIBRARY_TARGET="omlibrary-core"
AC_MSG_RESULT([core])
;;
"no")
OMLIBRARY_TARGET=""
AC_MSG_RESULT([none])
;;
"all")
OMLIBRARY_TARGET="omlibrary-all"
AC_MSG_RESULT([all])
;;
*)
AC_MSG_ERROR("unknown omlibrary target $OMLIBRARY_TARGET")
;;
esac


for dir in OMCompiler OMPlot; do
if test ! -d "$dir"; then
AC_MSG_ERROR("Subproject $dir does not exist")
Expand Down
2 changes: 1 addition & 1 deletion libraries

0 comments on commit c1bb0c3

Please sign in to comment.