From: André Ribes Date: Wed, 16 Jun 2010 09:29:35 +0000 (+0200) Subject: - idl DATASSIM -> ADAO X-Git-Tag: V6_4_0rc3~146 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b86ae77321f9a96ffa52fb9b274267d7be8f89e6;p=modules%2Fadao.git - idl DATASSIM -> ADAO --- diff --git a/idl/ADAO.idl b/idl/ADAO.idl new file mode 100644 index 0000000..11c9e09 --- /dev/null +++ b/idl/ADAO.idl @@ -0,0 +1,19 @@ + +#ifndef _ADAO_IDL_ +#define _ADAO_IDL_ + +#include "DSC_Engines.idl" +#include "SALOME_Exception.idl" +#include "SALOME_PACOExtension.idl" + +module ADAO +{ +typedef sequence stringvec; +typedef sequence dblevec; +typedef sequence intvec; +typedef Engines::dataref dataref; + + +}; + +#endif diff --git a/idl/DATASSIM.idl b/idl/DATASSIM.idl deleted file mode 100644 index 5605680..0000000 --- a/idl/DATASSIM.idl +++ /dev/null @@ -1,19 +0,0 @@ - -#ifndef _DATASSIM_IDL_ -#define _DATASSIM_IDL_ - -#include "DSC_Engines.idl" -#include "SALOME_Exception.idl" -#include "SALOME_PACOExtension.idl" - -module DATASSIM -{ -typedef sequence stringvec; -typedef sequence dblevec; -typedef sequence intvec; -typedef Engines::dataref dataref; - - -}; - -#endif diff --git a/idl/Makefile.am b/idl/Makefile.am index 6e32ff6..7cd8c93 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,17 +1,17 @@ include $(top_srcdir)/adm_local/make_common_starter.am -BUILT_SOURCES = DATASSIMSK.cc -IDL_FILES=DATASSIM.idl +BUILT_SOURCES = ADAOSK.cc +IDL_FILES=ADAO.idl -lib_LTLIBRARIES = libDATASSIM.la +lib_LTLIBRARIES = libADAO.la salomeidl_DATA = $(IDL_FILES) -salomepython_DATA = DATASSIM_idl.py -libDATASSIM_la_SOURCES = -nodist_libDATASSIM_la_SOURCES = DATASSIMSK.cc -nodist_salomeinclude_HEADERS= DATASSIM.hh -libDATASSIM_la_CXXFLAGS = -I. $(KERNEL_INCLUDES) -libDATASSIM_la_LIBADD = $(KERNEL_LIBS) +salomepython_DATA = ADAO_idl.py +libADAO_la_SOURCES = +nodist_libADAO_la_SOURCES = ADAOSK.cc +nodist_salomeinclude_HEADERS= ADAO.hh +libADAO_la_CXXFLAGS = -I. $(KERNEL_INCLUDES) +libADAO_la_LIBADD = $(KERNEL_LIBS) ########################################################## %SK.cc %.hh : %.idl $(OMNIORB_IDL) -bcxx $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $(IDL_INCLUDES) $< @@ -25,12 +25,12 @@ CLEANFILES = *.hh *SK.cc *.py *.hxx *.cxx EXTRA_DIST = $(IDL_FILES) clean-local: - rm -rf DATASSIM DATASSIM__POA + rm -rf ADAO ADAO__POA install-data-local: ${mkinstalldirs} $(DESTDIR)$(salomepythondir) - cp -R DATASSIM DATASSIM__POA $(DESTDIR)$(salomepythondir) + cp -R ADAO ADAO__POA $(DESTDIR)$(salomepythondir) uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/DATASSIM - rm -rf $(DESTDIR)$(salomepythondir)/DATASSIM__POA + rm -rf $(DESTDIR)$(salomepythondir)/ADAO + rm -rf $(DESTDIR)$(salomepythondir)/ADAO__POA