Ignore:
Timestamp:
Oct 22, 2019 11:31:16 AM (8 weeks ago)
Author:
randersson
Message:

#5819 Merged trunk into branch

Location:
branches/dev-5819
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819

  • branches/dev-5819/Makefile.in

    r13799 r13800  
    1515
    1616@SET_MAKE@
     17
     18#
     19#    Copyright (C) 2009 Modelon AB
     20#
     21#    This program is free software: you can redistribute it and/or modify
     22#    it under the terms of the Common Public License as published by
     23#    IBM, version 1.0 of the License.
     24#
     25#    This program is distributed in the hope that it will be useful,
     26#    but WITHOUT ANY WARRANTY. See the Common Public License for more details.
     27#
     28#    You should have received a copy of the Common Public License
     29#    along with this program.  If not, see
     30#     <http://www.ibm.com/developerworks/library/os-cpl.html/>.
    1731
    1832#
     
    4963host_triplet = @host@
    5064@PYTHON_ENABLED_TRUE@am__append_1 = Python
    51 subdir = .
    5265DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
    53     $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    54     $(srcdir)/jm_tests.in \
     66    $(srcdir)/Makefile.in $(srcdir)/MakefileCasadi.am \
     67    $(srcdir)/config.h.in $(srcdir)/jm_tests.in \
    5568    $(top_srcdir)/Python/src/required_defaults.py.in \
    5669    $(top_srcdir)/configure INSTALL config.guess config.sub \
    5770    depcomp install-sh ltmain.sh missing
     71subdir = .
    5872ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    5973am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
     
    400414am--refresh:
    401415    @:
    402 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(am__configure_deps)
     416$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/MakefileCasadi.am $(am__configure_deps)
    403417    @for dep in $?; do \
    404418      case '$(am__configure_deps)' in \
     
    894908
    895909
     910.PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
     911
    896912casadi:
    897913@COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
     
    10461062@COMPILE_WITH_IPOPT64_TRUE@ echo "from modelica_casadi_transfer_wrapper import *" >> $(DESTDIR)$(prefix)/Python_64/modelicacasadi_transfer/__init__.py
    10471063@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_INTERFACE)/python/modelica_casadi_transfer_wrapper.py $(DESTDIR)$(prefix)/Python_64/modelicacasadi_transfer
     1064
     1065clean-casadi-interface:
     1066    rm -rf $(MC_BUILD)
     1067    rm -rf $(MC_BUILD64)
     1068#   rm -rf $(DESTDIR)$(prefix)/Python/casadi
     1069#   rm -rf $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer
     1070@HAVE_ANT_TRUE@ cd $(JAVA_CASADI_BUILD_DIR)/ModelicaCompilerCasADi; \
     1071@HAVE_ANT_TRUE@ $(ANT_OPTS) $(ANT) clean ; rm -rf $(MC_CASADI_BUILD)/src/cpp-generated $(MC_CASADI_BUILD)/src/generated/modelica/java/ifcasadi
     1072@HAVE_ANT_TRUE@ cd $(JAVA_CASADI_BUILD_DIR)/OptimicaCompilerCasADi; \
     1073@HAVE_ANT_TRUE@ $(ANT_OPTS) $(ANT) clean ; rm -rf $(OC_CASADI_BUILD)/src/cpp-generated $(OC_CASADI_BUILD)/src/generated/optimica/java/ifcasadi
    10481074
    10491075build-python-packages:
     
    13521378clean-local: clean-frontends clean-python-packages clean-casadi-interface
    13531379
    1354 clean-casadi-interface:
    1355     rm -rf $(MC_BUILD)
    1356     rm -rf $(MC_BUILD64)
    1357 #   rm -rf $(DESTDIR)$(prefix)/Python/casadi
    1358 #   rm -rf $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer
    1359 @HAVE_ANT_TRUE@ cd $(JAVA_CASADI_BUILD_DIR)/ModelicaCompilerCasADi; \
    1360 @HAVE_ANT_TRUE@ $(ANT_OPTS) $(ANT) clean ; rm -rf $(MC_CASADI_BUILD)/src/cpp-generated $(MC_CASADI_BUILD)/src/generated/modelica/java/ifcasadi
    1361 @HAVE_ANT_TRUE@ cd $(JAVA_CASADI_BUILD_DIR)/OptimicaCompilerCasADi; \
    1362 @HAVE_ANT_TRUE@ $(ANT_OPTS) $(ANT) clean ; rm -rf $(OC_CASADI_BUILD)/src/cpp-generated $(OC_CASADI_BUILD)/src/generated/optimica/java/ifcasadi
    1363 
    13641380clean-python-packages:
    13651381@PYTHON_ENABLED_TRUE@   if [ -d $(assimulo_build_dir)/Assimulo ]; then \
     
    13921408    make -C $(abs_top_srcdir)/doc/PyJMI html
    13931409
    1394 .PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
    1395 
    13961410# Tell versions [3.59,3.63) of GNU make to not export all variables.
    13971411# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.