diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options index 43a48312c42c76a6f500f502d306a5c7e1016c94..8fcb7016f81a290e860556bfe163cac4d36838bd 100644 --- a/src/Pstream/mpi/Make/options +++ b/src/Pstream/mpi/Make/options @@ -1,5 +1,5 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = $(PFLAGS) $(PINC) $(c++LESSWARN) LIB_LIBS = $(PLIBS) diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options index 51ae4a6662c6b8511af08b1d29ec0a51961b88d0..3a1fd5b88bff75bd484866fc0d66ed46ebcd8865 100644 --- a/src/parallel/decompose/ptscotchDecomp/Make/options +++ b/src/parallel/decompose/ptscotchDecomp/Make/options @@ -1,5 +1,5 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = \ $(PFLAGS) $(PINC) \ diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options index 1ca71f6a6838c717694e731b6e7d6990e0d4b087..5a15e3882015547abb531ae2d6a484fca302d8d4 100644 --- a/src/parallel/decompose/scotchDecomp/Make/options +++ b/src/parallel/decompose/scotchDecomp/Make/options @@ -3,7 +3,7 @@ * This is purely to avoid scotch.h including mpicxx.h, which causes problems. */ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = \ $(PFLAGS) $(PINC) \ diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options index e92e24e0962594c631ec0a7fa1533d0ee676a155..406b96aa945553631babc20bee43afdb8105b690 100644 --- a/src/renumber/zoltanRenumber/Make/options +++ b/src/renumber/zoltanRenumber/Make/options @@ -1,5 +1,5 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = \ /* -DFULLDEBUG -g -O0 */ \ diff --git a/wmake/rules/General/ADIOS b/wmake/rules/General/ADIOS index 87bda2c75204b30516a278532120340376ee487e..c2cb3558ae21d83cdda2c88023684b2af08a95c0 100644 --- a/wmake/rules/General/ADIOS +++ b/wmake/rules/General/ADIOS @@ -2,7 +2,7 @@ # ADIOS includes/libraries sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) # Obtain compile/link flags via adios_config ADIOS_INC := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -c) diff --git a/wmake/rules/General/ADIOS2 b/wmake/rules/General/ADIOS2 index f158236942ce7a3883a793b4b94c33143bf26726..c880d0c3b97ee62265070b54d73ba142f059eb5b 100644 --- a/wmake/rules/General/ADIOS2 +++ b/wmake/rules/General/ADIOS2 @@ -2,7 +2,7 @@ # ADIOS2 includes/libraries sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) # Obtain prefix and library information via adios2-config ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)