From 3a06ed9bb4aed4f1603b85f319d2fa09337fa901 Mon Sep 17 00:00:00 2001 From: caremoli Date: Mon, 28 Jan 2008 10:16:08 +0000 Subject: [PATCH] CCAR: remove circular dependency in idls --- idl/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/idl/Makefile.am b/idl/Makefile.am index f864c7187..07d7428ba 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -95,7 +95,7 @@ BASEIDL_SOURCES =\ Calcium_PortsSK.cc \ Palm_PortsSK.cc -DYNIDL_SOURCES = \ +DYNIDL_SRCS = \ SALOME_PortsDynSK.cc Calcium_PortsDynSK.cc SALOME_ContainerManagerDynSK.cc \ SALOME_CommDynSK.cc SALOME_RegistryDynSK.cc SALOME_ModuleCatalogDynSK.cc \ SALOMEDSDynSK.cc SALOME_SessionDynSK.cc SALOME_RessourcesCatalogDynSK.cc \ @@ -119,9 +119,7 @@ if MPI_IS_OK STATIDL_SOURCES += $(MPIIDL_SOURCES) endif -IDL_SOURCES += $(DYNIDL_SOURCES) - -$(DYNIDL_SOURCES) : $(IDL_SOURCES) +$(DYNIDL_SRCS) : $(IDL_SOURCES) # also install all generated headers to use result library from another modules salomeinclude_DATA= $(STATIDL_SOURCES:%SK.cc=%.hh) @@ -202,7 +200,7 @@ DSC_EnginesPaCO.h DSC_EnginesPaCO.cc : DSC_Engines.idl DSC_Engines.xml lib_LTLIBRARIES = libSalomeIDLKernel.la $(PAR_LIB) -nodist_libSalomeIDLKernel_la_SOURCES = $(IDL_SOURCES) +nodist_libSalomeIDLKernel_la_SOURCES = $(IDL_SOURCES) $(DYNIDL_SRCS) libSalomeIDLKernel_la_CPPFLAGS =-I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -- 2.39.2