From 77330883663a6a41658592268f153b0c01d1ab64 Mon Sep 17 00:00:00 2001 From: secher Date: Wed, 16 Nov 2005 11:14:51 +0000 Subject: [PATCH] resolve dependances on QT --- bin/appliskel/envd | 2 +- src/DataTypeCatalog/Makefile.in | 2 +- src/LifeCycleCORBA/Makefile.in | 2 +- src/MPIContainer/Makefile.in | 2 +- src/ModuleCatalog/Makefile.in | 2 +- src/ResourcesManager/SALOME_ResourcesManager.cxx | 2 +- src/RessourcesCatalog/Makefile.in | 2 +- src/SALOMEDS/Makefile.in | 2 +- src/TestContainer/Makefile.in | 2 +- src/TestMPIContainer/Makefile.in | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/appliskel/envd b/bin/appliskel/envd index 80261ada2..892e3a447 100644 --- a/bin/appliskel/envd +++ b/bin/appliskel/envd @@ -1,3 +1,3 @@ #!/bin/bash -for i in $1/env.d/*;do source ${i}; done +for i in $1/env.d/*.sh;do source ${i}; done diff --git a/src/DataTypeCatalog/Makefile.in b/src/DataTypeCatalog/Makefile.in index d0ed574a6..63df89d7c 100644 --- a/src/DataTypeCatalog/Makefile.in +++ b/src/DataTypeCatalog/Makefile.in @@ -55,5 +55,5 @@ BIN_SERVER_IDL = SALOME_DataTypeCatalog.idl SALOME_Exception.idl CPPFLAGS+= $(QT_MT_INCLUDES) CXXFLAGS+= LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace -LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics +LDFLAGSFORBIN+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics @CONCLUDE@ diff --git a/src/LifeCycleCORBA/Makefile.in b/src/LifeCycleCORBA/Makefile.in index d5b514cf4..3c3d08a00 100644 --- a/src/LifeCycleCORBA/Makefile.in +++ b/src/LifeCycleCORBA/Makefile.in @@ -54,7 +54,7 @@ BIN_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ CPPFLAGS += $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager -LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics +LDFLAGSFORBIN= $(QT_MT_LIBS) $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics LIBS += $(PYTHON_LIBS) @CONCLUDE@ diff --git a/src/MPIContainer/Makefile.in b/src/MPIContainer/Makefile.in index 808e9a422..d66e50644 100644 --- a/src/MPIContainer/Makefile.in +++ b/src/MPIContainer/Makefile.in @@ -59,7 +59,7 @@ ifeq (@WITHMPI@,yes) LIBS += $(PYTHON_LIBS) $(MPI_LIBS) CXXFLAGS+=${MPI_INCLUDES} CXX_DEPEND_FLAG+=${MPI_INCLUDES} - LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics + LDFLAGSFORBIN= $(QT_MT_LIBS) $(LDFLAGS) -lSALOMEBasics LIBSFORBIN= $(LIBS) endif diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in index 65f688f97..232c0ebc6 100644 --- a/src/ModuleCatalog/Makefile.in +++ b/src/ModuleCatalog/Makefile.in @@ -66,7 +66,7 @@ BIN_SERVER_IDL = SALOME_ModuleCatalog.idl SALOME_Exception.idl CPPFLAGS+= $(QT_MT_INCLUDES) LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics -LDFLAGSFORBIN+= -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics +LDFLAGSFORBIN+= $(QT_MT_LIBS) -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics @CONCLUDE@ diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index 26f9d2de7..0a9aeeaea 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -461,7 +461,7 @@ SALOME_ResourcesManager::BuildCommandToLaunchLocalContainer o << nbproc << " "; command += o.str(); - command += "-x PATH,LD_LIBRARY_PATH,OMNIORB_CONFIG,SALOME_trace "; +// command += "-x PATH,LD_LIBRARY_PATH,OMNIORB_CONFIG,SALOME_trace "; if (isPythonContainer(params.container_name)) command += "pyMPI SALOME_ContainerPy.py "; diff --git a/src/RessourcesCatalog/Makefile.in b/src/RessourcesCatalog/Makefile.in index 8d416a855..563e507f4 100644 --- a/src/RessourcesCatalog/Makefile.in +++ b/src/RessourcesCatalog/Makefile.in @@ -55,7 +55,7 @@ BIN_SERVER_IDL = SALOME_RessourcesCatalog.idl SALOME_Exception.idl CPPFLAGS+= $(QT_MT_INCLUDES) CXXFLAGS+= LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace -LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics +LDFLAGSFORBIN+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics @CONCLUDE@ diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in index 96fb1ae2a..780e0309a 100644 --- a/src/SALOMEDS/Makefile.in +++ b/src/SALOMEDS/Makefile.in @@ -134,7 +134,7 @@ LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOME # LDXMUFLAGS= -L/usr/X11R6/lib -lXmu LDFLAGS+=$(LDXMUFLAGS) -LDFLAGSFORBIN= $(LDFLAGS) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics +LDFLAGSFORBIN= $(QT_MT_LIBS) $(LDFLAGS) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics @CONCLUDE@ diff --git a/src/TestContainer/Makefile.in b/src/TestContainer/Makefile.in index 40a5e8e62..0b33e0ad9 100644 --- a/src/TestContainer/Makefile.in +++ b/src/TestContainer/Makefile.in @@ -46,7 +46,7 @@ BIN = TestContainer TestLogger BIN_SRC = LDFLAGS+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager -LDFLAGSFORBIN+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager -lSALOMEBasics +LDFLAGSFORBIN+= $(QT_MT_LIBS) -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager -lSALOMEBasics @CONCLUDE@ diff --git a/src/TestMPIContainer/Makefile.in b/src/TestMPIContainer/Makefile.in index 000d291af..bd514403c 100644 --- a/src/TestMPIContainer/Makefile.in +++ b/src/TestMPIContainer/Makefile.in @@ -31,7 +31,7 @@ BIN_SRC = BIN_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_TestMPIComponent.idl SALOME_Exception.idl BIN_SERVER_IDL = -LDFLAGSFORBIN+= -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeMPIContainer -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeResourcesManager ${MPI_LIBS} +LDFLAGSFORBIN+= $(QT_MT_LIBS) -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeMPIContainer -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeResourcesManager ${MPI_LIBS} CXXFLAGS+=${MPI_INCLUDES} CXX_DEPEND_FLAG+=${MPI_INCLUDES} -- 2.39.2