Porting to Mandrake 10.1 and new products:

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

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 2615b1f63de3bc2c317e9ccf86e1a7c450e976b4..40542236a397809ec23585c5484278f36033d79e 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -6,12 +6,13 @@
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
-VPATH=.:$(srcdir)
+VPATH=.
 
 @COMMENCE@
 
 IDL_FILES = \
   SALOME_Exception.idl \
+  SALOME_Comm.idl \
   SALOME_ModuleCatalog.idl \
   SALOME_DataTypeCatalog.idl \
   SALOME_RessourcesCatalog.idl \
@@ -19,22 +20,26 @@ IDL_FILES = \
   SALOMEDS_Attributes.idl \
   SALOME_Session.idl \
   SALOME_Component.idl \
+  SALOME_ContainerManager.idl \
   SALOME_TestComponent.idl \
   SALOME_Registry.idl \
   SALOME_MPIObject.idl \
   SALOME_MPIContainer.idl \
-  SALOME_TestMPIComponent.idl \
   Logger.idl \
-  SALOME_GenericObj.idl
+  SALOME_GenericObj.idl \
+  SALOME_TestModuleCatalog.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 -p $@
+
+$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 #      $(CP) $< $@
-       cp -f $< $@
+       cp -f $^ $(top_builddir)/idl/salome
 
 
 lib: pyidl
@@ -46,20 +51,20 @@ 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) $<
 
 
 # install python client (generated from idl file
-install: install-pyidl install-idl
+install: $(top_builddir)/idl/salome 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)
-       cp -p $^ $(idldir)
+       cp -p -f $^ $(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 \
@@ -74,6 +79,6 @@ cleandep:
 
 distclean:
        -$(RM) *.py
-       -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%)
+       -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
        -$(RM) Makefile