X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=idl%2FMakefile.am;h=28b684d5ff8b1cdef1ed7c90706371bee35ab90a;hb=3857007e3b712cc2bf885df5a3af5405c552985a;hp=499091bf75619e2da9f2e8ef4e3655eed16ba02f;hpb=94d102d362379da8b0dc676e72a7af0a0a0af49a;p=modules%2Fmed.git

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 499091bf7..28b684d5f 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,9 +24,16 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
+BASEIDL_FILES = \
+	MEDCouplingCorbaServant.idl      \
+	MEDCouplingCorbaServantTest.idl  \
+	ParaMEDCouplingCorbaServant.idl
 
-BASEIDL_FILES = MED.idl MED_Gen.idl Compo1Py.idl MEDCouplingCorbaServant.idl MEDCouplingCorbaServantTest.idl ParaMEDCouplingCorbaServant.idl
+MEDOPIDL_FILES =             \
+	MEDDataManager.idl   \
+	MEDCalculator.idl    \
+	MEDEventListener.idl \
+	MEDOPFactory.idl
 
 MPIIDL_FILES = ParaMEDMEMComponent.idl
 
@@ -34,6 +41,7 @@ IDL_FILES = $(BASEIDL_FILES)
 if MPI_IS_OK
 IDL_FILES += $(MPIIDL_FILES)
 endif
+IDL_FILES += $(MEDOPIDL_FILES)
 
 IDL_FILES_PY=$(IDL_FILES:%.idl=%_idl.py)
 
@@ -44,7 +52,15 @@ dist_salomeidl_DATA = $(IDL_FILES)
 lib_LTLIBRARIES = libSalomeIDLMED.la libSalomeIDLMEDTests.la
 
 # Sources built from idl files
-BASEIDL_SOURCES = MEDSK.cc MED_GenSK.cc MEDCouplingCorbaServantSK.cc Compo1PySK.cc ParaMEDCouplingCorbaServantSK.cc
+BASEIDL_SOURCES = \
+	MEDCouplingCorbaServantSK.cc        \
+	ParaMEDCouplingCorbaServantSK.cc
+
+MEDOPIDL_SOURCES =            \
+	MEDDataManagerSK.cc   \
+	MEDCalculatorSK.cc    \
+	MEDEventListenerSK.cc \
+	MEDOPFactorySK.cc
 
 MPIIDL_SOURCES = ParaMEDMEMComponentSK.cc
 
@@ -52,15 +68,26 @@ IDL_SOURCES = $(BASEIDL_SOURCES)
 if MPI_IS_OK
   IDL_SOURCES += $(MPIIDL_SOURCES)
 endif
+IDL_SOURCES += $(MEDOPIDL_SOURCES)
 
 nodist_libSalomeIDLMED_la_SOURCES = $(IDL_SOURCES)
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS = MED.hh MED_Gen.hh MEDCouplingCorbaServant.hh Compo1Py.hh MEDCouplingCorbaServantTest.hh ParaMEDCouplingCorbaServant.hh
+nodist_salomeinclude_HEADERS =         \
+	MEDCouplingCorbaServant.hh     \
+	MEDCouplingCorbaServantTest.hh \
+	ParaMEDCouplingCorbaServant.hh
+
 if MPI_IS_OK
   nodist_salomeinclude_HEADERS += ParaMEDMEMComponent.hh
 endif
 
+nodist_salomeinclude_HEADERS += \
+	MEDDataManager.hh       \
+	MEDCalculator.hh        \
+	MEDEventListener.hh     \
+	MEDOPFactory.hh
+
 libSalomeIDLMED_la_CPPFLAGS =			\
 	-I$(top_builddir)/idl			\
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
@@ -78,33 +105,14 @@ OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERN
 IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
 
-MEDSK.cc : MED.idl
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-MED.hh : MEDSK.cc
+SUFFIXES = .idl .hh SK.cc
 
-MED_GenSK.cc : MED_Gen.idl
+%SK.cc %.hh : %.idl
 	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-MED_Gen.hh : MED_GenSK.cc
 
-ParaMEDMEMComponentSK.cc : ParaMEDMEMComponent.idl
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-ParaMEDMEMComponent.hh : ParaMEDMEMComponentSK.cc
-
-MEDCouplingCorbaServantSK.cc : MEDCouplingCorbaServant.idl
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-MEDCouplingCorbaServant.hh : MEDCouplingCorbaServantSK.cc
-
-ParaMEDCouplingCorbaServantSK.cc : ParaMEDCouplingCorbaServant.idl
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-ParaMEDCouplingCorbaServant.hh : ParaMEDCouplingCorbaServantSK.cc
-
-Compo1PySK.cc : Compo1Py.idl
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-Compo1Py.hh : Compo1PySK.cc
-
-MEDCouplingCorbaServantTestSK.cc : MEDCouplingCorbaServantTest.idl
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-MEDCouplingCorbaServantTest.hh : MEDCouplingCorbaServantTestSK.cc
+# MEDSK.cc : MED.idl
+#	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+# MED.hh : MEDSK.cc
 
 install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%)
 	$(INSTALL) -d  $(DESTDIR)$(salomepythondir)
@@ -114,7 +122,7 @@ install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%)
 
 # we want to remove only staff generated for IDL files and nothing more
 uninstall-local:
-	@for modulen in SALOME_MED SALOME_TEST Compo1Py_ORB ; do \
+	@for modulen in SALOME_MED SALOME_TEST Compo1Py_ORB MEDOP ; do \
 	  test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \
 	  test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \
 	done ; \