From cd7c01605d2ace20b8d379fc10124826a0095437 Mon Sep 17 00:00:00 2001 From: boulant Date: Mon, 6 Feb 2006 14:49:43 +0000 Subject: [PATCH] =?utf8?q?Modifications=20pour=20gestion=20des=20fichiers?= =?utf8?q?=20obsol=C3=A8tes=20de=20salome=5Fadm?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- configure.ac | 5 ----- salome_adm/unix/{ => DEPRECATED}/depend.in | 0 salome_adm/unix/{ => DEPRECATED}/make_commence.in | 0 salome_adm/unix/{ => DEPRECATED}/make_conclude.in | 2 +- salome_adm/unix/{ => DEPRECATED}/make_module.in | 0 salome_adm/unix/{ => DEPRECATED}/make_omniorb.in | 0 salome_adm/unix/Makefile.am | 14 ++++++++------ 7 files changed, 9 insertions(+), 12 deletions(-) rename salome_adm/unix/{ => DEPRECATED}/depend.in (100%) rename salome_adm/unix/{ => DEPRECATED}/make_commence.in (100%) rename salome_adm/unix/{ => DEPRECATED}/make_conclude.in (99%) rename salome_adm/unix/{ => DEPRECATED}/make_module.in (100%) rename salome_adm/unix/{ => DEPRECATED}/make_omniorb.in (100%) diff --git a/configure.ac b/configure.ac index 62eb70683..9c11c6b44 100644 --- a/configure.ac +++ b/configure.ac @@ -400,11 +400,6 @@ AC_OUTPUT_COMMANDS([ \ # This could be helpfull to update de configuration. AC_OUTPUT([ \ ./salome_adm/unix/SALOMEconfig.h \ - ./salome_adm/unix/depend \ - ./salome_adm/unix/make_omniorb \ - ./salome_adm/unix/make_commence \ - ./salome_adm/unix/make_conclude \ - ./salome_adm/unix/make_module \ ./salome_adm/Makefile \ ./salome_adm/unix/Makefile \ ./salome_adm/unix/config_files/Makefile \ diff --git a/salome_adm/unix/depend.in b/salome_adm/unix/DEPRECATED/depend.in similarity index 100% rename from salome_adm/unix/depend.in rename to salome_adm/unix/DEPRECATED/depend.in diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/DEPRECATED/make_commence.in similarity index 100% rename from salome_adm/unix/make_commence.in rename to salome_adm/unix/DEPRECATED/make_commence.in diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/DEPRECATED/make_conclude.in similarity index 99% rename from salome_adm/unix/make_conclude.in rename to salome_adm/unix/DEPRECATED/make_conclude.in index adce12a21..ee4ec67a1 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/DEPRECATED/make_conclude.in @@ -11,7 +11,7 @@ # # ORB Specifics rules -@CORBA@ +@CORBA_RULES@ # transform idl reference in appropriate obj file LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) diff --git a/salome_adm/unix/make_module.in b/salome_adm/unix/DEPRECATED/make_module.in similarity index 100% rename from salome_adm/unix/make_module.in rename to salome_adm/unix/DEPRECATED/make_module.in diff --git a/salome_adm/unix/make_omniorb.in b/salome_adm/unix/DEPRECATED/make_omniorb.in similarity index 100% rename from salome_adm/unix/make_omniorb.in rename to salome_adm/unix/DEPRECATED/make_omniorb.in diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am index 836b487ee..c918f9394 100644 --- a/salome_adm/unix/Makefile.am +++ b/salome_adm/unix/Makefile.am @@ -6,14 +6,16 @@ SUBDIRS = config_files DEPRECATED_FILES=\ DEPRECATED/F77config.h.in \ DEPRECATED/sstream.in \ - DEPRECATED/envScript.in + DEPRECATED/envScript.in \ + DEPRECATED/depend.in \ + DEPRECATED/make_commence.in \ + DEPRECATED/make_conclude.in \ + DEPRECATED/make_module.in \ + DEPRECATED/make_omniorb.in +# The deprecated files are deprecated for the KERNEL but not for the +# related modules (GUI, MED, ...), for now. Some files have to be installed. salomeadmux_DATA=\ SALOMEconfig.h.in \ - depend.in \ - make_commence.in \ - make_conclude.in \ - make_module.in \ - make_omniorb.in \ pythonbe.py \ $(DEPRECATED_FILES) -- 2.39.2