X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=idl%2FMakefile.in;h=8bc4e84d31ef6d0ece2d528311afd997ef14b85c;hp=12dba157837b560b03b805caa8f150aa79b56a7b;hb=5c933ecde0251d3c4894d0cdeab8dc67b6c4c3a5;hpb=8e1647dd2f56cfd57d8bea43943b664ee9f55b90

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 12dba1578..8bc4e84d3 100644
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -6,33 +6,30 @@
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
+VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
 
 @COMMENCE@
 
 IDL_FILES = \
-  SALOME_Component.idl \
-  SALOMEDS.idl \
-  SALOMEDS_Attributes.idl \
-  SALOME_Exception.idl \
-  Logger.idl \
-  SALOME_ModuleCatalog.idl \
-  MED.idl \
-  GEOM_Shape.idl \
-  GEOM_Gen.idl \
   SMESH_Gen.idl \
   SMESH_Mesh.idl \
   SMESH_Hypothesis.idl \
-  SMESH_BasicHypothesis.idl
+  SMESH_BasicHypothesis.idl \
+  SMESH_Filter.idl \
+  SMESH_Group.idl \
+  SMESH_Pattern.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
@@ -44,7 +41,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) $<
 
 
@@ -52,12 +49,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 \
@@ -72,6 +69,6 @@ cleandep:
 
 distclean:
 	-$(RM) *.py
-	-$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%)
+	-$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
 	-$(RM) Makefile