Modifs apportées dans le build_configure et le configure.in.base du module MED.

diff --git a/Makefile.in b/Makefile.in
index e62a3b9141b56960107d350503e6be49221798d4..d7c597dbd67a7dfeaa0e9555ef232afce317d41d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,13 +9,13 @@
 
 # source path
 top_srcdir=@top_srcdir@
-top_builddir=..
+top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@srcdir@/resources:@srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/resources:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = src
+SUBDIRS = idl src
 
 MODULE = MED
 
@@ -26,4 +26,62 @@ Infos.png \
 Structure.png \
 ModuleMed.png
 
+# copy header files in common directory
+ifeq ($(HAVE_SSTREAM),yes)
+  include_list=include/salome/SALOMEconfig.h
+else
+  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+endif
+
+inc: idl $(include_list)
+
+include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h
+       -$(RM) $@
+       $(LN_S) ../$< $@
+
+include/salome/sstream: salome_adm/unix/sstream
+       -$(RM) $@
+       $(LN_S) ../$< $@
+
+depend: depend_idl
+
+depend_idl:
+       (cd idl ; $(MAKE) $@) || exit 1
+
+# doc is already build : if you want to had documents, go manually to doc and run 'make doc'
+#doc:
+#      (cd doc && $(MAKE) $@) || exit 1
+
+install-end:
+# finish libtool install
+#      @$(LT) --mode=finish $(libdir)
+
+install-include: $(include_list)
+       $(INSTALL) -d  $(includedir)
+       @for f in X $(include_list); do                         \
+          if test $$f != X; then                               \
+            ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);   \
+          fi;                                                  \
+       done
+
+# install script in $(bindir) :
+install-bin: $(BIN_SCRIPT)
+       $(INSTALL) -d  $(bindir)
+       $(INSTALL_PROGRAM) $^ $(bindir)
+
+uninstall: uninstall-idl
+
+uninstall-idl:
+       $(RM) $(idldir)/*.idl
+
+distclean: distclean-other
+
+distclean-other:
+       -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old
+       -$(RM) salome_adm/unix/make_* 
+       -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h 
+       -$(RM) config.cache config.log config.status 
+
 @MODULE@
+
+install: install-bin install-include install-end

diff --git a/build_configure b/build_configure
index 0b64f0aef949778271984b650698a88a4795511a..c3a9d45f1a786f5113663bed66d084438ea69777 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -97,6 +97,9 @@ then
 fi
 chmod u-w configure.in.base 
 
+# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
+echo "" >> configure.in_tmp1
+echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
@@ -107,15 +110,15 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
 # put them "manually"
 #
 
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/F77config.h \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/sstream \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/depend \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/make_omniorb \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/make_commence \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/make_conclude \\" >> configure.in_tmp1
-echo " ${KERNEL_ROOT_DIR}/salome_adm/unix/make_module \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/make_omniorb \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/make_commence \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2
@@ -125,6 +128,10 @@ sed '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
 sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
+
+# delete the link created for AC_OUTPUT
+echo "" >> configure.in_tmp1
+echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
 \mv configure.in_tmp1 configure.in_new
 \rm  -f configure.in_tmp2 configure.in_tmp3
 

diff --git a/configure.in.base b/configure.in.base
index 40f0031626f0039fbd8153cba25719c6a430292f..07acc004c1d33a02d3bd3d68117ede060b34663c 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -15,8 +15,8 @@
 # Created from configure.in.base
 #
 
-AC_INIT(SALOME)
-AC_CONFIG_AUX_DIR(adm/unix/config_files)
+AC_INIT(src)
+AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 
 PACKAGE=salome
@@ -82,7 +82,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${top_srcdir}'/adm/unix/config_files/install-sh
+      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
       ;;
 esac
 
@@ -191,7 +191,7 @@ CHECK_CORBA
 
 AC_SUBST_FILE(CORBA)
 corba=make_$ORB
-CORBA=adm/unix/$corba
+CORBA=${KERNEL_ROOT_DIR}/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=adm/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm/unix/make_conclude
-AC_SUBST_FILE(MODULE) MODULE=adm/unix/make_module
+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
 
 dnl les dependences
-AC_SUBST_FILE(DEPEND) DEPEND=adm/unix/depend
+AC_SUBST_FILE(DEPEND) DEPEND=${KERNEL_ROOT_DIR}/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.
@@ -286,7 +286,7 @@ else
 fi
 
 # make other build directories
-for rep in adm bin include lib share/salome/resources share/salome/idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
@@ -331,7 +331,7 @@ do
 done
 cd $ROOT_BUILDDIR
 
-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=adm/unix/envScript
+AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=${KERNEL_ROOT_DIR}/salome_adm/unix/envScript
 
 dnl copy xml files to the build tree (lib directory)
 dnl pourquoi ????
@@ -344,6 +344,7 @@ dnl pourquoi ????
 #done
 #cd $ROOT_BUILDDIR
 
+
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files