Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit e10d5e4

Browse files
sjoelundOpenModelica-Hudson
authored andcommitted
Use $(MAKE) in Makefile
make does not exist on some systems, where you need to call gmake. Belonging to [master]: - #2910
1 parent fbc944f commit e10d5e4

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

Makefile.common

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ $(UMFPACK_LIB_TARGET): 3rdParty/SuiteSparse/CMakeLists.txt
187187
umfpack: $(UMFPACK_LIB_TARGET)
188188

189189
umfpack-clean:
190-
if test -d 3rdParty/SuiteSparse/build ; then cd 3rdParty/SuiteSparse/build && make clean ; fi
190+
if test -d 3rdParty/SuiteSparse/build ; then cd 3rdParty/SuiteSparse/build && $(MAKE) clean ; fi
191191
rm -rf 3rdParty/SuiteSparse/build
192192
rm -rf $(OMBUILDDIR)/include/omc/c/suitesparse
193193
rm -f $(OMBUILDDIR)/$(LIB_OMC)/libumfpack$(SHREXT)
@@ -292,7 +292,7 @@ $(builddir_lib_omc)/$(LIBCMINPACKLIB): 3rdParty/CMinpack/build/Makefile
292292
CMinpack-clean:
293293
rm -rf 3rdParty/CMinpack/install
294294
#This is a bad idea, because the cache contains the absolute path to cmake that was used for build -> if the cmake location has changed, the clean command will fail
295-
#if test -f 3rdParty/CMinpack/build/Makefile; then make -C 3rdParty/CMinpack/build clean; fi
295+
#if test -f 3rdParty/CMinpack/build/Makefile; then $(MAKE) -C 3rdParty/CMinpack/build clean; fi
296296
#rm -f 3rdParty/CMinpack/build/Makefile
297297
rm -rf 3rdParty/CMinpack/build
298298

@@ -318,19 +318,19 @@ libzmq-clean:
318318

319319
metis: $(OMBUILDDIR)/$(LIB_OMC)/libmetis$(STAEXT)
320320
$(OMBUILDDIR)/$(LIB_OMC)/libmetis$(STAEXT): 3rdParty/metis-5.1.0/CMakeLists.txt
321-
(cd 3rdParty/metis-5.1.0 && $(CMAKE) ./ -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -G $(CMAKE_TARGET) && CC="$(CC)" CFLAGS="$(CFLAGS)" make)
321+
(cd 3rdParty/metis-5.1.0 && $(CMAKE) ./ -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -G $(CMAKE_TARGET) && CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE))
322322
cp 3rdParty/metis-5.1.0/libmetis/libmetis$(STAEXT) $(OMBUILDDIR)/$(LIB_OMC)/libmetis$(STAEXT)
323323
metis-clean:
324-
test ! -f 3rdParty/metis-5.1.0/Makefile || make -C 3rdParty/metis-5.1.0 clean
324+
test ! -f 3rdParty/metis-5.1.0/Makefile || $(MAKE) -C 3rdParty/metis-5.1.0 clean
325325
rm -rf 3rdParty/metis-5.1.0/CMakeCache.txt 3rdParty/metis-5.1.0/libmetis/libmetis.a 3rdParty/metis-5.1.0/CMakeFiles 3rdParty/metis-5.1.0/Makefile 3rdParty/metis-5.1.0/cmake_install.cmake 3rdParty/metis-5.1.0/include/CMakeFiles 3rdParty/metis-5.1.0/include/Makefile 3rdParty/metis-5.1.0/include/cmake_install.cmake 3rdParty/metis-5.1.0/libmetis/CMakeFiles 3rdParty/metis-5.1.0/libmetis/Makefile 3rdParty/metis-5.1.0/libmetis/cmake_install.cmake 3rdParty/metis-5.1.0/programs/CMakeFiles 3rdParty/metis-5.1.0/programs/Makefile 3rdParty/metis-5.1.0/programs/cmake_install.cmake
326326

327327
Cdaskr: 3rdParty/Cdaskr/solver/libcdaskr.a
328328
3rdParty/Cdaskr/solver/libcdaskr.a:
329329
test -d 3rdParty/Cdaskr/solver
330-
(cd 3rdParty/Cdaskr/solver && make -f Makefile CC="$(CC)" CFLAGS="$(CFLAGS)")
330+
(cd 3rdParty/Cdaskr/solver && $(MAKE) -f Makefile CC="$(CC)" CFLAGS="$(CFLAGS)")
331331

332332
Cdaskr-clean:
333-
cd 3rdParty/Cdaskr/solver && make -f Makefile clean
333+
cd 3rdParty/Cdaskr/solver && $(MAKE) -f Makefile clean
334334

335335
testfast: test
336336

@@ -365,7 +365,7 @@ distclean: clean
365365
fmil-clean:
366366
rm -rf 3rdParty/FMIL/build 3rdParty/FMIL/install 3rdParty/FMIL/Makefile
367367
gc-clean:
368-
if test -f 3rdParty/gc/Makefile; then make -C 3rdParty/gc distclean; fi
368+
if test -f 3rdParty/gc/Makefile; then $(MAKE) -C 3rdParty/gc distclean; fi
369369
rm -f 3rdParty/gc/Makefile
370370
bootstrap-clean:
371371
$(MAKE) -C Compiler/boot clean -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)
@@ -526,7 +526,7 @@ nox: 3rdParty/trilinos-nox/CMakeLists.txt
526526
|| cp -pf 3rdParty/trilinos-nox/build/bin/* "$(builddir_lib_omc)/cpp"
527527

528528
clean-nox:
529-
test -d 3rdParty/trilinos-nox/build && cd 3rdParty/trilinos-nox/build && make clean
529+
test -d 3rdParty/trilinos-nox/build && cd 3rdParty/trilinos-nox/build && $(MAKE) clean
530530
rm -rf $(OMBUILDDIR)/include/omc/cpp/trilinos-nox
531531
rm -f $(builddir_lib_omc)/cpp/lib{belos,loca,ml,nox,teuchos}*
532532

0 commit comments

Comments
 (0)