Join modifications from branch OCC_debug_for_3_2_0b1

[modules/gui.git] / src / Session / Makefile.in

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 22837fbc87dc9ba46fd64fa212cf23556db00c23..27974b91f3eec2f790a1405d4aba3c298ade857b 100755 (executable)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -38,6 +38,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
 EXPORT_HEADERS= Session_Session_i.hxx \
                Session_ServerLauncher.hxx \
                Session_ServerThread.hxx \
+               Session_ServerCheck.hxx \
                SalomeApp_Engine_i.hxx
 
 # Libraries targets
@@ -46,10 +47,10 @@ LIB = libSalomeSession.la
 LIB_SRC=Session_Session_i.cxx \
        Session_ServerThread.cxx \
        Session_ServerLauncher.cxx \
+       Session_ServerCheck.cxx \
        SalomeApp_Engine_i.cxx \
-       InquireServersQThread.cxx
 
-LIB_MOC = InquireServersQThread.h
+LIB_MOC = 
 
 # Executables targets
 BIN = SALOME_Session_Server
@@ -58,9 +59,9 @@ LIB_SERVER_IDL = SALOME_Session.idl SalomeApp_Engine.idl
 BIN_SERVER_IDL = 
 BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl SALOME_GenericObj.idl
 
-CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(OCC_INCLUDES)
+CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -I$(OCC_INCLUDES)
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
-LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL)
+LDFLAGS += $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL)
 
 LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics