Update version number: 3.1.0a2

[modules/med.git] / idl / Makefile.in

diff --git a/idl/Makefile.in b/idl/Makefile.in
index a537ada6f1c30cf522f1800e5c189888bdaa36aa..076128e90985c87f99a8b703f2174066721f4265 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -6,38 +6,26 @@
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome
+VPATH=.:${KERNEL_ROOT_DIR}/idl/salome
 
 @COMMENCE@
 
 IDL_FILES = \
-  SALOME_Exception.idl \
-  SALOME_ModuleCatalog.idl \
-  SALOME_DataTypeCatalog.idl \
-  SALOME_RessourcesCatalog.idl \
-  SALOMEDS.idl \
-  SALOMEDS_Attributes.idl \
-  SALOME_Session.idl \
-  SALOME_Component.idl \
-  SALOME_TestComponent.idl \
-  SALOME_Registry.idl \
   MED.idl \
-  Med_Gen.idl \
-  Logger.idl
-#  SMESH_Mesh.idl \
-#  SMESH_Hypothesis.idl \
-#  SMESH_BasicHypothesis.idl \
-#  GEOM_Shape.idl \
-#  VISU_Gen.idl
+  MED_Gen.idl \
+  Compo1Py.idl
 
 PY_CLIENT_IDL = $(IDL_FILES)
 
 # we copy all idl file in $(top_builddir)/idl
-#inc: $(IDL_FILES:%=$(top_builddir)/idl/%)
+inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
 
-#$(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:%
+$(top_builddir)/idl/salome:
+       mkdir $@
+
+$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 #      $(CP) $< $@
-#      cp -f $< $@
+       cp -f $^ $(top_builddir)/idl/salome
 
 
 lib: pyidl
@@ -49,7 +37,7 @@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
 $(PYTHON_BUILD_SITE):
        $(INSTALL) -d  $@
 
-$(PYTHON_BUILD_SITE)/%_idl.py: %.idl
+$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl
        $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $<
 
 
@@ -57,12 +45,12 @@ $(PYTHON_BUILD_SITE)/%_idl.py: %.idl
 install: install-pyidl install-idl
 
 # create directory $(idldir) and copy idl files into it
-install-idl: $(IDL_FILES)
+install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
        $(INSTALL) -d  $(idldir)
        $(INSTALL_DATA) $^ $(idldir)
 
 
-install-pyidl: $(IDL_FILES)
+install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
        $(INSTALL) -d  $(PYTHON_SITE_INSTALL)
        @for file in $^ dummy; do \
          if [ $$file != "dummy" ]; then \
@@ -77,6 +65,6 @@ cleandep:
 
 distclean:
        -$(RM) *.py
-       -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%)
+       -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
        -$(RM) Makefile