Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25798 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Apr 28, 2015
1 parent cd5fbe6 commit cf8c348
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
8 changes: 2 additions & 6 deletions Makefile.common
Expand Up @@ -24,7 +24,7 @@ INSTALL_MANDIR = ${DESTDIR}${datadir}/man/
INSTALL_JAVADIR = ${DESTDIR}${datadir}/omc/java
INSTALL_LOCALEDIR = ${DESTDIR}${datadir}/locale

.PHONY : interactive omc release mosh all mkbuilddirs fmi test install-dirs susan susan_all susgen sustst install-python install-openturns runtimeCPPinstall CMinpack metis Cdaskr boehm-gc qtclients omshell omnotebook omedit omvisualize omoptim omoptimbasis
.PHONY : interactive omc release mosh all mkbuilddirs fmi test install-dirs susan susan_all susgen sustst install-openturns runtimeCPPinstall CMinpack metis Cdaskr boehm-gc qtclients omshell omnotebook omedit omvisualize omoptim omoptimbasis

mkbuilddirs:
if [ "$(APP)" = ".app" ]; then mkdir -p $(builddir_app); fi
Expand Down Expand Up @@ -59,9 +59,6 @@ bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt lis graphst
$(MAKE) -f $(defaultMakefileTarget) -C Compiler builtin install_scripts
$(MAKE) -f $(defaultMakefileTarget) -C Parser install

install-python:
(time $(MAKE) -C PythonInterface -f $(defaultMakefileTarget))

install-openturns: mkbuilddirs
(time cp SimulationRuntime/OpenTurns/* $(builddir_share)/omc/scripts/OpenTurns/)

Expand Down Expand Up @@ -350,7 +347,6 @@ clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean CMi
(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd Parser && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd mosh/src && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd PythonInterface && $(MAKE) -f $(defaultMakefileTarget) clean)
$(MAKE) -C Compiler/Template -f $(defaultMakefileTarget) clean
if test -f 3rdParty/modelica3d/build/Makefile; then $(MAKE) -C 3rdParty/modelica3d/build clean; fi
# remove Ipopt-3.11.6/Makefile if there is no Ipopt-3.11.6/Ipopt/Makefile to run configure again!
Expand All @@ -376,7 +372,7 @@ install-dirs:
test ! -d ${builddir_share}/omedit/nls/ || mkdir -p ${INSTALL_SHAREDIR}/omedit/nls/
mkdir -p ${INSTALL_SHAREDIR}/omc/scripts ${INSTALL_JAVADIR}

install: install-dirs install-python
install: install-dirs
echo Installing OpenModelica...
# Application directory (OSX)
if [ "$(APP)" = ".app" ]; then cp -rp ${builddir_app} $(INSTALL_APPDIR); fi
Expand Down
12 changes: 0 additions & 12 deletions configure.ac
Expand Up @@ -18,7 +18,6 @@ AC_SUBST(LIBLPSOLVE55)
AC_SUBST(LPSOLVEINC)
AC_SUBST(MODELICA3D)
AC_SUBST(OPENCL)
AC_SUBST(IDLPYTHONCMD)
AC_SUBST(USE_GRAPH)
AC_SUBST(USE_METIS)
AC_SUBST(USE_PATOH)
Expand Down Expand Up @@ -46,7 +45,6 @@ AC_SUBST(RUNTIMECFLAGS)
AC_SUBST(MAKE)
AC_SUBST(LIBREADLINE)
AC_SUBST(LD_LAPACK)
AC_SUBST(PYTHON_INTERFACE)
AC_SUBST(WITH_SUNDIALS)
AC_SUBST(WITH_IPOPT)
AC_SUBST(WITH_UMFPACK)
Expand Down Expand Up @@ -582,14 +580,6 @@ AS_IF([test "x$with_UMFPACK" = xyes],

m4_include([corba.m4])

AC_MSG_CHECKING([if the user wants to use the Python interface])
AC_ARG_ENABLE(python-interface, [ --disable-python-interface Python interface to omc. Enabled by default if CORBA is enabled.],[test "xno" = x"$enableval" && PYTHON_INTERFACE=""])
if test -z "$PYTHON_INTERFACE" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
fi

AC_MSG_CHECKING([if the user wants Modelica3D])
MODELICA3D="yes"
AC_ARG_ENABLE(modelica3d, [ --disable-modelica3d Modelica3D library (dependencies checked by cmake later on; enabled by default)],[test "xno" = x"$enableval" && MODELICA3D=""],[])
Expand Down Expand Up @@ -853,8 +843,6 @@ Compiler/Script/Makefile \
Compiler/Template/Makefile \
Compiler/runtime/Makefile \
Compiler/runtime/config.unix.h \
PythonInterface/Makefile \
PythonInterface/OMPython/OMConfig.py \
Parser/Makefile \
3rdParty/qwt/Makefile.unix \
OMNotebook/OMNotebookGUI/OMNotebook.config \
Expand Down

0 comments on commit cf8c348

Please sign in to comment.