*** empty log message ***

diff --git a/Makefile.in b/Makefile.in
index 3be0edfa127fa79da3de0288fd639b4a92009aa2..01871d04a5f767016638a4e90a64f5ea6b5436f0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = idl src salome_adm
+SUBDIRS = idl src
 
 RESOURCES_FILES = \
 Med_en.xml \

diff --git a/configure.in.base b/configure.in.base
index 07acc004c1d33a02d3bd3d68117ede060b34663c..a688b3347512216159f4fd81bb39cae9318598d9 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -191,7 +191,7 @@ CHECK_CORBA
 
 AC_SUBST_FILE(CORBA)
 corba=make_$ORB
-CORBA=${KERNEL_ROOT_DIR}/salome_adm/unix/$corba
+CORBA=salome_adm/unix/$corba
 
 echo
 echo ---------------------------------------------
@@ -270,12 +270,12 @@ echo
 
 dnl generals files which could be included in every makefile
 
-AC_SUBST_FILE(COMMENCE) COMMENCE=${KERNEL_ROOT_DIR}/salome_adm/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=${KERNEL_ROOT_DIR}/salome_adm/unix/make_conclude
-AC_SUBST_FILE(MODULE) MODULE=${KERNEL_ROOT_DIR}/salome_adm/unix/make_module
+AC_SUBST_FILE(COMMENCE) COMMENCE=salome_adm/unix/make_commence
+AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude
+AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
 
 dnl les dependences
-AC_SUBST_FILE(DEPEND) DEPEND=${KERNEL_ROOT_DIR}/salome_adm/unix/depend
+AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend
 
 dnl We don t need to say when we re entering directories if we re using
 dnl GNU make becuase make does it for us.
@@ -331,7 +331,7 @@ do
 done
 cd $ROOT_BUILDDIR
 
-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=${KERNEL_ROOT_DIR}/salome_adm/unix/envScript
+AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript
 
 dnl copy xml files to the build tree (lib directory)
 dnl pourquoi ????

diff --git a/idl/Makefile.in b/idl/Makefile.in
new file mode 100644 (file)
index 0000000..740d13d
--- /dev/null
+++ b/idl/Makefile.in
@@ -0,0 +1,66 @@
+#
+# generate dependencies for idl file :
+#
+
+# source path
+top_srcdir=@top_srcdir@
+top_builddir=..
+srcdir=@srcdir@
+VPATH=.:$(srcdir)
+
+@COMMENCE@
+
+IDL_FILES = \
+  SALOME_Component.idl \
+  MED.idl
+
+PY_CLIENT_IDL = $(IDL_FILES)
+
+# we copy all idl file in $(top_builddir)/idl
+inc: $(IDL_FILES:%=$(top_builddir)/idl/%)
+
+$(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:%
+#      $(CP) $< $@
+       cp -f $< $@
+
+
+lib: pyidl
+
+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
+       $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $<
+
+
+# install python client (generated from idl file
+install: install-pyidl install-idl
+
+# create directory $(idldir) and copy idl files into it
+install-idl: $(IDL_FILES)
+       $(INSTALL) -d  $(idldir)
+       $(INSTALL_DATA) $^ $(idldir)
+
+
+install-pyidl: $(IDL_FILES)
+       $(INSTALL) -d  $(PYTHON_SITE_INSTALL)
+       @for file in $^ dummy; do \
+         if [ $$file != "dummy" ]; then \
+           $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \
+         fi ; \
+       done ;
+
+#@ CONCLUDE @
+
+cleandep:
+       -$(RM) .dep*
+
+distclean:
+       -$(RM) *.py
+       -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%)
+       -$(RM) Makefile
+

diff --git a/src/MED/Makefile.in b/src/MED/Makefile.in
index 104720330a7efe27da057294b836896852baf306..3f1eb798f72817ba81dba3f0ea8d8a51eb86c63d 100644 (file)
--- a/src/MED/Makefile.in
+++ b/src/MED/Makefile.in
@@ -9,7 +9,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:$(srcdir):$(top_builddir)/share/salome/idl
 

diff --git a/src/MEDGUI/Makefile.in b/src/MEDGUI/Makefile.in
index c3af1f19fd7d634bd7150e90b6d41cda3dd0976a..cfc87914968158a863b85a8110b1a027e220aa19 100644 (file)
--- a/src/MEDGUI/Makefile.in
+++ b/src/MEDGUI/Makefile.in
@@ -9,7 +9,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:$(srcdir):$(top_builddir)/share/salome/idl
 

diff --git a/src/MEDMEM/Makefile.in b/src/MEDMEM/Makefile.in
index c6b84371cda1e7df6cb0a8f1f9275157421640ea..a16ca41d5c5d21d4432a104c5a86b03b64c78249 100644 (file)
--- a/src/MEDMEM/Makefile.in
+++ b/src/MEDMEM/Makefile.in
@@ -6,7 +6,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:$(srcdir)
 

diff --git a/src/MEDMEM_SWIG/Makefile.in b/src/MEDMEM_SWIG/Makefile.in
index f63f66dd0c7a5592a38a80a1644007f900da69c2..3fb8b16a0ada3cf93bda62f7507cd5a4cb0bdb32 100644 (file)
--- a/src/MEDMEM_SWIG/Makefile.in
+++ b/src/MEDMEM_SWIG/Makefile.in
@@ -6,7 +6,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:$(srcdir)
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 177d2d10278c7b211296b324e528cd43484db69a..524007f868c9345c8ab27d34f5fde83aa0bad403 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -9,7 +9,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../..
+top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
 

diff --git a/src/MedCorba_Swig/Makefile.in b/src/MedCorba_Swig/Makefile.in
index 981b2377f6e07b35de20b9e45eea4e287b747576..a33f0e2ed1f0edf0b21d66654f0fe40fd9b97211 100644 (file)
--- a/src/MedCorba_Swig/Makefile.in
+++ b/src/MedCorba_Swig/Makefile.in
@@ -6,7 +6,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:$(srcdir):$(top_srcdir)/idl
 

diff --git a/src/MedMem/Makefile.in b/src/MedMem/Makefile.in
index c0a9b3400c976b2d9f3de373fc303fa443a1a297..ce962e89eebd46d36fe4bed881c8fc10fa877f93 100644 (file)
--- a/src/MedMem/Makefile.in
+++ b/src/MedMem/Makefile.in
@@ -7,7 +7,7 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl