Build dependecies for exe and class h, hpp, html, xtthelp-files. pwre modifications

abb/doc/orm/src/os_templ/hw_templ/makefile

@@ -59,21 +59,24 @@ $(doc_dir)/en_us/orm/%.html : ../../%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_gif)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
-copy : $(export_gif) $(export_html)
+copy : $(export_gif) $(export_html) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 
 clean :
 
 realclean : clean $(clean_gif) $(clean_html) $(clean_c)
 
+silent :
+	@ :
+
 $(clean_gif) : clean_%.gif : %.gif
 	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
 

bcomp/doc/orm/src/os_templ/hw_templ/makefile

@@ -77,21 +77,24 @@ $(doc_dir)/en_us/orm/%.html : ../../%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_gif) $(clean_png)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
-copy : $(export_gif) $(export_png) $(export_html)
+copy : $(export_gif) $(export_png) $(export_html) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 
 clean :
 
 realclean : clean $(clean_gif)  $(clean_png) $(clean_html) $(clean_c)
 
+silent :
+	@ :
+
 $(clean_gif) : clean_%.gif : %.gif
 	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
 

java/aapp/res/src/os_templ/hw_templ/makefile

@@ -139,12 +139,17 @@ dirs : $(app_res_dir)$(dir_ext) \
 	$(app_res_dir)/menu$(dir_ext) \
 	$(app_res_dir)/values$(dir_ext) \
 	$(app_res_dir)/values-v11$(dir_ext) \
-	$(app_res_dir)/values-v14$(dir_ext)
+	$(app_res_dir)/values-v14$(dir_ext) \
+	| silent
 
 copy: $(res_drawable_objects) $(res_drawable_hdpi_objects) $(res_drawable_ldpi_objects) \
 	$(res_drawable_mdpi_objects) $(res_drawable_xhdpi_objects) $(res_layout_objects) \
 	$(res_menu_objects) $(res_values_objects) $(res_values_v11_objects) \
-	$(res_values_v14_objects)
+	$(res_values_v14_objects) \
+	| silent
+
+silent :
+	@ :
 
 $(app_res_dir)$(dir_ext) :
 	@ echo "Create directory " $(app_res_dir)$(dir_ext)

java/aapp/rt/src/os_templ/hw_templ/makefile

@@ -51,9 +51,12 @@ endif
 local_objects := \
 	$(app_package_dir)/$(comp_name)/Gdh.java
 
-copy: $(objects) $(local_objects)
+copy: $(objects) $(local_objects) | silent
 
-dirs : $(app_package_dir)/$(comp_name)$(dir_ext)
+dirs : $(app_package_dir)/$(comp_name)$(dir_ext) | silent
+ 
+silent :
+	@ :
 
 $(app_package_dir)/$(comp_name)$(dir_ext) :
 	@ echo "Create directory " $(app_package_dir)/$(comp_name)$(dir_ext)

java/exe/jpwr_rt_gdh/src/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
+exe_ext = .so
+pre_so = lib
 
 link =	$(ldxx) -shared -DHW_X86 -DOS_LINUX \
 	-L${pwr_elib} \

nmps/wbl/nmps/src/os_templ/hw_templ/makefile

@@ -27,23 +27,28 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init :
+init : silent
 
 copy : $(inc_dir)/pwr_nmpsclasses.h \
-       $(inc_dir)/pwr_nmpsclasses.hpp
+       $(inc_dir)/pwr_nmpsclasses.hpp \
+       | silent
 
-lib  : $(load_dir)/nmps.dbs
+lib  : $(load_dir)/nmps.dbs | silent
 
 exe : $(doc_dir)/en_us/orm/nmps_allclasses.html \
       $(exe_dir)/en_us/nmps_xtthelp.dat \
-      $(exe_dir)/sv_se/nmps_xtthelp.dat
+      $(exe_dir)/sv_se/nmps_xtthelp.dat \
+      | silent
 
 clean : 
 
 realclean : clean $(clean_wbl)
 
+silent :
+	@ :
+
 $(load_dir)/nmps.dbs :
 	@ echo "Generating loadfile for nmps"
 	@ export pwr_load=$(pwr_eload);\
@@ -52,15 +57,15 @@ $(load_dir)/nmps.dbs :
 
 $(inc_dir)/pwr_nmpsclasses.h :
 	@ echo "Generating struct files for nmps classes..."
-	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) -y $(release_root)/bld/$(type_name)/nmps.d_h_wbl "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(inc_dir)/pwr_nmpsclasses.hpp :
 	@ echo "Generating hpp files for nmps classes..."
-	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) -y $(release_root)/bld/$(type_name)/nmps.d_hpp_wbl "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(doc_dir)/en_us/orm/nmps_allclasses.html :
 	@ echo "Generating html files for nmps classes en_us..."
-	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(release_root)/bld/$(type_name)/nmps.d_html_wbl -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs en_us..."
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
@@ -81,17 +86,22 @@ $(doc_dir)/en_us/orm/nmps_allclasses.html :
 
 $(exe_dir)/en_us/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes en_us"
-	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us -y $(release_root)/bld/$(type_name)/nmps.d_en_us_xtthelp_wbl "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 $(exe_dir)/sv_se/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes sv_se"
-	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se -y $(release_root)/bld/$(type_name)/nmps.d_sv_se_xtthelp_wbl "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 clean_wbl :
 	@ if [ -e $(load_dir)/nmps.dbs ]; then \
 		$(rm) $(rmflags) $(load_dir)/nmps.dbs; \
 	  fi
 
+-include $(release_root)/bld/$(type_name)/nmps.d_h_wbl
+-include $(release_root)/bld/$(type_name)/nmps.d_hpp_wbl
+-include $(release_root)/bld/$(type_name)/nmps.d_html_wbl
+-include $(release_root)/bld/$(type_name)/nmps.d_en_us_xtthelp_wbl
+-include $(release_root)/bld/$(type_name)/nmps.d_sv_se_xtthelp_wbl
 
 
 

otherio/doc/orm/src/os_templ/hw_templ/makefile

@@ -77,21 +77,24 @@ $(doc_dir)/en_us/orm/%.html : ../../%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_gif) $(clean_png)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
-copy : $(export_gif) $(export_png) $(export_html)
+copy : $(export_gif) $(export_png) $(export_html) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 
 clean :
 
 realclean : clean $(clean_gif) $(clean_png) $(clean_html) $(clean_c)
 
+silent :
+	@ :
+
 $(clean_gif) : clean_%.gif : %.gif
 	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
 

otherio/exp/com/src/os_templ/hw_templ/makefile

@@ -46,20 +46,23 @@ clean_pwr_com := $(patsubst %.pwr_com, clean_%.pwr_com, $(pwr_com_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_sh)
 
-all : init copy
+all : init copy | silent
 
-init :
+init : silent
 
-copy : $(export_sh) $(export_pwr_com)
+copy : $(export_sh) $(export_pwr_com) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : clean $(clean_sh) $(clean_pwr_com)
 
+silent :
+	@ :
+
 $(export_sh) : $(exe_dir)/%.sh : %.sh
 	@ echo "Exporting $< ..."
 	@ $(cp) $(cpflags) $(source) $(target)

otherio/exp/rt/src/os_templ/hw_templ/makefile

@@ -19,20 +19,23 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_c)
 
-all : init copy lib
+all : init copy lib | silent
 
-init :
+init : silent
 
-copy : $(inc_dir)/libusbio.h $(inc_dir)/openSocket.h $(inc_dir)/setport.h $(inc_dir)/pwr_arduino_uno.ino
+copy : $(inc_dir)/libusbio.h $(inc_dir)/openSocket.h $(inc_dir)/setport.h $(inc_dir)/pwr_arduino_uno.ino | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : clean $(clean_obj) 
 
+silent :
+	@ :
+
 .SUFFIXES:
 
 #$(lib_dir)/libusbio.a : ../libusbio.a

otherio/exp/xdd/src/os_templ/hw_templ/makefile

@@ -34,20 +34,23 @@ clean_xdd := $(patsubst %.xdd, clean_%.xdd, $(xdd_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_xdd)
 
-all : init copy
+all : init copy | silent
 
-init :
+init : silent
 
-copy : $(export_xdd)
+copy : $(export_xdd) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : clean $(clean_xdd)
 
+silent :
+	@ :
+
 $(export_xdd) : $(exe_dir)/%.xdd : %.xdd
 	@ echo "Exporting $< ..."
 	@ $(cp) $(cpflags) $(source) $(target)

othermanu/doc/dsh/src/os_linux/hw_x86/makefile

@@ -88,22 +88,26 @@ $(doc_dir)/sv_se/dsh/%.html : $(pwre_sroot)/doc/dsh/sv_se/%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_pdf)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
 copy : $(export_pdf_en_us) $(export_html_en_us) \
-       $(export_pdf_sv_se) $(export_html_sv_se)
+       $(export_pdf_sv_se) $(export_html_sv_se) \
+       | silent
 
-lib :
+lib :  silent
 
-exe :
+exe :  silent
 
 
 clean :
 
 realclean : clean $(clean_pdf) $(clean_html)
 
+silent :
+	@ :
+
 $(clean_pdf) : clean_%.pdf : %.pdf
 	@ $(rm) $(rmflags) $(doc_dir)/$*.pdf
 

othermanu/doc/orm/src/os_templ/hw_templ/makefile

@@ -59,21 +59,24 @@ $(doc_dir)/en_us/orm/%.html : ../../%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_gif)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
-copy : $(export_gif) $(export_html)
+copy : $(export_gif) $(export_html) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 
 clean :
 
 realclean : clean $(clean_gif) $(clean_html) $(clean_c)
 
+silent :
+	@ :
+
 $(clean_gif) : clean_%.gif : %.gif
 	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
 

profibus/exp/gsd/src/os_templ/hw_templ/makefile

@@ -58,20 +58,23 @@ clean_xml := $(patsubst %.xml, clean_%.xml, $(xml_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_gsd) $(clean_gse) $(clean_xml)
 
-all : init copy
+all : init copy | silent
 
-init :
+init : silent
 
-copy : $(export_gsd) $(export_gse) $(export_xml)
+copy : $(export_gsd) $(export_gse) $(export_xml) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : clean $(clean_gsd) $(clean_gse) $(clean_xml)
 
+silent :
+	@ :
+
 $(export_gsd) : $(exe_dir)/%.gsd : %.gsd
 	@ echo "Exporting $< ..."
 	@ $(cp) $(cpflags) $(source) $(target)

profibus/exp/rt/src/os_templ/hw_templ/makefile

@@ -63,20 +63,23 @@ export_wav := $(patsubst %.wav,$(exe_dir)/%.wav,$(wav_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_c)
 
-all : init copy lib
+all : init copy lib | silent
 
-init :
+init : silent
 
-copy : $(exe_dir)/profibus_xtthelp.dat $(export_gif) $(export_gifdoc) $(export_wav)
+copy : $(exe_dir)/profibus_xtthelp.dat $(export_gif) $(export_gifdoc) $(export_wav) | silent
 
-lib : $(export_obj)
+lib : $(export_obj) | silent
 
-exe :
+exe : | silent
 
 clean :
 
 realclean : clean $(clean_obj) 
 
+silent :
+	@ :
+
 .SUFFIXES:
 
 $(exe_dir)/%.wav : ../../%.wav

profibus/exp/wb/src/os_templ/hw_templ/makefile

@@ -19,20 +19,23 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_c)
 
-all : init copy lib
+all : init copy lib | silent
 
-init :
+init : silent
 
-copy : $(exe_dir)/pb_module_classes.dat $(exe_dir)/pn_module_classes.dat
+copy : $(exe_dir)/pb_module_classes.dat $(exe_dir)/pn_module_classes.dat | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : clean $(clean_obj) 
 
+silent :
+	@ :
+
 .SUFFIXES:
 
 $(exe_dir)/pb_module_classes.dat : ../../pb_module_classes.dat

remote/exe/rs_remote_logg/src/rs_remote_logg.c

@@ -491,19 +491,17 @@ static pwr_tStatus	logg_print(	logg_ctx	loggctx,
 		conflist_ptr->outfile);
 	if (csts == 0)
 */
+	if ( conflist_ptr->outfile) {
 	  csts = fprintf( conflist_ptr->outfile, "%s\n", msg);
-	if ( csts < 0)
-	{
+	  if ( csts < 0) {
 	    /* File error, close file and try to open it later */
 	    errh_CErrLog( REM__LOGGWRITE, NULL);
 	    fclose( conflist_ptr->outfile);
 	    conflist_ptr->file_open = 0;
 	  }
-	else
-	{
+	  else {
 	    csts = fflush( conflist_ptr->outfile);
-	  if ( csts != 0)	
-	  {
+	    if ( csts != 0) {
 	      /* File error, close file and try to open it later */
 	      errh_CErrLog( REM__LOGGWRITE, NULL);
 	      fclose( conflist_ptr->outfile);
@@ -512,7 +510,7 @@ static pwr_tStatus	logg_print(	logg_ctx	loggctx,
 	    else
 	      conflist_ptr->loggconf->LoggCount++;
 	  }
-
+	}
 	return REM__SUCCESS;
 }
 
@@ -713,6 +711,7 @@ int main()
 	      conflist_ptr->loggconf->NewVersion = 0;
 	      if ( conflist_ptr->file_open)
 	      {
+		if ( conflist_ptr->outfile)
 		  fclose( conflist_ptr->outfile);
 	        conflist_ptr->file_open = 0;
 	        sts = logg_open_file( conflist_ptr, 1);

remote/exe/rs_remote_wmq/src/os_templ/link_rule.mk

@@ -7,6 +7,7 @@ ifeq ($(PWRE_CONF_WMQ),1)
         $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) \
 	$(pwre_conf_libwmq) $(pwre_conf_lib)
 else 
-  link = echo "WMQ not installed"
+  log_link_exe = echo "$(exe_flv_name): WMQ not installed"
+  link = :
 endif
 endif

remote/wbl/remote/src/os_templ/hw_templ/makefile

@@ -27,23 +27,28 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init :
+init : silent
 
 copy : $(inc_dir)/pwr_remoteclasses.h \
-       $(inc_dir)/pwr_remoteclasses.hpp
+       $(inc_dir)/pwr_remoteclasses.hpp \
+       | silent
 
-lib  : $(load_dir)/remote.dbs
+lib  : $(load_dir)/remote.dbs | silent
 
 exe : $(doc_dir)/en_us/orm/remote_allclasses.html \
       $(exe_dir)/en_us/remote_xtthelp.dat \
-      $(exe_dir)/sv_se/remote_xtthelp.dat
+      $(exe_dir)/sv_se/remote_xtthelp.dat \
+      | silent
 
 clean : 
 
 realclean : clean $(clean_wbl)
 
+silent :
+	@ :
+
 $(load_dir)/remote.dbs :
 	@ echo "Generating loadfile for remote"
 	@ export pwr_load=$(pwr_eload);\
@@ -52,15 +57,15 @@ $(load_dir)/remote.dbs :
 
 $(inc_dir)/pwr_remoteclasses.h :
 	@ echo "Generating struct files for remote classes..."
-	@ $(co_convert) -s -d $(inc_dir) "$(pwre_sroot)/wbl/remote/src/remote_*.wb_load"
+	@ $(co_convert) -s -d $(inc_dir) -y $(release_root)/bld/$(type_name)/remote.d_h_wbl "$(pwre_sroot)/wbl/remote/src/remote_*.wb_load"
 
 $(inc_dir)/pwr_remoteclasses.hpp :
 	@ echo "Generating hpp files for remote classes..."
-	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/remote/src/remote_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) -y $(release_root)/bld/$(type_name)/remote.d_hpp_wbl "$(pwre_sroot)/wbl/remote/src/remote_*.wb_load"
 
 $(doc_dir)/en_us/orm/remote_allclasses.html :
 	@ echo "Generating html files for remote classes en_us..."
-	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/remote/src/cnv_setup.dat "$(pwre_sroot)/wbl/remote/src/remote_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(release_root)/bld/$(type_name)/remote.d_html_wbl -g $(pwre_sroot)/wbl/remote/src/cnv_setup.dat "$(pwre_sroot)/wbl/remote/src/remote_*.wb_load"
 	@ echo "Generating html files for remote structs en_us..."
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_remoteclasses.h
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_remoteclasses.hpp
@@ -81,16 +86,21 @@ $(doc_dir)/en_us/orm/remote_allclasses.html :
 
 $(exe_dir)/en_us/remote_xtthelp.dat :
 	@ echo "Generating xtt help files for remote classes"
-	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/remote/src/remote_c_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us -y $(release_root)/bld/$(type_name)/remote.d_en_us_xtthelp_wbl "$(pwre_sroot)/wbl/remote/src/remote_c_*.wb_load"
 
 $(exe_dir)/sv_se/remote_xtthelp.dat :
 	@ echo "Generating xtt help files for remote classes"
-	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/remote/src/remote_c_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se -y $(release_root)/bld/$(type_name)/remote.d_sv_se_xtthelp_wbl "$(pwre_sroot)/wbl/remote/src/remote_c_*.wb_load"
 
 clean_wbl :
 	@ if [ -e $(load_dir)/remote.dbs ]; then \
 		$(rm) $(rmflags) $(load_dir)/remote.dbs; \
 	  fi
 
+-include $(release_root)/bld/$(type_name)/remote.d_h_wbl
+-include $(release_root)/bld/$(type_name)/remote.d_hpp_wbl
+-include $(release_root)/bld/$(type_name)/remote.d_html_wbl
+-include $(release_root)/bld/$(type_name)/remote.d_en_us_xtthelp_wbl
+-include $(release_root)/bld/$(type_name)/remote.d_sv_se_xtthelp_wbl
 
 

src/doc/dox/src/os_templ/hw_templ/makefile

@@ -20,7 +20,7 @@ endif
 
 .PHONY : all init copy lib exe clean realclean
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
@@ -28,12 +28,14 @@ copy :
 
 lib :
 
-exe : $(doc_dir)/dox/index.html
+exe : $(doc_dir)/dox/index.html | silent
 
 clean : $(clean_dox)
 
 realclean : $(clean_html)
 
+silent :
+	@ :
 
 $(clean_html) : clean_%.html : %.html
 	@ $(rm) $(rmflags) $(doc_dir)/dox/$*.html

src/doc/dweb/src/os_templ/hw_templ/makefile

@@ -73,11 +73,11 @@ $(doc_dir)/%.pdf : ../../%.pdf
 	@ $(cp) $(cpflags) $(source) $(target)
 
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
-copy : $(export_doc)
+copy : $(export_doc) | silent
 
 lib :
 
@@ -87,6 +87,9 @@ clean : $(clean_dweb)
 
 realclean : $(clean_html)
 
+silent :
+	@ :
+
 
 $(clean_html) : clean_%.html : %.html
 	@ $(rm) $(rmflags) $(doc_dir)/dox/$*.html

src/doc/man/src/os_templ/hw_templ/makefile

@@ -213,7 +213,7 @@ $(doc_dir)/en_us/%.png : ../../%.png
 .PHONY : all init copy lib exe clean realclean \
          $(clean_pdf)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
@@ -247,7 +247,7 @@ copy : $(export_pdf) $(export_pdf_en_us) $(export_pdf_sv_se) \
        $(doc_dir)/en_us/man_exlib.ps \
        $(mediatargets) $(csstargets) \
        $(export_html) $(export_html_en_us) $(export_html_sv_se) \
-       $(doc_dir)/en_us/changelog.html
+       $(doc_dir)/en_us/changelog.html | silent
 
 lib :
 
@@ -259,6 +259,9 @@ clean :
 
 realclean : clean $(clean_pdf) $(clean_c)
 
+silent :
+	@ :
+
 # added by jonas_h 2006-04-nn
 
 

src/doc/orm/src/os_templ/hw_templ/makefile

@@ -76,12 +76,12 @@ $(doc_dir)/en_us/orm/%.html : ../../%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_gif) $(clean_png)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
 copy : $(export_gif) $(export_png) $(export_html)\
-       $(doc_dir)/en_us/orm/orm.css
+       $(doc_dir)/en_us/orm/orm.css | silent
 
 lib :
 
@@ -92,6 +92,9 @@ clean :
 
 realclean : clean $(clean_gif) $(clean_html) $(clean_c)
 
+silent :
+	@ :
+
 $(clean_gif) : clean_%.gif : %.gif
 	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
 

src/doc/prm/src/os_templ/hw_templ/makefile

@@ -20,7 +20,7 @@ endif
 
 .PHONY : all init copy lib exe clean realclean
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
@@ -28,12 +28,14 @@ copy :
 
 lib :
 
-exe : $(doc_dir)/prm/index.html
+exe : $(doc_dir)/prm/index.html | silent
 
 clean : $(clean_dox)
 
 realclean : $(clean_html)
 
+silent :
+	@ :
 
 $(clean_html) : clean_%.html : %.html
 	@ $(rm) $(rmflags) $(doc_dir)/prm/$*.html

src/doc/web/src/os_templ/hw_templ/makefile

@@ -89,12 +89,12 @@ clean_ge := $(clean_gif) $(clean_html)
 
 .PHONY : all init copy lib exe clean realclean
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
 copy : $(export_doc) \
-       $(doc_dir)/pcss.css
+       $(doc_dir)/pcss.css | silent
 
 lib :
 
@@ -104,6 +104,8 @@ clean : $(clean_dox)
 
 realclean : $(clean_html) $(clean_js)
 
+silent :
+	@ :
 
 $(clean_html) : clean_%.html : %.html
 	@ $(rm) $(rmflags) $(doc_dir)/dox/$*.html

src/exe/co_convert/src/cnv_classdep.h

@@ -37,11 +37,8 @@
 #ifndef cnv_classdep_h
 #define cnv_classdep_h
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
 #include <vector>
+#include <string>
 #include "pwr.h"
 #include "cnv_ctx.h"
 
@@ -81,9 +78,6 @@ class CnvClassDep {
   void print_html_classtable_children( ofstream& fp, int idx);
 };
 
-#if defined __cplusplus
-}
-#endif
 #endif
 
 

src/exe/co_convert/src/cnv_ctx.cpp

@@ -104,3 +104,30 @@ int CnvCtx::read_line(
   return 1;
 }
 
+void CnvCtx::add_depend( char *fname)
+{
+  if ( strcmp( depend_filename, "") == 0)
+    return;
+
+  string fnamestr( fname);
+  depend.push_back(fnamestr);
+}
+
+void CnvCtx::print_depend()
+{
+  if ( strcmp( depend_filename, "") == 0)
+    return;
+
+  dcli_translate_filename( dependfile, dependfile);
+  dcli_translate_filename( depend_filename, depend_filename);
+
+  ofstream fp( depend_filename);
+  
+  fp << dependfile << " : \\" << endl;
+  for ( unsigned int i = 0; i < depend.size(); i++)
+    fp << depend[i] << " \\" << endl;
+
+  fp << endl;
+  fp.close();
+}
+

src/exe/co_convert/src/cnv_ctx.h

@@ -34,25 +34,28 @@
  * General Public License plus this exception.
  */
 
-#ifndef co_convert_h
-#define co_convert_h
+#ifndef co_ctx_h
+#define co_ctx_h
 
 /* cnv_ctx.h -- Setup */
 
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
+#include <string>
+#include <vector>
 #include "pwr.h"
 #include "cnv_setup.h"
 
+using namespace std;
+
 class CnvWblTo;
 class CnvReadWbl;
 class CnvReadXtthelp;
 
 class CnvCtx { 
+ private:
+  vector<string> depend;
+
  public:
   CnvCtx() : generate_html(0), generate_xtthelp(0), generate_src(0),
     generate_struct(0), generate_ps(0), generate_cdp(0), common_structfile_only(0), hpp(0), 
@@ -60,6 +63,7 @@ class CnvCtx {
     {
       strcpy( dir, "");
       strcpy( setup_filename, "");
+      strcpy( depend_filename, "");
     }
   char		dir[120];
   int		generate_html;
@@ -71,21 +75,24 @@ class CnvCtx {
   int		common_structfile_only;
   int		hpp;
   int	       	verbose;
-  char	 	setup_filename[120];
+  pwr_tFileName setup_filename;
+  pwr_tFileName depend_filename;
+  pwr_tFileName	dependfile;
   int		first_class;
   CnvSetup	*setup;
   CnvWblTo	*wblto;
   CnvReadWbl	*rw;
   CnvReadXtthelp *rx;
 
+  void add_depend( char *dname);
+  void set_dependfile( char *dname) {strncpy( dependfile, dname, sizeof(dependfile));}
+  void print_depend();
+
   static int read_line( char *line, int maxsize, FILE *file);
   static int remove_spaces( const char *in, char *out);
   static char *low( const char *in);
 };
 
-#if defined __cplusplus
-}
-#endif
 #endif
 
 

src/exe/co_convert/src/cnv_readwbl.cpp

@@ -90,6 +90,8 @@ int CnvReadWbl::read_wbl( char *filename)
   if ( !fp)
     return 0;
 
+  ctx->add_depend( filename);
+
   state = 0;
   doc_fresh = 0;
 

src/exe/co_convert/src/cnv_wblto.h

@@ -78,6 +78,7 @@ class CnvWblTo {
   virtual int index_open() { return 0;}
   virtual bool confpass() { return false;}
   virtual void set_confpass( bool conf) {};
+  virtual void add_depend( char *) {};
 };
 
 #if defined __cplusplus

src/exe/co_convert/src/cnv_wbltoh.cpp

@@ -73,6 +73,8 @@ int CnvWblToH::init( char *first)
   strcat( fname, struct_filename);
   fp_struct.open( fname);
 
+  ctx->set_dependfile( fname);
+
   if ( ctx->hpp) {
     if ( strcmp( CnvCtx::low(ctx->rw->volume_name), "pwrb") == 0)
       sprintf( fname, "pwr_%sclasses_hpp", "base");
@@ -146,6 +148,8 @@ int CnvWblToH::close()
 
   fp_struct.close();
 
+  ctx->print_depend();
+
   return 1;
 }
 
@@ -1081,3 +1085,4 @@ int CnvWblToH::check_typename( char *type_volume, char *type_name)
   else
     return 1;
 }
+

src/exe/co_convert/src/cnv_wbltoh.h

@@ -37,9 +37,9 @@
 #ifndef cnv_wbltoh_h
 #define cnv_wbltoh_h
 
-#if defined __cplusplus
-extern "C" {
-#endif
+//#if defined __cplusplus
+//extern "C" {
+//#endif
 
 #include "pwr.h"
 #include "cnv_readwbl.h"
@@ -93,8 +93,8 @@ class CnvWblToH : public CnvWblTo {
   
 };
 
-#if defined __cplusplus
-}
-#endif
+//#if defined __cplusplus
+//}
+//#endif
 #endif
 

src/exe/co_convert/src/cnv_wbltohtml.cpp

@@ -204,6 +204,7 @@ int CnvWblToHtml::init( char *first)
   cdh_ToLower( fname, fname);
   fp_html_index.open( fname);
 
+  ctx->set_dependfile( fname);  
 
   html_index_open = 1;
 
@@ -427,6 +428,8 @@ int CnvWblToHtml::close()
 	   ctx->dir, ctx->dir, ctx->dir, ctx->dir);
   system( cmd);
 
+  ctx->print_depend();
+
   return 1;
 }
 

src/exe/co_convert/src/cnv_wbltoxtthelp.cpp

@@ -134,6 +134,8 @@ int CnvWblToXtthelp::init( char *first)
 
   fp_xtthelp_index.open( fname);
 
+  ctx->set_dependfile( fname);
+
   fp_tmp.open( cread_cTmpFile2);
 
   xtthelp_index_open = 1;
@@ -157,6 +159,9 @@ int CnvWblToXtthelp::close()
   ctx->rw->copy_tmp_file( cread_cTmpFile2, fp_xtthelp_index);
   
   fp_xtthelp_index.close();
+
+  ctx->print_depend();
+
   return 1;
 }
 

src/exe/co_convert/src/co_convert.cpp

@@ -157,7 +157,7 @@ int main( int argc, char *argv[])
         usage();
         exit(0);
       }
-      strcpy( ctx->setup_filename, argv[i+1]);
+      strncpy( ctx->setup_filename, argv[i+1], sizeof(ctx->setup_filename));
       i++;
     }
     else if ( strcmp( argv[i], "-l") == 0) {
@@ -168,6 +168,14 @@ int main( int argc, char *argv[])
       Lng::set( argv[i+1]);
       i++;
     }
+    else if ( strcmp( argv[i], "-y") == 0) {
+      if ( i+1 >= argc) {
+        usage();
+        exit(0);
+      }
+      strncpy( ctx->depend_filename, argv[i+1], sizeof(ctx->depend_filename));
+      i++;
+    }
     else if ( argv[i][0] == '-') {
       int next = 0;
       s = &argv[i][1];

src/exe/co_convert/src/os_templ/hw_templ/link_rule.mk

@@ -2,7 +2,8 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) $(export_obj) \
-	$(objects) $(pwre_conf_libdir) $(pwre_conf_libpwrco) $(pwre_conf_lib) $(pwre_conf_libgtk);\
-	cp $(export_exe) $(eexe_dir)/
+	$(objects) $(pwre_conf_libdir) $(pwre_conf_libpwrco) $(pwre_conf_lib) $(pwre_conf_libgtk)
+
+linkcp = cp $(export_exe) $(eexe_dir)/
 
 endif

src/exp/com/src/os_linux/hw_arm/makefile

@@ -58,11 +58,11 @@ clean_awk := $(patsubst %.awk, clean_%.awk, $(awk_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_sh)
 
-all : init copy
+all : init copy | silent
 
 init :
 
-copy : $(export_sh) $(export_pwr_com) $(export_awk)
+copy : $(export_sh) $(export_pwr_com) $(export_awk) | silent
 
 lib :
 
@@ -72,6 +72,9 @@ clean :
 
 realclean : clean $(clean_sh) $(clean_pwr_com) $(clean_awk)
 
+silent :
+	@ :
+
 $(export_sh) : $(exe_dir)/%.sh : %.sh
 	@ echo "Exporting $< ..."
 	@ $(cp) $(cpflags) $(source) $(target)

src/exp/com/src/os_templ/hw_templ/makefile

@@ -58,11 +58,11 @@ clean_awk := $(patsubst %.awk, clean_%.awk, $(awk_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_sh)
 
-all : init copy
+all : init copy | silent
 
 init :
 
-copy : $(export_sh) $(export_pwr_com) $(export_awk)
+copy : $(export_sh) $(export_pwr_com) $(export_awk) | silent
 
 lib :
 
@@ -72,6 +72,9 @@ clean :
 
 realclean : clean $(clean_sh) $(clean_pwr_com) $(clean_awk)
 
+silent :
+	@ :
+
 $(export_sh) : $(exe_dir)/%.sh : %.sh
 	@ echo "Exporting $< ..."
 	@ $(cp) $(cpflags) $(source) $(target)

src/exp/inc/src/os_templ/hw_templ/makefile

@@ -37,11 +37,11 @@ clean_includes := $(patsubst %.h,clean_%.h,$(sources))
 .PHONY : all init copy lib exe clean realclean \
          $(clean_includes)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
 init :
 
-copy : $(export_includes) $(exe_dir)/pwrp_rules.mk
+copy : $(export_includes) $(exe_dir)/pwrp_rules.mk | silent
 
 lib :
 
@@ -51,6 +51,9 @@ clean :
 
 realclean : $(clean_includes)
 
+silent :
+	@ :
+
 $(clean_includes) : clean_%.h : %.h
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h
 

src/exp/rt/src/os_templ/hw_templ/makefile

@@ -63,13 +63,13 @@ export_wav := $(patsubst %.wav,$(exe_dir)/%.wav,$(wav_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_c)
 
-all : init copy lib
+all : init copy lib | silent
 
 init :
 
-copy : $(load_dir)/pwr_volumelist.dat $(exe_dir)/sv_se/pwrb_xtthelp.dat $(exe_dir)/pwr_logga.gif $(export_gif) $(export_gifdoc) $(export_wav)
+copy : $(load_dir)/pwr_volumelist.dat $(exe_dir)/sv_se/pwrb_xtthelp.dat $(exe_dir)/pwr_logga.gif $(export_gif) $(export_gifdoc) $(export_wav) | silent
 
-lib : $(export_obj)
+lib : $(export_obj) | silent
 
 exe :
 
@@ -77,6 +77,9 @@ clean :
 
 realclean : clean $(clean_obj) 
 
+silent :
+	@ :
+
 .SUFFIXES:
 
 $(exe_dir)/%.wav : ../../%.wav

src/exp/stdsoap2/src/os_templ/hw_templ/makefile

@@ -60,13 +60,13 @@ export_h := $(patsubst %.h,$(inc_dir)/%.h,$(h_sources))
 
 .PHONY : all init copy lib exe clean realclean
 
-all : init copy lib
+all : init copy lib | silent
 
 init :
 
-copy : $(export_h)
+copy : $(export_h) | silent
 
-lib : $(export_obj)
+lib : $(export_obj) | silent
 
 exe :
 
@@ -74,6 +74,9 @@ clean :
 
 realclean : clean
 
+silent :
+	@ :
+
 .SUFFIXES:
 
 

src/lib/dtt/src/os_templ/hw_templ/makefile

@@ -103,18 +103,18 @@ export_lib = $(lib_dir)/$(lib_name)$(lib_ext)
 	 dirs $(clean_h_includes) $(clean_hpp_includes) \
 	 clean_bld clean_dirs clean_lib export_stuff
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init : dirs
+init : dirs | silent
 
-copy : $(export_includes)
+copy : $(export_includes) | silent
 
 lib :   $(export_dtt_m)\
 	$(inc_dir)/dtt_appl_rttsys_m.rdecl\
 	$(inc_dir)/dtt_appl_rttsys_m.rhlp\
 	$(inc_dir)/dtt_appl_rttsys_m.rh\
 	$(export_lib)($(objects))\
-	$(export_obj)
+	$(export_obj) | silent
  
 exe :
 
@@ -153,6 +153,9 @@ clean_lib :
 
 clean_includes : $(clean_h_includes) $(clean_hpp_includes)
 
+silent :
+	@ :
+
 $(clean_h_includes) : clean_%.h : %.h
 	@ echo "Removing h-includes"
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h  

src/tools/bld/src/os_linux/exe_generic.mk

@@ -84,13 +84,21 @@ hpp_includes := $(sort \
            )
 
 exe_name   := $(comp_name)
+exe_flv_name   := $(comp_name)
+ifneq ($(src_name),src)
+  exe_flv_name := $(comp_name)_$(src_name)
+endif
 exe_source := $(filter $(exe_name).%, $(c_sources))
 
 c_sources  := $(filter-out $(exe_source), $(c_sources))
 
-export_exe := $(exe_dir)/$(exe_name)$(exe_ext)
+export_exe := $(exe_dir)/$(pre_so)$(exe_flv_name)$(exe_ext)
 #export_obj := $(obj_dir)/$(exe_name)$(obj_ext)
 export_obj := $(bld_dir)/$(exe_name)$(obj_ext)
+export_flv_obj := $(bld_dir)/$(exe_name)$(obj_ext)
+ifneq ($(src_name),src)
+  export_flv_obj := $(bld_dir)/$(exe_name)_$(src_name)$(obj_ext)
+endif
 export_includes := $(addprefix $(inc_dir)/,$(h_includes) $(hpp_includes))
 
 l_targets := $(addprefix $(bld_dir)/,$(basename $(l_sources)))
@@ -103,7 +111,7 @@ objects := $(strip $(addsuffix $(obj_ext),$(objects)))
 lc_src_dep := $(objects:$(obj_ext)=$(d_ext)) 
 exe_src_dep := $(obj_dir)/$(exe_name)$(d_ext)
 source_dependencies := $(lc_src_dep) $(exe_src_dep)
-link_dependencies := $(bld_dir)/$(exe_name)$(d_ld_ext)
+link_dependencies := $(bld_dir)/$(exe_flv_name)$(d_ld_ext)
 
 clean_h_includes := $(patsubst %.h,clean_%.h, $(h_includes))
 clean_hpp_includes := $(patsubst %.hpp,clean_%.hpp, $(hpp_includes))
@@ -115,15 +123,15 @@ clean_hpp_includes := $(patsubst %.hpp,clean_%.hpp, $(hpp_includes))
          dirs $(clean_includes) clean_bld clean_dirs\
 	 clean_exe
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init : dirs
+init : dirs | silent
 
-copy : $(export_includes)
+copy : $(export_includes) | silent
 
 lib :
 
-exe : $(l_targets) $(objects) $(export_obj) $(export_exe)
+exe : $(l_targets) $(objects) $(export_flv_obj) $(export_exe) | silent
 
 dirs : $(bld_dir)$(dir_ext)
 
@@ -134,24 +142,20 @@ clean : clean_exe clean_bld
 
 realclean : clean $(clean_h_includes) $(clean_hpp_includes) clean_dirs
 
-$(export_exe) : $(link_rule) $(export_obj) $(objects)
+$(export_exe) : $(link_rule) $(export_flv_obj) $(objects)
 	@ $(log_link_exe)
-	@ $(link)
-
+	@ $(link)  -t | grep $(pwre_broot) | awk -f $(pwre_kroot)/tools/bld/src/$(os_name)/ld_trace_to_d.awk -v target=$(target) > $(link_dependencies)
+	@ if [ "$(linkcp)" != ":" ]; then \
+		$(linkcp); \
+	fi
 
-# This is for Lynx 2.5 map files, it doesn't work for Linux. ML 
-# ifeq ($(nodep),)
-#	@ echo "$(export_exe) : \\" > $(link_dependencies)
-#	@ $ sed -n "s|\(.*\)\($(lib_dir)/.*\.a\)\(\]\)\(.*\.o\)\(.*\)|\2(\4) \\\\|p" $(map) \
-#	  | sort | uniq >> $(link_dependencies) 
-# endif
 
 clean_exe :
 	@ if [ -e $(export_exe) ]; then \
 		$(rm) $(export_exe); \
 	fi
-	@ if [ -e $(export_obj) ]; then \
-		$(rm) $(export_obj); \
+	@ if [ -e $(export_flv_obj) ]; then \
+		$(rm) $(export_flv_obj); \
 	fi
 
 clean_bld :
@@ -160,6 +164,9 @@ clean_bld :
 clean_dirs :
 	@ $(rm) $(rmflags) $(bld_dir)
 
+silent:
+	@ :
+
 $(clean_h_includes) : clean_%.h : %.h
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h  
 

src/tools/bld/src/os_linux/hw_x86/variables.mk

@@ -92,6 +92,9 @@ rt_msg_eobjs 	:= $(eobj_dir)/pwr_msg_co.o $(eobj_dir)/pwr_msg_rt.o
 rs_msg_eobjs 	:= $(eobj_dir)/pwr_msg_rs.o
 wb_msg_eobjs 	:= $(eobj_dir)/pwr_msg_wb.o $(eobj_dir)/pwr_msg_ge.o $(eobj_dir)/pwr_msg_flow.o
 
+linkcp = :
+pre_so =
+
 # Configuration
 #ifeq ($(pwre_conf_mysql),1)
 #  cmysql        := -DPWRE_CONF_MYSQL=1

src/tools/bld/src/os_linux/jpwr_generic.mk

@@ -99,17 +99,17 @@ source_dependencies := $(addsuffix $(d_ext), $(source_dependencies))
 
 #	 dirs $(clean_h_includes) $(clean_hpp_includes)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init : dirs
+init : dirs | silent
 
-copy : 
+copy : silent
 
-lib : $(export_lib)
+lib : $(export_lib) | silent
 
-exe :
+exe : silent
 
-dirs : $(bld_dir)$(dir_ext)
+dirs : $(bld_dir)$(dir_ext) | silent
 
 $(bld_dir)$(dir_ext) :
 	@ $(mkdir) $(mkdirflags) $(basename $@)/
@@ -132,6 +132,9 @@ clean_lib :
 
 clean_includes : $(clean_h_includes) $(clean_hpp_includes)
 
+silent :
+	@ :
+
 $(clean_h_includes) : clean_%.h : %.h
 	@ echo "Removing h-includes"
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h  

src/tools/bld/src/os_linux/lib_generic.mk

@@ -154,13 +154,13 @@ source_dependencies := $(addsuffix $(d_ext), $(source_dependencies))
 
 #	 dirs $(clean_h_includes) $(clean_hpp_includes)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init : dirs
+init : dirs | silent
 
-copy : $(export_includes) $(l_copy) $(export_pwsg) $(export_meth)
+copy : $(export_includes) $(l_copy) $(export_pwsg) $(export_meth) | silent
 
-lib : $(export_lib)
+lib : $(export_lib) | silent
 
 exe :
 
@@ -195,6 +195,9 @@ clean_lib :
 
 clean_includes : $(clean_h_includes) $(clean_hpp_includes)
 
+silent:
+	@ :
+
 $(clean_h_includes) : clean_%.h : %.h
 	@ echo "Removing h-include: $(inc_dir)/$*.h"
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h  

src/tools/bld/src/os_linux/mmi_generic.mk

@@ -97,11 +97,11 @@ clean_png := $(patsubst %.png,clean_%.png,$(png_sources))
 .PHONY : all init copy lib exe clean realclean\
          dirs clean_bld clean_dirs $(clean_uid)
 
-all : init copy
+all : init copy | silent
 
-init : dirs
+init : dirs | silent
 
-copy : $(export_uid) $(export_c_pwg) $(export_pwg) $(export_pwsg) $(export_png)
+copy : $(export_uid) $(export_c_pwg) $(export_pwg) $(export_pwsg) $(export_png) | silent
 
 lib :
 
@@ -113,6 +113,9 @@ realclean : clean
 
 dirs : 
 
+silent :
+	@ :
+
 $(clean_uid) : clean_%.uid : %.uil
 	@ echo "Removing uid"
 	@ $(rm) $(rmflags) $(exe_dir)/$*.uid  

src/tools/bld/src/os_linux/msg_generic.mk

@@ -48,17 +48,17 @@ export_obj = $(obj_dir)/pwr_msg_$(comp_name)$(obj_ext)
 .PHONY : all init copy lib exe clean realclean\
          dirs $(clean_includes) clean_lib clean_obj clean_dirs
 
-all : init copy lib
+all : init copy lib | silent
 
-init : dirs 
+init : dirs | silent
 
-copy : $(export_includes) $(export_cmsg)
+copy : $(export_includes) $(export_cmsg) | silent
 
-lib : $(export_obj)
+lib : $(export_obj) | silent
 
 exe :
 
-dirs : $(bld_dir)$(dir_ext)
+dirs : $(bld_dir)$(dir_ext) | silent
 
 $(bld_dir)$(dir_ext) :
 	$(mkdir) $(mkdirflags) $(basename $@)
@@ -67,6 +67,8 @@ clean :
 
 realclean : $(clean_includes) clean_obj clean_dirs
 
+silent :
+	@ :
 
 $(export_cmsg) : $(cmsgs)
 	@ echo Creating: obj_dir/$(notdir $@)

src/tools/bld/src/os_linux/wbl_generic.mk

@@ -152,17 +152,18 @@ $(load_dir)/%.flw : ../../%.flw
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init : 
+init : silent
 
-lib  : $(export_wbl_dbs)
+lib  : $(export_wbl_dbs) | silent
 
 copy : $(export_wbl_h) \
        $(export_wbl_hpp) \
        $(export_pwg) \
        $(export_pwsg) \
-       $(export_flw)
+       $(export_flw) \
+       | silent
 
 exe:   $(export_wbl_xtthelp_en_us) \
        $(export_wbl_xtthelp_sv_se) \
@@ -171,7 +172,8 @@ exe:   $(export_wbl_xtthelp_en_us) \
        $(export_wbl_ps_en_us) \
        $(export_wbl_ps_sv_se) \
        $(export_pdf_en_us) \
-       $(export_pdf_sv_se)
+       $(export_pdf_sv_se) \
+       | silent
 
 clean : \
        $(clean_xtthelp_sv_se) $(clean_xtthelp_en_us) \
@@ -183,6 +185,9 @@ realclean : clean \
        $(clean_h) \
        $(clean_hpp) \
 
+silent :
+	@ :
+
 $(clean_dbs) : clean_%.dbs : $(load_dir)/%.dbs
 	@ echo "rm $(source)"
 	@ if [ -e $(source) ]; then \

src/tools/pwre/src/os_linux/pwre_merge.sh

@@ -20,12 +20,16 @@ merge_dir_func()
       if [ ! -d $fromdir/$file ]; then
         if [ -e $todir/$file ]; then
           if [ $todir/$file -ot $fromdir/$file ]; then
+            if [ $ver -eq 1 ]; then
               echo "Copy $fromdir/$file"
-            cp $fromdir/$file $todir
+            fi
+            cp -p $fromdir/$file $todir
           fi
         else
+	  if [ $ver -eq 1 ]; then
             echo "Copy $fromdir/$file"
-          cp $fromdir/$file $todir
+          fi
+          cp -p $fromdir/$file $todir
 	  if [ ${file##*.} = "dbs" ]; then
             # Change access on dbsfiles
 	    chmod a+w $todir/$file
@@ -36,10 +40,14 @@ merge_dir_func()
   fi
 }
 
-fromroot=$1
-toroot=$2
-file=$3
-
+fromroot=$2
+toroot=$3
+file=$4
+if [ "$1" == "1" ]; then
+  ver=1
+else
+  ver=0
+fi
 
 if [ -z "$pwre_host_exe" ]; then
   co_merge="co_merge"
@@ -70,13 +78,17 @@ else
 
     arname=${lib##/*/}
     if [ $arname = "libpwr_rt.a" ] || [ $arname = "libpwr_cow.a" ] || [ $arname = "libpwr_cow_motif.a" ] || [ $arname = "libpwr_cow_gtk.a" ] || [ $arname = "libpwr_wb.a" ] || [ $arname = "libpwr_wb_motif.a" ] || [ $arname = "libpwr_wb_gtk.a" ] || [ $arname = "libpwr_xtt.a" ] || [ $arname = "libpwr_xtt_motif.a" ] || [ $arname = "libpwr_xtt_gtk.a" ]; then
+      if [ $ver -eq 1 ]; then
 	  echo "Merge $lib"
+      fi
       modules=`eval ar -tf $lib`
-      ar -xf $lib
-      ar -rc $toroot/lib/$arname $modules
+      ar -xof $lib
+      ar -roc $toroot/lib/$arname $modules
       rm $modules
     else
+      if [ $ver -eq 1 ]; then 
         echo "Copy $lib"
+      fi
       cp $lib $toroot/lib/
     fi
   done
@@ -84,19 +96,25 @@ else
   # Merge io methods
   methodfile=$pwr_inc/rt_io_$pwre_module.meth
   if [ -e $methodfile ]; then
+    if [ $ver -eq 1 ]; then
       echo "-- Merge io methods"
+    fi
     $co_merge io_base $pwr_einc/rt_io_\*.meth $pwr_elib/libpwr_rt.a
   fi
   # Merge wb methods
   methodfile=$pwr_inc/wb_$pwre_module.meth
   if [ -e $methodfile ]; then
+    if [ $ver -eq 1 ]; then
       echo "-- Merge wb methods"
+    fi
     $co_merge wb_base $pwr_einc/wb_\*.meth $pwr_elib/libpwr_wb.a
   fi
   # Merge xtt methods
   methodfile=$pwr_inc/xtt_$pwre_module.meth
   if [ -e $methodfile ]; then
+    if [ $ver -eq 1 ]; then
       echo "-- Merge xtt methods"
+    fi
     $co_merge xtt_base $pwr_einc/xtt_\*.meth $pwr_elib/libpwr_xtt.a
   fi
 fi

src/wbl/pwrb/src/os_templ/hw_templ/makefile

@@ -27,24 +27,29 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init :
+init : silent
 
 copy : $(inc_dir)/pwr_baseclasses.h \
-       $(inc_dir)/pwr_baseclasses.hpp
+       $(inc_dir)/pwr_baseclasses.hpp \
+       | silent
 
 
-lib  : $(load_dir)/pwrb.dbs
+lib  : $(load_dir)/pwrb.dbs | silent
 
 exe : $(doc_dir)/en_us/orm/pwrb_allclasses.html \
       $(exe_dir)/en_us/pwrb_xtthelp.dat \
-      $(exe_dir)/sv_se/pwrb_xtthelp.dat
+      $(exe_dir)/sv_se/pwrb_xtthelp.dat \
+      | silent
 
 clean : 
 
 realclean : clean clean_pwrb_xtthelp clean_pwrb_html clean_baseclasses
 
+silent :
+	@ :
+
 $(load_dir)/pwrb.dbs :
 	@ echo "Generating loadfile for pwrb"
 	@ wb_cmd -q -i create snapshot $(wblflags) /file=\"$(pwre_sroot)/wbl/pwrb/src/\"/out=\"$(target)\"
@@ -52,15 +57,15 @@ $(load_dir)/pwrb.dbs :
 
 $(inc_dir)/pwr_baseclasses.h :
 	@ echo "Generating struct files for pwrb classes..."
-	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) -y $(release_root)/bld/$(type_name)/pwrb.d_h_wbl "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
 
 $(inc_dir)/pwr_baseclasses.hpp :
 	@ echo "Generating hpp files for pwrb classes..."
-	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) -y $(release_root)/bld/$(type_name)/pwrb.d_hpp_wbl "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
 
 $(doc_dir)/en_us/orm/pwrb_allclasses.html :
 	@ echo "Generating html files for pwrb classes en_us..."
-	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/pwrb/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(release_root)/bld/$(type_name)/pwrb.d_html_wbl -g $(pwre_sroot)/wbl/pwrb/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
 	@ echo "Generating html files for pwrb structs en_us..."
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_baseclasses.h
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_baseclasses.hpp
@@ -85,11 +90,11 @@ $(doc_dir)/en_us/orm/pwrb_allclasses.html :
 
 $(exe_dir)/en_us/pwrb_xtthelp.dat :
 	@ echo "Generating xtt help files for pwrb classes en_us"
-	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/pwrb/src/pwrb_c_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us -y $(release_root)/bld/$(type_name)/pwrb.d_en_us_xtthelp_wbl "$(pwre_sroot)/wbl/pwrb/src/pwrb_c_*.wb_load"
 
 $(exe_dir)/sv_se/pwrb_xtthelp.dat :
 	@ echo "Generating xtt help files for pwrb classes sv_se"
-	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/pwrb/src/pwrb_c_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se -y $(release_root)/bld/$(type_name)/pwrb.d_sv_se_xtthelp_wbl "$(pwre_sroot)/wbl/pwrb/src/pwrb_c_*.wb_load"
 
 #$(export_wbl) : $(cnf_dir)/%.wb_vers : %.wb_load
 #       @ write sys$$output "Exporting $< ..."
@@ -100,6 +105,9 @@ clean_pwrb_xtthelp :
 	@ if [ -e $(exe_dir)/en_us/pwrb_xtthelp.dat ]; then \
 		 $(rm) $(rmflags) $(exe_dir)/en_us/pwrb_xtthelp.dat; \
 	  fi
+	@ if [ -e $(exe_dir)/sv_se/pwrb_xtthelp.dat ]; then \
+		 $(rm) $(rmflags) $(exe_dir)/sv_se/pwrb_xtthelp.dat; \
+	  fi
 clean_pwrb_html :
 	@ if [ -e $(doc_dir)/orm/en_us/pwrb_allclasses.html ]; then \
 	        $(rm) $(rmflags) $(doc_dir)/orm/pwrb_*.html; \
@@ -116,3 +124,8 @@ clean_wbl :
 		$(rm) $(rmflags) $(load_dir)/pwrb.dbs; \
 	  fi
 
+-include $(release_root)/bld/$(type_name)/pwrb.d_h_wbl
+-include $(release_root)/bld/$(type_name)/pwrb.d_hpp_wbl
+-include $(release_root)/bld/$(type_name)/pwrb.d_html_wbl
+-include $(release_root)/bld/$(type_name)/pwrb.d_en_us_xtthelp_wbl
+-include $(release_root)/bld/$(type_name)/pwrb.d_sv_se_xtthelp_wbl

src/wbl/pwrs/src/os_templ/hw_templ/makefile

@@ -26,23 +26,28 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
 copy : $(inc_dir)/pwr_systemclasses.h \
-       $(inc_dir)/pwr_systemclasses.hpp
+       $(inc_dir)/pwr_systemclasses.hpp \
+       | silent
 
-lib  : $(load_dir)/pwrs.dbs
+lib  : $(load_dir)/pwrs.dbs | silent
 
 exe : $(doc_dir)/en_us/orm/pwrs_allclasses.html \
       $(exe_dir)/en_us/pwrs_xtthelp.dat \
-      $(exe_dir)/sv_se/pwrs_xtthelp.dat
+      $(exe_dir)/sv_se/pwrs_xtthelp.dat \
+      | silent
 
 clean : $(clean_wbl)
 
 realclean : clean clean_pwrs_xtthelp clean_pwrs_html clean_systemclasses
 
+silent :
+	@ :
+
 $(load_dir)/pwrs.dbs :
 	@ echo "Generating loadfile for pwrs"
 	@ wb_cmd -q -i create snapshot $(wblflags) /file=\"$(pwre_sroot)/wbl/pwrs/src/\"/out=\"$(target)\"
@@ -50,15 +55,15 @@ $(load_dir)/pwrs.dbs :
 
 $(inc_dir)/pwr_systemclasses.h :
 	@ echo "Generating struct files for pwrs classes..."
-	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/pwrs/src/pwrs_c_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) -y $(release_root)/bld/$(type_name)/pwrs.d_h_wbl  "$(pwre_sroot)/wbl/pwrs/src/pwrs_c_*.wb_load"
 
 $(inc_dir)/pwr_systemclasses.hpp :
 	@ echo "Generating hpp files for pwrs classes..."
-	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/pwrs/src/pwrs_c_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) -y $(release_root)/bld/$(type_name)/pwrs.d_hpp_wbl "$(pwre_sroot)/wbl/pwrs/src/pwrs_c_*.wb_load"
 
 $(doc_dir)/en_us/orm/pwrs_allclasses.html :
 	@ echo "Generating html files for pwrs classes en_us..."
-	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/pwrs/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(release_root)/bld/$(type_name)/pwrs.d_html_wbl -g $(pwre_sroot)/wbl/pwrs/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
 	@ echo "Generating html files for pwrs structs en_us..."
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_systemclasses.h
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr.h
@@ -75,11 +80,11 @@ $(doc_dir)/en_us/orm/pwrs_allclasses.html :
 
 $(exe_dir)/en_us/pwrs_xtthelp.dat :
 	@ echo "Generating xtt help files for pwrs classes en_us"
-	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us -y $(release_root)/bld/$(type_name)/pwrs.d_en_us_xtthelp_wbl "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
 
 $(exe_dir)/sv_se/pwrs_xtthelp.dat :
 	@ echo "Generating xtt help files for pwrs classes sv_se"
-	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se -y $(release_root)/bld/$(type_name)/pwrs.d_sv_se_xtthelp_wbl "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
 
 
 #$(export_wbl) : $(cnf_dir)/%.wb_vers : %.wb_load
@@ -108,3 +113,8 @@ clean_systemclasses :
 		$(rm) $(rmflags) $(inc_dir)/pwrs_c_*.h; \
 	  fi
 
+-include $(release_root)/bld/$(type_name)/pwrs.d_h_wbl
+-include $(release_root)/bld/$(type_name)/pwrs.d_hpp_wbl
+-include $(release_root)/bld/$(type_name)/pwrs.d_html_wbl
+-include $(release_root)/bld/$(type_name)/pwrs.d_en_us_xtthelp_wbl
+-include $(release_root)/bld/$(type_name)/pwrs.d_sv_se_xtthelp_wbl

src/wbl/rt/src/os_templ/hw_templ/makefile

@@ -26,20 +26,23 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init :
+init : silent
 
-copy : 
+copy : silent
 
-lib  : $(load_dir)/rt.dbs
+lib  : $(load_dir)/rt.dbs | silent
 
-exe  :
+exe  : silent
 
 clean : $(clean_wbl)
 
 realclean : clean
 
+silent :
+	@ :
+
 $(load_dir)/rt.dbs :
 	@ echo "Generating snapshot for rt"
 	@ wb_cmd -i -q create snapshot /file=\"$(pwre_sroot)/wbl/rt/src/rt.wb_load\"/out=\"$(target)\"

src/wbl/wb/src/os_templ/hw_templ/makefile

@@ -26,13 +26,13 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init :
+init : silent
 
-copy : 
+copy : silent
 
-lib  : $(load_dir)/wb.dbs
+lib  : $(load_dir)/wb.dbs | silent
 
 exe  :
 
@@ -40,6 +40,9 @@ clean : $(clean_wbl)
 
 realclean : clean
 
+silent :
+	@ :
+
 $(load_dir)/wb.dbs :
 	@ echo "Generating snapshot for wb"
 	@ wb_cmd -i -q create snapshot /file=\"$(pwre_sroot)/wbl/wb/src/wb.wb_load\"/out=\"$(target)\"

ssabox/doc/orm/src/os_templ/hw_templ/makefile

@@ -59,21 +59,24 @@ $(doc_dir)/en_us/orm/%.html : ../../%.html
 .PHONY : all init copy lib exe clean realclean \
          $(clean_gif)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
-copy : $(export_gif) $(export_html)
+copy : $(export_gif) $(export_html) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 
 clean :
 
 realclean : clean $(clean_gif) $(clean_html) $(clean_c)
 
+silent :
+	@ :
+
 $(clean_gif) : clean_%.gif : %.gif
 	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
 

tlog/wbl/tlog/src/os_templ/hw_templ/makefile

@@ -27,22 +27,28 @@ endif
 .PHONY : all init copy lib exe clean realclean\
          $(clean_wbl)
 
-all : init copy exe
+all : init copy exe | silent
 
-init :
+init : silent
 
 copy : $(inc_dir)/pwr_tlogclasses.h \
-       $(inc_dir)/pwr_tlogclasses.hpp
+       $(inc_dir)/pwr_tlogclasses.hpp \
+       | silent
 
-lib  : $(load_dir)/tlog.dbs
+lib  : $(load_dir)/tlog.dbs | silent
 
 exe : $(doc_dir)/en_us/orm/tlog_allclasses.html \
-      $(exe_dir)/tlog_xtthelp.dat
+      $(exe_dir)/en_us/tlog_xtthelp.dat \
+      $(exe_dir)/sv_se/tlog_xtthelp.dat \
+      | silent
 
 clean : 
 
 realclean : clean $(clean_wbl)
 
+silent :
+	@ :
+
 $(load_dir)/tlog.dbs :
 	@ echo "Generating loadfile for tlog"
 	@ export pwr_load=$(pwr_eload); \
@@ -51,15 +57,15 @@ $(load_dir)/tlog.dbs :
 
 $(inc_dir)/pwr_tlogclasses.h :
 	@ echo "Generating struct files for tlog classes..."
-	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) -y $(release_root)/bld/$(type_name)/tlog.d_h_wbl "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
 
 $(inc_dir)/pwr_tlogclasses.hpp :
 	@ echo "Generating hpp files for tlog classes..."
-	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) -y $(release_root)/bld/$(type_name)/tlog.d_hpp_wbl "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
 
 $(doc_dir)/en_us/orm/tlog_allclasses.html :
 	@ echo "Generating html files for tlog classes en_us..."
-	@ $(co_convert) -w -d $(doc_dir)/en_us/orm "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(release_root)/bld/$(type_name)/tlog.d_html_wbl "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
 	@ echo "Generating html files for tlog structs en_us..."
 	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_tlogclasses.h
 	@ echo "Generating html files for tlog code en_us..."
@@ -75,11 +81,21 @@ $(doc_dir)/en_us/orm/tlog_allclasses.html :
 	@ echo "Generating postscript file for tlog classes..."
 	@ $(co_convert) -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/tlog/src/tlog_*.wb_load"
 
-$(exe_dir)/tlog_xtthelp.dat :
-	@ echo "Generating xtt help files for tlog classes"
-	@ $(co_convert) -x -d $(exe_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
+$(exe_dir)/en_us/tlog_xtthelp.dat :
+	@ echo "Generating xtt help files for tlog classes en_us"
+	@ $(co_convert) -x -d $(exe_dir)/en_us -y $(release_root)/bld/$(type_name)/tlog.d_en_us_xtthelp_wbl "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
+
+$(exe_dir)/sv_se/tlog_xtthelp.dat :
+	@ echo "Generating xtt help files for tlog classes sv_se"
+	@ $(co_convert) -x -d $(exe_dir)/sv_se -y $(release_root)/bld/$(type_name)/tlog.d_sv_se_xtthelp_wbl "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
 
 clean_wbl :
 	@ if [ -e $(load_dir)/tlog.dbs ]; then \
 		$(rm) $(rmflags) $(load_dir)/tlog.dbs; \
 	  fi
+
+-include $(release_root)/bld/$(type_name)/tlog.d_h_wbl
+-include $(release_root)/bld/$(type_name)/tlog.d_hpp_wbl
+-include $(release_root)/bld/$(type_name)/tlog.d_html_wbl
+-include $(release_root)/bld/$(type_name)/tlog.d_en_us_xtthelp_wbl
+-include $(release_root)/bld/$(type_name)/tlog.d_sv_se_xtthelp_wbl

wb/exp/com/src/os_templ/hw_templ/makefile

@@ -46,13 +46,13 @@ clean_pwr_com := $(patsubst %.pwr_com, clean_%.pwr_com, $(pwr_com_sources))
 .PHONY : all init copy lib exe clean realclean\
          $(clean_sh)
 
-all : init copy
+all : init copy | slient
 
-init :
+init : silent
 
-copy : $(export_sh) $(export_pwr_com)
+copy : $(export_sh) $(export_pwr_com) | silent
 
-lib :
+lib : silent
 
 exe :
 
@@ -60,6 +60,9 @@ clean :
 
 realclean : clean $(clean_sh) $(clean_pwr_com)
 
+silent :
+	@ :
+
 $(export_sh) : $(exe_dir)/%.sh : %.sh
 	@ echo "Exporting $< ..."
 	@ $(cp) $(cpflags) $(source) $(target)

wb/exp/wb/src/os_templ/hw_templ/makefile

@@ -68,14 +68,15 @@ $(src_dir)/%.dat : %.dat
 .PHONY : all init copy lib exe clean realclean \
          clean_obj $(clean_h) $(clean_c) $(clean_dat)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
 copy : $(export_h) $(export_c) $(export_dat) \
-	$(exe_dir)/pwr_wb_palette.cnf
+	$(exe_dir)/pwr_wb_palette.cnf \
+	| silent
 
-lib : $(export_obj) 
+lib : $(export_obj) | silent
 
 exe :
 
@@ -84,6 +85,9 @@ clean : clean_obj
 
 realclean : clean $(clean_h) $(clean_c) $(clean_dat)
 
+silent :
+	@ :
+
 $(exe_dir)/pwr_wb_palette.cnf : ../../pwr_wb_palette.cnf
 	@ echo "Copying pwr_wb_palette.cnf"
 	@ $(cp) $(cpflags) $(source) $(target)

xtt/exe/wb_ge/gtk/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \
+# Link with local wb to avoid profibus wb methods
+
+link = $(ldxx) -L$(release_root)/wb/lib -L$(pwr_lib) -L$(pwr_elib) $(domap) -o $(pwr_exe)/wb_ge_gtk \
 	$(bld_dir)/wb_ge_gtk.o $(wb_msg_eobjs) $(rt_msg_eobjs) $(pwr_eobj)/pwr_msg_glow.o\
 	$(pwr_eobj)/rt_io_user.o $(pwr_eobj)/wb_provider.o \
 	$(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \

xtt/exp/ge/src/os_templ/hw_templ/makefile

@@ -82,21 +82,25 @@ clean_ge := $(clean_pwg) $(clean_pwsg) $(clean_pwgc) $(clean_html)
 .PHONY : all init copy lib exe clean realclean \
          $(clean_ge)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
 copy : $(export_ge)\
-       $(exe_dir)/pwr_css.css
+       $(exe_dir)/pwr_css.css \
+       | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : $(clean_ge)
 
+silent :
+	@ :
+
 $(clean_pwg) : clean_%.pwg : %.pwg
 	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg
 

xtt/exp/inc/src/os_templ/hw_templ/makefile

@@ -37,20 +37,23 @@ clean_includes := $(patsubst %.h,clean_%.h,$(sources))
 .PHONY : all init copy lib exe clean realclean \
          $(clean_includes)
 
-all : init copy lib exe
+all : init copy lib exe | silent
 
-init :
+init : silent
 
-copy : $(export_includes)
+copy : $(export_includes) | silent
 
-lib :
+lib : silent
 
-exe :
+exe : silent
 
 clean :
 
 realclean : $(clean_includes)
 
+silent :
+	@ :
+
 $(clean_includes) : clean_%.h : %.h
 	@ $(rm) $(rmflags) $(inc_dir)/$*.h
 

xtt/lib/xtt/src/xtt_sevhist.h

@@ -60,6 +60,7 @@
 
 class CoWow;
 class CoWowTimer;
+class XttOTree;
 
 //! Window that displays sevhist curve in a SevHistCurve object.
 /*!