From: prascle <prascle>
Date: Mon, 22 May 2006 16:07:01 +0000 (+0000)
Subject: BUG 12461: avoid unnecessary recompilations after build_configure
X-Git-Tag: V3_2_0rc~20
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e8b83d35722c086717afdb4d4b8d5ba2df525b66;p=modules%2Fkernel.git

BUG 12461: avoid unnecessary recompilations after build_configure
---

diff --git a/Makefile.am b/Makefile.am
index e8f17aa00..db9dfa137 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,9 @@ if CORBA_GEN
   IDLDIR = idl
 endif
 
-SUBDIRS = $(IDLDIR) src doc salome_adm bin resources
+SUBDIRS = $(IDLDIR) salome_adm src doc bin resources
 
-DIST_SUBDIRS=   idl src doc salome_adm bin resources
+DIST_SUBDIRS=   idl salome_adm src doc bin resources
 
 DISTCLEANFILES = a.out
 
diff --git a/clean_configure b/clean_configure
index a0073fb98..de52cd1e0 100755
--- a/clean_configure
+++ b/clean_configure
@@ -13,6 +13,7 @@ cd $libdir
 rm -f config.guess config.sub ltmain.sh
 # Files created by automake
 rm -rf install-sh missing compile depcomp py-compile
+rm -f salome_adm/unix/SALOMEconfig.ref.in
 cd $here
 find bin -name Makefile.in | xargs rm -f
 find doc -name Makefile.in | xargs rm -f
diff --git a/configure.ac b/configure.ac
index 5b0d9407f..2ef5fa0c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [3.1.0], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project], [3.2.0], [gboulant@CS], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.1.0
+VERSION=3.2.0
 AC_SUBST(VERSION)
 
 
@@ -484,7 +484,7 @@ AC_OUTPUT_COMMANDS([ \
 # autoscan, the Makefile list is generated in the output file configure.scan.
 # This could be helpfull to update de configuration.
 AC_OUTPUT([ \
-	./salome_adm/unix/SALOMEconfig.h \
+	./salome_adm/unix/SALOMEconfig.ref \
 	./salome_adm/Makefile \
 	./salome_adm/unix/Makefile \
 	./salome_adm/unix/config_files/Makefile \
diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am
index b1f868738..a7b1f6506 100644
--- a/salome_adm/unix/Makefile.am
+++ b/salome_adm/unix/Makefile.am
@@ -13,9 +13,22 @@ DEPRECATED_FILES=\
 	DEPRECATED/make_module.in \
 	DEPRECATED/make_omniorb.in
 
+# rules for install and build (see make_common_starter.am)
+salomeadmux_DATA = SALOMEconfig.h
+BUILT_SOURCES=SALOMEconfig.h
+
+# test if SALOMEconfig.ref has changed (contents), at build time
+SALOMEconfig.h: $(top_builddir)/salome_adm/unix/SALOMEconfig.ref
+	@if ! [ -a $@ ]; then \
+	  cp -p $< $@;        \
+	fi;		      \
+	if ! cmp $< $@; then  \
+	  cp -p $< $@;        \
+	fi;
+
 # The deprecated files are deprecated for the KERNEL but not for the
 # related modules (GUI, MED, ...), for now. Some files have to be installed.
 dist_salomeadmux_DATA=\
-	SALOMEconfig.h.in \
+	SALOMEconfig.h \
 	pythonbe.py \
 	$(DEPRECATED_FILES)