X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=idl%2FMakefile.in;h=c831f208166b2e2a2ba1fd2ff90ebf6bf1dbf21f;hb=a21fda490a81b051e2a01a582d55677868a63a0f;hp=f57f60396c0bd11828eea574b5f9944bac0af160;hpb=c46f174ce52809de76f2a22795db89d229aedc7e;p=modules%2Fsuperv.git

diff --git a/idl/Makefile.in b/idl/Makefile.in
index f57f603..c831f20 100644
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -17,75 +17,44 @@
 # 
 #  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
 #
+
 #
 #
 #  File   : Makefile.in
 #  Module : idl
-
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
-VPATH=.:$(srcdir)
+VPATH=.:${KERNEL_ROOT_DIR}/idl/salome
 
 @COMMENCE@
 
 IDL_FILES = \
-  GEOM_Gen.idl \
-  SALOME_Exception.idl \
-  SALOME_ModuleCatalog.idl \
-  SALOME_DataTypeCatalog.idl \
-  SALOME_RessourcesCatalog.idl \
-  GEOM_Shape.idl \
-  SALOMEDS.idl \
-  SALOMEDS_Attributes.idl \
-  SALOME_Session.idl \
-  SALOME_Component.idl \
-  SALOME_TestComponent.idl \
-  SUPERV.idl \
-  SALOME_Registry.idl \
-  MED.idl \
-  Med_Gen.idl \
-  AddComponent.idl \
-  DivComponent.idl \
-  FactorialComponent.idl \
-  MulComponent.idl \
-  SubComponent.idl \
-  SyrComponent.idl \
-  SyrControlComponent.idl \
-  TypeData.idl \
-  MPIObject.idl \
-  MPIContainer.idl \
-  NPVecComponent.idl \
-  NPMatComponent.idl \
-  NPSolveComponent.idl \
-  SMESH_Gen.idl \
-  SMESH_Mesh.idl \
-  SMESH_Hypothesis.idl \
-  SMESH_BasicHypothesis.idl \
-  Calculator.idl \
-  Logger.idl \
-  VISU_Gen.idl
+  SUPERV.idl
 
 PY_CLIENT_IDL = $(IDL_FILES)
 
-# we copy all idl file in $(top_builddir)/share/salome/idl
-inc: $(IDL_FILES:%=$(top_builddir)/share/salome/idl/%)
+# we copy all idl file in $(top_builddir)/idl
+inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
+
+$(top_builddir)/idl/salome:
+	mkdir $@
 
-$(IDL_FILES:%=$(top_builddir)/share/salome/idl/%):$(top_builddir)/share/salome/idl/%:%
+$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 #	$(CP) $< $@
-	cp -f $< $@
+	cp -f $^ $(top_builddir)/idl/salome
 
 
 lib: pyidl
 
-PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/salome
+PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
 
 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) $<
 
 
@@ -93,12 +62,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 \
@@ -113,6 +82,6 @@ cleandep:
 
 distclean:
 	-$(RM) *.py
-	-$(RM) $(IDL_FILES:%=$(top_builddir)/share/salome/idl/%)
+	-$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
 	-$(RM) Makefile