X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Funix%2Fmake_commence.in;fp=adm_local%2Funix%2Fmake_commence.in;h=95af6a6502ad9720124e2d1b42f1234925dc54ab;hb=528c0ae5392c922ca6e0f981ab9ff032f49f92c2;hp=43dfcdd8ddb00628af1d1438266222ab45ffa6e6;hpb=6fb56d23ef3738a67406871eb2b8bbb871bb2bcc;p=modules%2Ffilter.git

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 43dfcdd..95af6a6 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -152,7 +152,7 @@ OMNIORB_CXXFLAGS    = @OMNIORB_CXXFLAGS@
 
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl -I$(KERNEL_ROOT_DIR)/idl/salome
+OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
 
 OMNIORB_IDL_CLN_H   = @OMNIORB_IDL_CLN_H@
 OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
@@ -169,7 +169,7 @@ CORBA_INCLUDES    = @CORBA_INCLUDES@
 CORBA_LIBS        = @CORBA_LIBS@
 CORBA_CXXFLAGS    = @CORBA_CXXFLAGS@
 
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl
 IDLPYFLAGS  = @IDLPYFLAGS@
 
 IDL = @IDL@
@@ -182,12 +182,12 @@ IDL_SRV_H   = @IDL_SRV_H@
 IDL_SRV_CXX = @IDL_SRV_CXX@
 IDL_SRV_OBJ = @IDL_SRV_OBJ@
 
-  CPPFLAGS+= $(CORBA_INCLUDES) 
-  CXXFLAGS+= $(CORBA_CXXFLAGS)
+CPPFLAGS+= $(CORBA_INCLUDES) 
+CXXFLAGS+= $(CORBA_CXXFLAGS)
 
-  # add corba libs when link salome application ! 
-  #LDFLAGS+= $(CORBA_LIBS)
-  LIBS+=$(CORBA_LIBS)
+# add corba libs when link salome application ! 
+#LDFLAGS+= $(CORBA_LIBS)
+LIBS+=$(CORBA_LIBS)
 
 DOXYGEN = @DOXYGEN@
 DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
@@ -295,19 +295,24 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
 
 
 ACLOCAL_SRC = \
-ac_cxx_bool.m4                    check_corba.m4                        \
-ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4	\
-ac_cxx_mutable.m4                 check_mico.m4      libtool.m4		\
-ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4		\
-ac_cxx_partial_specialization.m4  python.m4                             \
-ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4	\
-ac_cc_warnings.m4                 check_swig.m4      check_qt.m4 
+check_corba.m4                  ac_cxx_depend_flag.m4           check_hdf5.m4     \
+enable_pthreads.m4		ac_cxx_namespaces.m4 		check_omniorb.m4  \
+pyembed.m4			python.m4			check_cas.m4	  \
+check_swig.m4
+
+ACLOCAL_SRC_DEPR = \
+ac_cxx_bool.m4                  ac_cxx_mutable.m4   	ac_cxx_partial_specialization.m4 \
+check_mico.m4                   libtool.m4	     	ac_cxx_typename.m4               \
+check_pthreads.m4               ac_cc_warnings.m4
 
 ACLOCAL_GUI = \
-check_vtk.m4	                  check_opengl.m4       \
+check_vtk.m4	                  check_opengl.m4       check_qt.m4 \
 check_GUI.m4	                  check_corba_in_GUI.m4
 
 $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+                          $(ACLOCAL_SRC_DEPR:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED/%) \
                           $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
-	cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
-                                                                  -I @GUI_ROOT_DIR@/adm_local/unix/config_files
+	cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files \
+                                   -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+                                   -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED \
+                                   -I @GUI_ROOT_DIR@/adm_local/unix/config_files