Changeset 13624


Ignore:
Timestamp:
Oct 1, 2019 11:59:26 AM (2 months ago)
Author:
Jonathan Kämpe
Message:

#5844 Refactoring makefile

Location:
branches/dev-jk-2471
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-jk-2471/Makefile.am

    r13396 r13624  
    6464    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    6565    mkdir -p $(DESTDIR)$(prefix)/Python/
    66     cp -r $(abs_builddir)/casadi_install/casadi $(DESTDIR)$(prefix)/Python/
     66    cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
    6767    ## temp fix
    68     cp $(abs_builddir)/casadi_build/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     68    cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    6969endif
    7070if COMPILE_WITH_IPOPT64 
     
    7474    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
    7575    mkdir -p $(DESTDIR)$(prefix)/Python/
    76     cp -r $(abs_builddir)/casadi_install64/casadi $(DESTDIR)$(prefix)/Python_64/
     76    cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
    7777    ## temp fix
    78     cp $(abs_builddir)/casadi_build64/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
     78    cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
    7979    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    8080    export PATH="$(ORIG_PATH)";
     
    504504JAVA_OC_CASADI_ANT_FILE=$(COMPILER_DIR)/OptimicaCompilerCasADi/build.xml
    505505
    506 all-local: build-python-packages build-compiler
    507     $(abs_top_srcdir)/get_version.sh $(abs_top_srcdir) https://svn.jmodelica.org > $(abs_builddir)/version.txt
     506all-local: build-python-packages build-compiler $(abs_builddir)/version.txt build-extra
     507
     508$(abs_builddir)/version.txt: TODO-always-trigger
     509    $(abs_top_srcdir)/get_version.sh $(abs_top_srcdir) https://svn.jmodelica.org > $(@)
     510
     511build-extra: TODO-always-trigger
    508512    if [ "$(BUILD_EXTRA)" ]; then exec "$(BUILD_EXTRA)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
    509513
     
    578582ant_output_options=$(JAVA_BUILD_DIR)/src/build/DefaultOptions.xml
    579583
    580 install-compiler: $(ant_output_jars) $(ant_output_options) TODO-always-trigger
     584install-compiler: $(ant_output_jars) $(ant_output_options)
    581585if HAVE_ANT
    582586    mkdir -p $(DESTDIR)$(prefix)/lib/
     
    585589endif
    586590
    587 # Dummy target used to always trigger rebuilds. Used to enable references to
    588 # outputs from phony targets as real targets. For example ant output.
    589 TODO-always-trigger: ;
    590 
    591591$(ant_output_jars) $(ant_output_options): build-compiler
    592592
    593 build-compiler:
     593build-compiler: TODO-always-trigger
    594594if HAVE_ANT
    595595    mkdir -p $(JAVA_BUILD_DIR)
     
    599599    $(ANT_OPTS) $(ANT) -f "$(JAVA_OC_ANT_FILE)" "-Dcompiler=$(COMPILER_DIR)" "-Dtarget=$(JAVA_BUILD_DIR)"
    600600endif
     601
     602# Dummy target used to always trigger rebuilds. Used to enable references to
     603# outputs from phony targets as real targets. For example ant output.
     604TODO-always-trigger: ;
    601605
    602606install-modules: install-modules-ModelicaFrontEnd
  • branches/dev-jk-2471/Makefile.in

    r13396 r13624  
    879879@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    880880@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/
    881 @COMPILE_WITH_IPOPT_TRUE@   cp -r $(abs_builddir)/casadi_install/casadi $(DESTDIR)$(prefix)/Python/
    882 @COMPILE_WITH_IPOPT_TRUE@   cp $(abs_builddir)/casadi_build/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     881@COMPILE_WITH_IPOPT_TRUE@   cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     882@COMPILE_WITH_IPOPT_TRUE@   cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    883883@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    884884@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); 
     
    886886@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
    887887@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python/
    888 @COMPILE_WITH_IPOPT64_TRUE@ cp -r $(abs_builddir)/casadi_install64/casadi $(DESTDIR)$(prefix)/Python_64/
    889 @COMPILE_WITH_IPOPT64_TRUE@ cp $(abs_builddir)/casadi_build64/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
     888@COMPILE_WITH_IPOPT64_TRUE@ cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
     889@COMPILE_WITH_IPOPT64_TRUE@ cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
    890890@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    891891@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    11931193@PYTHON_ENABLED_TRUE@   chmod ugo+x $(DESTDIR)$(prefix)/bin/jm_*.sh
    11941194
    1195 all-local: build-python-packages build-compiler
    1196     $(abs_top_srcdir)/get_version.sh $(abs_top_srcdir) https://svn.jmodelica.org > $(abs_builddir)/version.txt
     1195all-local: build-python-packages build-compiler $(abs_builddir)/version.txt build-extra
     1196
     1197$(abs_builddir)/version.txt: TODO-always-trigger
     1198    $(abs_top_srcdir)/get_version.sh $(abs_top_srcdir) https://svn.jmodelica.org > $(@)
     1199
     1200build-extra: TODO-always-trigger
    11971201    if [ "$(BUILD_EXTRA)" ]; then exec "$(BUILD_EXTRA)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
    11981202
     
    12571261    if [ "$(INSTALL_EXTRA)" ]; then exec "$(INSTALL_EXTRA)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
    12581262
    1259 install-compiler: $(ant_output_jars) $(ant_output_options) TODO-always-trigger
     1263install-compiler: $(ant_output_jars) $(ant_output_options)
    12601264@HAVE_ANT_TRUE@ mkdir -p $(DESTDIR)$(prefix)/lib/
    12611265@HAVE_ANT_TRUE@ install -t $(DESTDIR)$(prefix)/lib/ $(ant_output_jars)
    12621266@HAVE_ANT_TRUE@ install -t $(DESTDIR)$(prefix)/ $(ant_output_options)
    12631267
    1264 # Dummy target used to always trigger rebuilds. Used to enable references to
    1265 # outputs from phony targets as real targets. For example ant output.
    1266 TODO-always-trigger: ;
    1267 
    12681268$(ant_output_jars) $(ant_output_options): build-compiler
    12691269
    1270 build-compiler:
     1270build-compiler: TODO-always-trigger
    12711271@HAVE_ANT_TRUE@ mkdir -p $(JAVA_BUILD_DIR)
    12721272@HAVE_ANT_TRUE@ cd $(JAVA_BUILD_DIR); \
     
    12741274@HAVE_ANT_TRUE@ cd $(JAVA_BUILD_DIR); \
    12751275@HAVE_ANT_TRUE@ $(ANT_OPTS) $(ANT) -f "$(JAVA_OC_ANT_FILE)" "-Dcompiler=$(COMPILER_DIR)" "-Dtarget=$(JAVA_BUILD_DIR)"
     1276
     1277# Dummy target used to always trigger rebuilds. Used to enable references to
     1278# outputs from phony targets as real targets. For example ant output.
     1279TODO-always-trigger: ;
    12761280
    12771281install-modules: install-modules-ModelicaFrontEnd
Note: See TracChangeset for help on using the changeset viewer.