PR: container lifecycle, new design, first part

[modules/kernel.git] / src / Container / Makefile.in

diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in
index ee5063df1bc235d00b15dc7b76eb31e05847d912..fa963603b2e7c1e5197cd99ab423f60e34a0e6a2 100644 (file)
--- a/src/Container/Makefile.in
+++ b/src/Container/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 
@@ -38,23 +38,28 @@ EXPORT_PYSCRIPTS = SALOME_ComponentPy.py SALOME_ContainerPy.py
 
 EXPORT_HEADERS = \
        SALOME_Component_i.hxx \
-       SALOME_Container_i.hxx
+       SALOME_Container_i.hxx \
+       SALOME_ContainerManager.hxx
 
 # Libraries targets
 
 LIB = libSalomeContainer.la 
-LIB_SRC = Component_i.cxx  Container_i.cxx
-LIB_SERVER_IDL = SALOME_Registry.idl SALOME_Component.idl
+LIB_SRC = Component_i.cxx  Container_i.cxx SALOME_ContainerManager.cxx
+LIB_SERVER_IDL = SALOME_Registry.idl SALOME_Component.idl SALOME_ContainerManager.idl
+LIB_CLIENT_IDL = 
 
 # Executables targets
-BIN = SALOME_Container
-BIN_SRC =
-BIN_SERVER_IDL = SALOME_Component.idl
+BIN = SALOME_Container SALOME_ContainerManagerServer
+BIN_SRC = SALOME_Container_SignalsHandler.cxx
+BIN_SERVER_IDL = SALOME_Component.idl SALOME_ContainerManager.idl
 
-CPPFLAGS+= $(PYTHON_INCLUDES)
+CPPFLAGS+= $(PYTHON_INCLUDES) $(MPI_INCLUDE) $(OCC_INCLUDES) $(QT_MT_INCLUDES)
+CXXFLAGS+=$(OCC_CXXFLAGS)
 
-LDFLAGS+= -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSalomeLoggerServer
+LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSALOMELocalTrace -lSALOMETraceCollector -lSalomeResourcesManager
 
-LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
+LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS) $(MPI_LIBS)
 
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
+LIBSFORBIN= $(LIBS)
 @CONCLUDE@