From 3345b116ef61b8223c06b2bedab8bf9006a54186 Mon Sep 17 00:00:00 2001 From: prascle Date: Tue, 14 Feb 2006 22:31:46 +0000 Subject: [PATCH] PR: idl c++ in a library --- bin/Makefile.am | 5 ++++ idl/Makefile.am | 45 +++++++++++++++++++++------- src/Communication/Makefile.am | 19 ++---------- src/Container/Makefile.am | 17 ++--------- src/DataTypeCatalog/Makefile.am | 17 ++--------- src/GenericObj/Makefile.am | 17 ++--------- src/LifeCycleCORBA/Makefile.am | 25 ++-------------- src/LifeCycleCORBA/Test/Makefile.am | 12 ++------ src/Logger/Makefile.am | 21 +++---------- src/MPIContainer/Makefile.am | 18 ++--------- src/Makefile.am | 6 ---- src/ModuleCatalog/Makefile.am | 19 ++---------- src/NamingService/Makefile.am | 11 ------- src/NamingService/Test/Makefile.am | 11 ++----- src/Registry/Makefile.am | 18 ++--------- src/ResourcesManager/Makefile.am | 17 ++--------- src/RessourcesCatalog/Makefile.am | 17 ++--------- src/SALOMEDS/Makefile.am | 23 ++------------ src/SALOMETraceCollector/Makefile.am | 20 ++++--------- src/TOOLSDS/Makefile.am | 21 ++----------- src/TestContainer/Makefile.am | 22 +++----------- src/TestMPIContainer/Makefile.am | 18 ++--------- src/UnitTests/Makefile.am | 19 ++---------- src/Utils/Makefile.am | 20 ++++--------- 24 files changed, 100 insertions(+), 338 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index ec1d25830..2d7ae89ee 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -37,6 +37,11 @@ dist_salomescript_SCRIPTS=\ addToKillList.py \ NSparam.py +EXTRA_DIST = appliskel + +dist-hook: + rm -rf `find $(distdir)/appliskel -name CVS` + install: install-am install-appliskel diff --git a/idl/Makefile.am b/idl/Makefile.am index c5652ba3e..4f9c184e5 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -45,16 +45,43 @@ salomeidl_DATA = $(IDL_FILES) # BUILT_SOURCE = first thing done on make all # idl dependencies are checked and rebuilt first -BUILT_SOURCES =\ - .depidl $(IDL_FILES:%.idl=%SK.cc) $(IDL_FILES:%.idl=%.hh) +BASEIDL_SOURCES =\ + SALOME_ExceptionSK.cc \ + SALOME_CommSK.cc \ + SALOME_ModuleCatalogSK.cc \ + SALOME_DataTypeCatalogSK.cc \ + SALOME_RessourcesCatalogSK.cc \ + SALOMEDSSK.cc \ + SALOMEDS_AttributesSK.cc \ + SALOME_ComponentSK.cc \ + SALOME_ContainerManagerSK.cc \ + SALOME_TestComponentSK.cc \ + SALOME_RegistrySK.cc \ + LoggerSK.cc \ + SALOME_GenericObjSK.cc \ + SALOME_TestModuleCatalogSK.cc \ + nstestSK.cc + +MPIIDL_SOURCES = \ + SALOME_MPIObjectSK.cc \ + SALOME_MPIContainerSK.cc \ + SALOME_TestMPIComponentSK.cc + +IDL_SOURCES = $(BASEIDL_SOURCES) +if MPI_IS_OK + IDL_SOURCES += $(MPIIDL_SOURCES) +endif -nodist_include_HEADERS = $(IDL_FILES:%.idl=%.hh) -nodist_prog_SOURCES = $(IDL_FILES:%.idl=%SK.cc) +BUILT_SOURCES = $(IDL_SOURCES) -dist_hook: - echo "menage final -----------------------------------------" - rm -f $(distdir)/*.hh $(distdir)/*SK.cc $(distdir)/.depidl - echo "menage final -----------------------------------------" +lib_LTLIBRARIES = libSalomeIDLKernel.la +nodist_libSalomeIDLKernel_la_SOURCES = $(BUILT_SOURCES) +libSalomeIDLKernel_la_CPPFLAGS =\ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ +libSalomeIDLKernel_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeIDLKernel_la_LIBADD = @CORBA_LIBS@ # These variables defines the building process of CORBA files OMNIORB_IDL = @OMNIORB_IDL@ @@ -70,8 +97,6 @@ SUFFIXES = .idl .hh SK.cc .idl.hh: $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< -#%SK.cc %.hh : %.idl -# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< # This target overload the standard definition of install. The target # install-pyidl is added to process python corba stubs for SALOME. diff --git a/src/Communication/Makefile.am b/src/Communication/Makefile.am index 36f64a4a6..fd20d963a 100644 --- a/src/Communication/Makefile.am +++ b/src/Communication/Makefile.am @@ -20,18 +20,6 @@ salomeinclude_HEADERS = \ # Local definitions # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Comm.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_CommSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -45,8 +33,8 @@ COMMON_CPPFLAGS=\ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS = \ ../Utils/libOpUtil.la \ - ../SALOMELocalTrace/libSALOMELocalTrace.la - + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # _CS_gbo The need for these flags depends on wether the swig # interface is generated and if MPI is activated. @@ -73,8 +61,7 @@ libSalomeCommunication_la_SOURCES =\ ReceiverFactory.hxx \ SALOMEMultiComm.hxx \ Receivers.hxx \ - Receiver.hxx \ - $(IDL_SOURCES) + Receiver.hxx # the following file is needed by an include file (VERY DIRTY!) EXTRA_DIST = Receivers.cxx diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index 7af6f5ca5..df8f5b8f2 100644 --- a/src/Container/Makefile.am +++ b/src/Container/Makefile.am @@ -56,19 +56,6 @@ dist_salomescript_SCRIPTS=\ # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_ContainerManager.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_ContainerManagerSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @PYTHON_INCLUDES@ \ @@ -95,6 +82,7 @@ COMMON_LIBS =\ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ ../Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ @PYTHON_LIBS@ \ @MPI_LIBS@ \ @CORBA_LIBS@ @@ -109,8 +97,7 @@ libSalomeContainer_la_SOURCES=\ Component_i.cxx \ Container_i.cxx \ SALOME_ContainerManager.cxx \ - Container_init_python.cxx \ - $(IDL_SOURCES) + Container_init_python.cxx libSalomeContainer_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) diff --git a/src/DataTypeCatalog/Makefile.am b/src/DataTypeCatalog/Makefile.am index dce244b6b..cdbcb7d53 100644 --- a/src/DataTypeCatalog/Makefile.am +++ b/src/DataTypeCatalog/Makefile.am @@ -45,17 +45,6 @@ salomeinclude_HEADERS = \ # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_DataTypeCatalog.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_DataTypeCatalogSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ -I$(srcdir)/../Basics \ @@ -71,7 +60,8 @@ COMMON_LIBS =\ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la + ../Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # # =============================================================== @@ -82,8 +72,7 @@ COMMON_LIBS =\ lib_LTLIBRARIES = libSalomeDataTypeCatalog.la libSalomeDataTypeCatalog_la_SOURCES=\ SALOME_DataTypeCatalog_Handler.cxx \ - SALOME_DataTypeCatalog_impl.cxx \ - $(IDL_SOURCES) + SALOME_DataTypeCatalog_impl.cxx libSalomeDataTypeCatalog_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ diff --git a/src/GenericObj/Makefile.am b/src/GenericObj/Makefile.am index c3017773c..22cba819c 100644 --- a/src/GenericObj/Makefile.am +++ b/src/GenericObj/Makefile.am @@ -11,23 +11,10 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS =\ SALOME_GenericObj_i.hh -# The IDL_SOURCES defines the list of files generated from the idl -# interface (SALOME_GenericObj.idl in this case). -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_GenericObj.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_GenericObjSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # Libraries targets lib_LTLIBRARIES = libSalomeGenericObj.la libSalomeGenericObj_la_SOURCES =\ - SALOME_GenericObj_i.cc \ - $(IDL_SOURCES) + SALOME_GenericObj_i.cc libSalomeGenericObj_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeGenericObj_la_CPPFLAGS = \ @@ -36,3 +23,5 @@ libSalomeGenericObj_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ +libSalomeGenericObj_la_LIBADD = \ + $(top_builddir)/idl/libSalomeIDLKernel.la diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am index 18a9a7290..2b48a6be2 100644 --- a/src/LifeCycleCORBA/Makefile.am +++ b/src/LifeCycleCORBA/Makefile.am @@ -47,25 +47,6 @@ dist_salomescript_DATA =\ # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_TestComponent.hh \ - $(top_builddir)/idl/SALOME_ContainerManager.hh \ - $(top_builddir)/idl/SALOME_ModuleCatalog.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_ContainerManagerSK.cc \ - $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ -I$(srcdir)/../Basics \ @@ -85,7 +66,8 @@ COMMON_LIBS =\ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la + ../Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # # =============================================================== @@ -96,8 +78,7 @@ lib_LTLIBRARIES = libSalomeLifeCycleCORBA.la libSalomeLifeCycleCORBA_la_SOURCES = \ SALOME_LifeCycleCORBA.cxx \ Launchers.cxx \ - Launchers.hxx \ - $(IDL_SOURCES) + Launchers.hxx libSalomeLifeCycleCORBA_la_CPPFLAGS = \ $(COMMON_CPPFLAGS) \ @PYTHON_INCLUDES@ \ diff --git a/src/LifeCycleCORBA/Test/Makefile.am b/src/LifeCycleCORBA/Test/Makefile.am index cd09fa879..c5498d82b 100644 --- a/src/LifeCycleCORBA/Test/Makefile.am +++ b/src/LifeCycleCORBA/Test/Makefile.am @@ -49,13 +49,6 @@ dist_salomescript_SCRIPTS = TestLifeCycleCORBA.py # This directory defines the subdirectory src in the top source directory. RPATH=../.. -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc \ - $(top_builddir)/idl/nstest.hh $(top_builddir)/idl/nstestSK.cc - - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @CPPUNIT_INCLUDES@ \ @@ -81,7 +74,8 @@ COMMON_LIBS =\ $(RPATH)/Notification/libSalomeNotification.la \ $(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \ $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \ - $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la + $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # # =============================================================== @@ -89,7 +83,7 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libLifeCycleCORBATest.la -libLifeCycleCORBATest_la_SOURCES = LifeCycleCORBATest.cxx $(BUILT_SOURCES) +libLifeCycleCORBATest_la_SOURCES = LifeCycleCORBATest.cxx libLifeCycleCORBATest_la_CPPFLAGS = $(COMMON_CPPFLAGS) libLifeCycleCORBATest_la_LDFLAGS = -no-undefined -version-info=0:0:0 libLifeCycleCORBATest_la_LIBADD = $(COMMON_LIBS) diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am index d55a4935e..8dc235bcb 100644 --- a/src/Logger/Makefile.am +++ b/src/Logger/Makefile.am @@ -31,25 +31,11 @@ SALOME_Logger_Server_CPPFLAGS =\ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -# The IDL_SOURCES defines the list of files generated from the idl -# interface (Logger.idl in this case). - -nodist_include_HEADERS = \ - $(top_builddir)/idl/Logger.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/LoggerSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # Libraries targets lib_LTLIBRARIES = libSalomeLoggerServer.la libSalomeLoggerServer_la_SOURCES =\ SALOME_Trace.cxx \ - SALOME_Logger_Server.cxx \ - $(IDL_SOURCES) + SALOME_Logger_Server.cxx libSalomeLoggerServer_la_CPPFLAGS =\ -I$(top_builddir)/salome_adm/unix \ @@ -57,8 +43,9 @@ libSalomeLoggerServer_la_CPPFLAGS =\ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ libSalomeLoggerServer_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeLoggerServer_la_LIBADD = @CORBA_LIBS@ +libSalomeLoggerServer_la_LIBADD = \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ + @CORBA_LIBS@ # Scripts target dist_salomescript_DATA = SALOME_Trace.py - diff --git a/src/MPIContainer/Makefile.am b/src/MPIContainer/Makefile.am index fbd5a1899..564f7ff6b 100644 --- a/src/MPIContainer/Makefile.am +++ b/src/MPIContainer/Makefile.am @@ -52,21 +52,6 @@ salomeinclude_HEADERS = \ # Local definitions # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_MPIObject.hh \ - $(top_builddir)/idl/SALOME_MPIContainer.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ - $(top_builddir)/idl/SALOME_MPIContainerSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. # _CS_gbo See wether it can be shared by all packages in a common include!! @@ -95,6 +80,7 @@ COMMON_LIBS =\ ../SALOMELocalTrace/libSALOMELocalTrace.la \ ../Basics/libSALOMEBasics.la \ ../Container/libSalomeContainer.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ @CORBA_LIBS@ # @@ -103,7 +89,7 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libSalomeMPIContainer.la -libSalomeMPIContainer_la_SOURCES = MPIObject_i.cxx MPIContainer_i.cxx $(IDL_SOURCES) +libSalomeMPIContainer_la_SOURCES = MPIObject_i.cxx MPIContainer_i.cxx libSalomeMPIContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeMPIContainer_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeMPIContainer_la_LIBADD = $(COMMON_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index 929ce5401..3520511e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,12 +109,6 @@ endif if CPPUNIT_IS_OK SUBDIRS += $(SUBDIR_CPPUNIT_BASE) -endif - -if CORBA_GEN SUBDIRS += $(SUBDIR_CPPUNIT_CORBA) -endif - -if CPPUNIT_IS_OK SUBDIRS += $(SUBDIR_CPPUNIT_GENERAL) endif diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am index 6c70a7a96..414ae3c10 100644 --- a/src/ModuleCatalog/Makefile.am +++ b/src/ModuleCatalog/Makefile.am @@ -53,19 +53,6 @@ dist_salomescript_DATA = SALOME_TestModuleCatalog.py # lib_LTLIBRARIES = libSalomeCatalog.la -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_ModuleCatalog.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ -I$(srcdir)/../Basics \ @@ -82,14 +69,14 @@ COMMON_LIBS =\ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la + ../Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la libSalomeCatalog_la_SOURCES =\ SALOME_ModuleCatalog_Handler.cxx \ SALOME_ModuleCatalog_Parser_IO.cxx \ SALOME_ModuleCatalog_impl.cxx \ - SALOME_ModuleCatalog_Acomponent_impl.cxx \ - $(IDL_SOURCES) + SALOME_ModuleCatalog_Acomponent_impl.cxx libSalomeCatalog_la_CPPFLAGS =\ -ftemplate-depth-32 \ diff --git a/src/NamingService/Makefile.am b/src/NamingService/Makefile.am index 0c8142ff7..996a727e1 100644 --- a/src/NamingService/Makefile.am +++ b/src/NamingService/Makefile.am @@ -39,23 +39,12 @@ dist_salomescript_DATA =\ SALOME_NamingServicePy.py -# The IDL_SOURCES defines the list of files generated from the idl -# interface (SALOME_Exception.idl in this case). -#IDL_SOURCES = $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc - - # Libraries targets lib_LTLIBRARIES = libSalomeNS.la libSalomeNS_la_SOURCES =\ SALOME_NamingService.cxx \ ServiceUnreachable.cxx \ NamingService_WaitForServerReadiness.cxx -# $(IDL_SOURCES) -# _CS_gbo We don't need to add the IDL_SOURCES files because the -# symbols needed from this sources are given by the linked libraries -# (libOptUtil.la). Meanwhile, the symbols could be duplicated here and -# no error would occur. An other reason to add it is that the -# dependencies could lose the symbols needed libSalomeNS_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/NamingService/Test/Makefile.am b/src/NamingService/Test/Makefile.am index 18abab3a1..af7d1a4c9 100644 --- a/src/NamingService/Test/Makefile.am +++ b/src/NamingService/Test/Makefile.am @@ -49,12 +49,6 @@ dist_salomescript_SCRIPTS = TestNamingService.py # This directory defines the subdirectory src in the top source directory. RPATH=../.. -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc \ - $(top_builddir)/idl/nstest.hh $(top_builddir)/idl/nstestSK.cc - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @CPPUNIT_INCLUDES@ -I$(srcdir)/$(RPATH)/NamingService \ @@ -71,7 +65,7 @@ COMMON_CPPFLAGS=\ # =============================================================== # lib_LTLIBRARIES = libNamingServiceTest.la -libNamingServiceTest_la_SOURCES = NamingServiceTest.cxx $(BUILT_SOURCES) +libNamingServiceTest_la_SOURCES = NamingServiceTest.cxx libNamingServiceTest_la_CPPFLAGS = $(COMMON_CPPFLAGS) libNamingServiceTest_la_LDFLAGS = -no-undefined -version-info=0:0:0 libNamingServiceTest_la_LIBADD = @CPPUNIT_LIBS@ @@ -97,4 +91,5 @@ TestNamingService_LDADD = \ $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \ $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ $(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \ - $(RPATH)/Basics/libSALOMEBasics.la + $(RPATH)/Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la diff --git a/src/Registry/Makefile.am b/src/Registry/Makefile.am index 0ca8a56b2..f4ad2adc9 100644 --- a/src/Registry/Makefile.am +++ b/src/Registry/Makefile.am @@ -33,24 +33,11 @@ salomeinclude_HEADERS =\ RegistryConnexion.hxx \ RegistryService.hxx -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Registry.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_RegistrySK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # Libraries targets lib_LTLIBRARIES = libRegistry.la libRegistry_la_SOURCES =\ RegistryConnexion.cxx \ - RegistryService.cxx \ - $(IDL_SOURCES) + RegistryService.cxx libRegistry_la_LDFLAGS = -no-undefined -version-info=0:0:0 libRegistry_la_CPPFLAGS =\ @@ -65,7 +52,8 @@ libRegistry_la_CPPFLAGS =\ libRegistry_la_LIBADD =\ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ - ../SALOMELocalTrace/libSALOMELocalTrace.la + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # Executables targets diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am index 99f2bfc8c..124647f5c 100755 --- a/src/ResourcesManager/Makefile.am +++ b/src/ResourcesManager/Makefile.am @@ -46,17 +46,6 @@ salomeinclude_HEADERS = \ # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_ContainerManager.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ContainerManagerSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ -I$(srcdir)/../Basics \ @@ -70,7 +59,8 @@ COMMON_CPPFLAGS=\ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS =\ ../NamingService/libSalomeNS.la \ - ../Utils/libOpUtil.la + ../Utils/libOpUtil.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # # =============================================================== @@ -82,8 +72,7 @@ libSalomeResourcesManager_la_SOURCES =\ SALOME_ResourcesCatalog_Parser.cxx \ SALOME_ResourcesCatalog_Handler.cxx \ SALOME_LoadRateManager.cxx \ - SALOME_ResourcesManager.cxx \ - $(IDL_SOURCES) + SALOME_ResourcesManager.cxx libSalomeResourcesManager_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ diff --git a/src/RessourcesCatalog/Makefile.am b/src/RessourcesCatalog/Makefile.am index 382674a88..24f917812 100644 --- a/src/RessourcesCatalog/Makefile.am +++ b/src/RessourcesCatalog/Makefile.am @@ -47,17 +47,6 @@ salomeinclude_HEADERS = \ # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_RessourcesCatalog.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_RessourcesCatalogSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ -I$(srcdir)/../Basics \ @@ -73,7 +62,8 @@ COMMON_LIBS =\ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la + ../Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # # =============================================================== @@ -84,8 +74,7 @@ COMMON_LIBS =\ lib_LTLIBRARIES = libSalomeRessourcesCatalog.la libSalomeRessourcesCatalog_la_SOURCES=\ SALOME_RessourcesCatalog_Handler.cxx \ - SALOME_RessourcesCatalog_impl.cxx \ - $(IDL_SOURCES) + SALOME_RessourcesCatalog_impl.cxx libSalomeRessourcesCatalog_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am index 228a9b344..97f736b5e 100644 --- a/src/SALOMEDS/Makefile.am +++ b/src/SALOMEDS/Makefile.am @@ -33,25 +33,6 @@ dist_salomescript_DATA = SALOME_DriverPy.py # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOMEDS.hh \ - $(top_builddir)/idl/SALOMEDS_Attributes.hh \ - $(top_builddir)/idl/SALOME_GenericObj.hh \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOMEDSSK.cc \ - $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ - $(top_builddir)/idl/SALOME_GenericObjSK.cc \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ @@ -84,6 +65,7 @@ COMMON_LIBS =\ ../SALOMEDSImpl/libSalomeDSImpl.la \ ../GenericObj/libSalomeGenericObj.la \ ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ @CAS_KERNEL@ \ @HDF5_LIBS@ \ $(LDXMUFLAGS) @@ -314,8 +296,7 @@ libSalomeDS_la_SOURCES = \ SALOMEDS_UseCaseBuilder.hxx \ SALOMEDS_UseCaseBuilder_i.hxx \ SALOMEDS_UseCaseIterator.hxx \ - SALOMEDS_UseCaseIterator_i.hxx \ - $(IDL_SOURCES) + SALOMEDS_UseCaseIterator_i.hxx libSalomeDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeDS_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/SALOMETraceCollector/Makefile.am b/src/SALOMETraceCollector/Makefile.am index 928901b8e..431d090da 100644 --- a/src/SALOMETraceCollector/Makefile.am +++ b/src/SALOMETraceCollector/Makefile.am @@ -14,25 +14,12 @@ salomeinclude_HEADERS = \ SALOMETraceCollector.hxx \ TraceCollector_WaitForServerReadiness.hxx -# The IDL_SOURCES defines the list of files generated from the idl -# interface (Logger.idl in this case). -nodist_include_HEADERS = \ - $(top_builddir)/idl/Logger.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/LoggerSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # Libraries targets lib_LTLIBRARIES = libwith_loggerTraceCollector.la libwith_loggerTraceCollector_la_SOURCES =\ SALOMETraceCollector.cxx \ - TraceCollector_WaitForServerReadiness.cxx \ - $(IDL_SOURCES) + TraceCollector_WaitForServerReadiness.cxx libwith_loggerTraceCollector_la_CPPFLAGS =\ -I$(srcdir)/../Basics \ @@ -42,4 +29,7 @@ libwith_loggerTraceCollector_la_CPPFLAGS =\ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ libwith_loggerTraceCollector_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libwith_loggerTraceCollector_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la @CORBA_LIBS@ +libwith_loggerTraceCollector_la_LIBADD = \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ + @CORBA_LIBS@ diff --git a/src/TOOLSDS/Makefile.am b/src/TOOLSDS/Makefile.am index 552de892d..573736271 100644 --- a/src/TOOLSDS/Makefile.am +++ b/src/TOOLSDS/Makefile.am @@ -14,23 +14,6 @@ salomeinclude_HEADERS = SALOMEDS_Tool.hxx # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOMEDS.hh \ - $(top_builddir)/idl/SALOMEDS_Attributes.hh \ - $(top_builddir)/idl/SALOME_GenericObj.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOMEDSSK.cc \ - $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ - $(top_builddir)/idl/SALOME_GenericObjSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ -I$(srcdir)/../Basics \ @@ -46,6 +29,7 @@ COMMON_CPPFLAGS=\ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS =\ ../Utils/libOpUtil.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ @CAS_KERNEL@ # @@ -55,8 +39,7 @@ COMMON_LIBS =\ # lib_LTLIBRARIES = libTOOLSDS.la libTOOLSDS_la_SOURCES = \ - SALOMEDS_Tool.cxx \ - $(IDL_SOURCES) + SALOMEDS_Tool.cxx libTOOLSDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) libTOOLSDS_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am index a996bca49..d7d61756a 100644 --- a/src/TestContainer/Makefile.am +++ b/src/TestContainer/Makefile.am @@ -68,22 +68,8 @@ COMMON_LIBS =\ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la - -# Sources built from idl files and required for building -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_TestComponent.hh \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) + ../Basics/libSALOMEBasics.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la # # =============================================================== @@ -93,8 +79,8 @@ IDL_SOURCES = \ lib_LTLIBRARIES = libSalomeTestComponentEngine.la libSalomeTestComponentEngine_la_SOURCES = \ SALOME_TestComponent_i.cxx \ - SALOME_TestComponent_i.hxx \ - $(IDL_SOURCES) + SALOME_TestComponent_i.hxx + libSalomeTestComponentEngine_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeTestComponentEngine_la_LIBADD = $(COMMON_LIBS) diff --git a/src/TestMPIContainer/Makefile.am b/src/TestMPIContainer/Makefile.am index dca3c40b0..9ba474d04 100644 --- a/src/TestMPIContainer/Makefile.am +++ b/src/TestMPIContainer/Makefile.am @@ -50,21 +50,6 @@ salomeinclude_HEADERS = TestMPIComponentEngine.hxx # Local definitions # =============================================================== # -# Sources built from idl files -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_MPIObject.hh \ - $(top_builddir)/idl/SALOME_TestMPIComponent.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ - $(top_builddir)/idl/SALOME_TestMPIComponentSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # This local variable defines the list of CPPFLAGS common to all target in this package. # _CS_gbo See wether it can be shared by all packages in a common include!! @@ -94,6 +79,7 @@ COMMON_LIBS =\ ../Basics/libSALOMEBasics.la \ ../Container/libSalomeContainer.la \ ../MPIContainer/libSalomeMPIContainer.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ @CORBA_LIBS@ # @@ -102,7 +88,7 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libSalomeTestMPIComponentEngine.la -libSalomeTestMPIComponentEngine_la_SOURCES = TestMPIComponentEngine.cxx $(IDL_SOURCES) +libSalomeTestMPIComponentEngine_la_SOURCES = TestMPIComponentEngine.cxx libSalomeTestMPIComponentEngine_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeTestMPIComponentEngine_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeTestMPIComponentEngine_la_LIBADD = $(COMMON_LIBS) diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am index de5fbefa2..75ba9cfa6 100644 --- a/src/UnitTests/Makefile.am +++ b/src/UnitTests/Makefile.am @@ -43,24 +43,8 @@ dist_salomescript_SCRIPTS = UnitTests.py # =============================================================== # -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Component.hh \ - $(top_builddir)/idl/SALOME_TestComponent.hh \ - $(top_builddir)/idl/SALOME_Exception.hh \ - $(top_builddir)/idl/nstest.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc \ - $(top_builddir)/idl/nstestSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - bin_PROGRAMS = UnitTests -UnitTests_SOURCES = UnitTests.cxx $(IDL_SOURCES) +UnitTests_SOURCES = UnitTests.cxx UnitTests_CPPFLAGS =\ @CPPUNIT_INCLUDES@ \ -I$(srcdir)/../Basics -I$(srcdir)/../Basics/Test \ @@ -89,6 +73,7 @@ UnitTests_LDADD =\ ../SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ ../Utils/libOpUtil.la ../Utils/Test/libUtilsTest.la \ ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la ../LifeCycleCORBA/Test/libLifeCycleCORBATest.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ @CORBA_LIBS@ diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am index 68cd76c67..519457192 100644 --- a/src/Utils/Makefile.am +++ b/src/Utils/Makefile.am @@ -49,18 +49,6 @@ dist_salomescript_DATA =\ Utils_Identity.py \ SALOME_utilities.py -# The IDL_SOURCES defines the list of files generated from the idl -# interface (SALOME_Exception.idl in this case). -nodist_include_HEADERS = \ - $(top_builddir)/idl/SALOME_Exception.hh - -nodist_prog_SOURCES = \ - $(top_builddir)/idl/SALOME_ExceptionSK.cc - -IDL_SOURCES = \ - $(nodist_include_HEADERS) \ - $(nodist_prog_SOURCES) - # Libraries targets lib_LTLIBRARIES = libOpUtil.la libOpUtil_la_SOURCES =\ @@ -71,8 +59,7 @@ libOpUtil_la_SOURCES =\ Utils_DESTRUCTEUR_GENERIQUE.cxx \ Utils_ExceptHandlers.cxx \ Utils_SignalsHandler.cxx \ - Utils_Mutex.cxx \ - $(IDL_SOURCES) + Utils_Mutex.cxx libOpUtil_la_LDFLAGS = -no-undefined -version-info=0:0:0 @@ -83,7 +70,10 @@ libOpUtil_la_CPPFLAGS = \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -libOpUtil_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la @CORBA_LIBS@ +libOpUtil_la_LIBADD = \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la\ + @CORBA_LIBS@ -- 2.39.2