diff --git a/src/decompositionMethods/scotchDecomp/Make/options b/src/decompositionMethods/scotchDecomp/Make/options index 89f07e7a8..0b79ad423 100644 --- a/src/decompositionMethods/scotchDecomp/Make/options +++ b/src/decompositionMethods/scotchDecomp/Make/options @@ -10,5 +10,6 @@ LIB_LIBS = \ else LIB_LIBS = \ -L$(SCOTCH_LIB_DIR) -lscotch \ - -L$(SCOTCH_LIB_DIR) -lscotcherrexit -lrt + -L$(SCOTCH_LIB_DIR) -lscotcherrexit \ + -lrt endif diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options index e3fe7ea04..8b8c0733d 100644 --- a/src/thermophysicalModels/basic/Make/options +++ b/src/thermophysicalModels/basic/Make/options @@ -3,5 +3,4 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude LIB_LIBS = \ - -lspecie \ -lfiniteVolume diff --git a/src/thermophysicalModels/liquidMixture/Make/options b/src/thermophysicalModels/liquidMixture/Make/options index 99651949b..af78c79a3 100644 --- a/src/thermophysicalModels/liquidMixture/Make/options +++ b/src/thermophysicalModels/liquidMixture/Make/options @@ -4,6 +4,3 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude - -LIB_LIBS = \ - -lliquids diff --git a/src/thermophysicalModels/liquids/Make/options b/src/thermophysicalModels/liquids/Make/options index b964b6129..8a129fda6 100644 --- a/src/thermophysicalModels/liquids/Make/options +++ b/src/thermophysicalModels/liquids/Make/options @@ -1,5 +1 @@ -EXE_INC = \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude - -LIB_LIBS = \ - -lthermophysicalFunctions +EXE_INC = -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options index 593941693..9dad3910d 100644 --- a/src/thermophysicalModels/reactionThermo/Make/options +++ b/src/thermophysicalModels/reactionThermo/Make/options @@ -4,5 +4,4 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude LIB_LIBS = \ - -lbasicThermophysicalModels \ -lfiniteVolume diff --git a/src/thermophysicalModels/solidMixture/Make/options b/src/thermophysicalModels/solidMixture/Make/options index 8fa22e608..fc8c86a25 100644 --- a/src/thermophysicalModels/solidMixture/Make/options +++ b/src/thermophysicalModels/solidMixture/Make/options @@ -1,5 +1,2 @@ EXE_INC = \ -I${LIB_SRC}/thermophysicalModels/solids/lnInclude - -LIB_LIBS = \ - -lsolids diff --git a/wmake/rules/SiCortex64Gcc/c++ b/wmake/rules/SiCortex64Gcc/c++ index db8816247..dafa8f5c3 100644 --- a/wmake/rules/SiCortex64Gcc/c++ +++ b/wmake/rules/SiCortex64Gcc/c++ @@ -18,5 +18,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/SunOS64Gcc/c++ b/wmake/rules/SunOS64Gcc/c++ index 7275fce77..936a030ee 100644 --- a/wmake/rules/SunOS64Gcc/c++ +++ b/wmake/rules/SunOS64Gcc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++ index f798eb72f..9d9033dc7 100644 --- a/wmake/rules/linuxIA64Gcc/c++ +++ b/wmake/rules/linuxIA64Gcc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++ index 388b34b5b..b1f6ac6de 100644 --- a/wmake/rules/linuxPPC64Gcc/c++ +++ b/wmake/rules/linuxPPC64Gcc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++ index d85506ead..455c87bdf 100644 --- a/wmake/rules/solarisGcc/c++ +++ b/wmake/rules/solarisGcc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed