CCAR: update from dev branch

diff --git a/bin/waitNS.sh b/bin/waitNS.sh
index 603977956ac5591feb0c40f55b923d7133db1667..3d875f99274b44257fa59bc2553d2a4c1b288e24 100755 (executable)
--- a/bin/waitNS.sh
+++ b/bin/waitNS.sh
@@ -6,12 +6,4 @@ while [ $status -ne 0 ]; do
   sleep 1
   echo -n "#"
 done
-portNumber=`grep InitRef $HOME/$APPLI/.omniORB_last.cfg | grep -v grep | awk 'BEGIN{FS=":"}{print $NF}'`
-status=1
-while [ $status -ne 0 ]; do
-  ps -efw | grep $USER | grep omniNames | grep -v grep | grep $portNumber
-  status=$?
-  sleep 1
-  echo -n "="
-done
 ./runSession waitNS.py
\ No newline at end of file

diff --git a/idl/Makefile.am b/idl/Makefile.am
index c55c4715b4fb47256eaa59e3e50ac1adaa6c6e84..b6a3f3d0b93ca03940a985971dbeb8aafd6c5768 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -26,9 +26,6 @@
 
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
-# To avoid problems with parallel compilation.
-MAKEFLAGS = -j1
-
 AM_CXXFLAGS = -fPIC
 
 BASEIDL_FILES = \
@@ -120,6 +117,8 @@ endif
 
 IDL_SOURCES += $(DYNIDL_SOURCES)
 
+$(DYNIDL_SOURCES) : $(IDL_SOURCES)
+
 # also install all generated headers to use result library from another modules
 salomeinclude_DATA= $(STATIDL_SOURCES:%SK.cc=%.hh)