V4.8 build on fedora 14

build-howto.info

@@ -10,8 +10,8 @@ g++
 make
 flex
 libgtk2.0-dev
-libdb4.6-dev  (Any Berkeley DB version > 4.3, on Fedora db4-devel)
-libdb4.6++-dev
+libdb4.8-dev  (Any Berkeley DB version > 4.3, on Fedora db4-devel)
+libdb4.8++-dev
 libasound2-dev (on Fedora alsa-lib-devel)
 doxygen
 libmysql++-dev (optional)
@@ -35,8 +35,8 @@ g++
 libgtk2.0-dev
 cpp
 libasound2-dev
-libdb4.6-dev
-libdb4.6++-dev
+libdb4.8-dev
+libdb4.8++-dev
 doxygen
 libmysql++-dev (optional)
 
@@ -60,11 +60,11 @@ There has to be a valid display when building proview.
 -----------
 Unpack the source package
 
-> tar -xzvf pwrsrc_4.7.0.tar.gz
+> tar -xzvf pwrsrc_4.8.0.tar.gz
 
 Enter the sourcecode root directory
 
-> cd pwr_4.7.0
+> cd pwr_4.8.0
 
 Execute the makefile
 
@@ -86,8 +86,8 @@ handle different version of proview.
 The first thing to do is to set up your environment properly. Add the 
 following lines to .bashrc:
 
-# Where /home/robert/x4-7-0 is replaced with wherever you unpacked the sources.
-export pwre_bin="/home/robert/x4-7-0/pwr/src/tools/pwre/src/os_linux"
+# Where /home/robert/x4-8-0 is replaced with wherever you unpacked the sources.
+export pwre_bin="/home/robert/x4-8-0/pwr/src/tools/pwre/src/os_linux"
 export pwre_dir_symbols="$pwre_bin/dir_symbols.mk"
 source $pwre_bin/pwre_function
 export pwre_env_db="/home/robert/pwre_new"
@@ -107,10 +107,10 @@ Add environment named 'x460x86' (choose any name you like).
 
 > pwre add x460x86
 
-Source root [...] ? /home/robert/x4-7-0/pwr/src  (where /home/robert/x4-7-0 is
+Source root [...] ? /home/robert/x4-8-0/pwr/src  (where /home/robert/x4-8-0 is
 replaced with wherever you unpacked the sources)
 Import root [] ?
-Build root [...] ? /home/robert/pwr/x4-7-0/rls_dbg  (choose typically .../pwr/version/rls_dbg)
+Build root [...] ? /home/robert/pwr/x4-8-0/rls_dbg  (choose typically .../pwr/version/rls_dbg)
 Build type [dbg] ? 
 OS [linux] ? 		(linux or macos)
 Hardware [x86] ? 	(x86 or x86_64)
@@ -207,7 +207,7 @@ Copy some files to this directory (if they do not already exist)
 Create a file name pwr_projectlist.dat in this directory and add the following
 line to this file:
 
-%base X4.7.0	/home/robert/pwr/X4-7-0/rls_dbg
+%base X4.8.0	/home/robert/pwr/X4-8-0/rls_dbg
 
 where the path is your build-root ($pwre_broot).
 

nmps/exe/rs_nmps_bck/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-        $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

nmps/exe/rs_nmps_mirror/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o\
-        $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

nmps/exe/rs_nmps_trans/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o -lpwr_nmps\
-        $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

opc/exe/opc_provider/src/os_templ/link_rule.mk

@@ -2,6 +2,6 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(pwre_conf_libpwropc) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(export_obj) $(pwre_conf_libdir) $(pwre_conf_libpwropc) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

opc/exe/opc_server/src/os_templ/link_rule.mk

@@ -2,6 +2,6 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(pwre_conf_libpwropc) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(export_obj) $(pwre_conf_libdir) $(pwre_conf_libpwropc) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

profibus/exe/pn_get_deviceid/src/os_templ/link_rule.mk

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

profibus/exe/profinet_viewer/gtk/os_templ/link_rule.mk

@@ -7,7 +7,7 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewe
 	$(bld_dir)/pn_viewer.o $(bld_dir)/pn_viewernav.o $(bld_dir)/pn_viewer_pnac.o\
 	$(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

profibus/exe/profinet_viewer/src/os_templ/link_rule.mk

@@ -2,6 +2,6 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(export_obj) $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        -lpwr_remote $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        -lpwr_remote $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) $(rs_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -4,7 +4,7 @@ link_rule_mk := 1
 ifeq ($(pwre_conf_mq),1)
   link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 else
   link = echo "Mq not installed"
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

sev/exe/sev_ini/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-        $(pwre_conf_libpwrsev) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrsev) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

sev/exe/sev_server/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-        $(pwre_conf_libpwrsev) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrsev) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

sev/exe/sev_xtt/gtk/os_templ/link_rule.mk

@@ -7,7 +7,7 @@ link_rule_mk := 1
 	$(bld_dir)/xtt_tblnav.o $(bld_dir)/xtt_tbl_command.o \
 	$(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

sev/exe/sev_xtt/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-        $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -121,23 +121,23 @@ clean_pdf := $(patsubst %.pdf,clean_%.pdf,$(pdf_sources))
 targetsuffixes := _single.html
 nopdf_targetsuffixes := _single.html
 
-sv_se_xmlsources := dbpwr.xml upgrade42.xml
-en_us_xmlsources := pwrgsg.xml upgrade42.xml
+#sv_se_xmlsources := dbpwr.xml upgrade42.xml
+#en_us_xmlsources := pwrgsg.xml upgrade42.xml
 en_us_xml_nopdf_sources := changelog.xml
 
 #add on the following line master files that include their parts / chapters by means of xinclude
 #also add an explicit rule for each master file below
-xi_dependents := $(pwre_sroot)/doc/man/sv_se/dbpwr.xml
+#xi_dependents := $(pwre_sroot)/doc/man/sv_se/dbpwr.xml
 
-sv_se_xmltargets := $(addprefix $(pwre_sroot)/doc/man/sv_se/, \
-	$(foreach targetsuffix, $(targetsuffixes), \
-	$(foreach basefile, $(basename $(sv_se_xmlsources)), \
-	$(addsuffix $(targetsuffix), $(basefile)))))
+#sv_se_xmltargets := $(addprefix $(pwre_sroot)/doc/man/sv_se/, \
+#	$(foreach targetsuffix, $(targetsuffixes), \
+#	$(foreach basefile, $(basename $(sv_se_xmlsources)), \
+#	$(addsuffix $(targetsuffix), $(basefile)))))
 
-en_us_xmltargets := $(addprefix $(pwre_sroot)/doc/man/en_us/, \
-	$(foreach targetsuffix, $(targetsuffixes), \
-	$(foreach basefile, $(basename $(en_us_xmlsources)), \
-	$(addsuffix $(targetsuffix), $(basefile)))))
+#en_us_xmltargets := $(addprefix $(pwre_sroot)/doc/man/en_us/, \
+#	$(foreach targetsuffix, $(targetsuffixes), \
+#	$(foreach basefile, $(basename $(en_us_xmlsources)), \
+#	$(addsuffix $(targetsuffix), $(basefile)))))
 
 en_us_xml_nopdf_targets := $(addprefix $(pwre_sroot)/doc/man/en_us/, \
 	$(foreach targetsuffix, $(nopdf_targetsuffixes), \
@@ -439,24 +439,24 @@ $(doc_dir)/en_us/man_exlib.pdf : $(pwre_sroot)/doc/man/en_us/man_exlib.dat
 
 # implicit rules, docbook-related, added by jonas_h 2006-04-nn
 
-%.fo :: %.xml
-	$(xsltproc) $(xsltproc_args) $(fo_xsl) $(source) > $(target)
+#%.fo :: %.xml
+#	$(xsltproc) $(xsltproc_args) $(fo_xsl) $(source) > $(target)
 
 $(pwre_sroot)/doc/man/%.pdf : $(pwre_sroot)/doc/man/%.fo $(pwre_sroot)/doc/man/src/pwrtitlepages.xsl
 	$(fop) $(source) -pdf $(target)
 	rm -f $(source)
 
-$(pwre_sroot)/doc/man/%_single.html : $(pwre_sroot)/doc/man/%.xml 
-	@ if [ "$(PWRE_ARGS)" = "docbook" ]; then \
-	    echo "xsltproc $(source)"; \
-	    $(xsltproc) $(xsltproc_args) -o $(target) $(html_xsl) $(source); \
-	  fi
+#$(pwre_sroot)/doc/man/%_single.html : $(pwre_sroot)/doc/man/%.xml 
+#	@ if [ "$(PWRE_ARGS)" = "docbook" ]; then \
+#	    echo "xsltproc $(source)"; \
+#	    $(xsltproc) $(xsltproc_args) -o $(target) $(html_xsl) $(source); \
+#	  fi
 
-$(doc_dir)/en_us/%_index.html :: $(pwre_sroot)/doc/man/en_us/%.xml
-	$(xsltproc) $(xsltproc_args) $(chunk_args_en_us) $(chunk_xsl) $(source)
+#$(doc_dir)/en_us/%_index.html :: $(pwre_sroot)/doc/man/en_us/%.xml
+#	$(xsltproc) $(xsltproc_args) $(chunk_args_en_us) $(chunk_xsl) $(source)
 
-$(doc_dir)/sv_se/%_index.html :: $(pwre_sroot)/doc/man/sv_se/%.xml
-	$(xsltproc) $(xsltproc_args) $(chunk_args_sv_se) $(chunk_xsl) $(source)
+#$(doc_dir)/sv_se/%_index.html :: $(pwre_sroot)/doc/man/sv_se/%.xml
+#	$(xsltproc) $(xsltproc_args) $(chunk_args_sv_se) $(chunk_xsl) $(source)
 
 $(doc_dir)/sv_se/%.css $(doc_dir)/en_us/%.css :: $(pwre_sroot)/doc/man/src/%.css
 	@ echo "copy $(source)"
@@ -468,12 +468,12 @@ $(doc_dir)/% :: $(pwre_sroot)/doc/man/src/%
 	@ cp $(source) $(target)
 
 # Rule for creating titlepage xsl templates
-$(pwre_sroot)/doc/man/src/pwrtitlepages.xsl :: $(pwre_sroot)/doc/man/src/pwrtitlepage.spec.xml
-	$(xsltproc) -o $(target) $(docbook_stylesheetdir)/template/titlepage.xsl $(source)
+#$(pwre_sroot)/doc/man/src/pwrtitlepages.xsl :: $(pwre_sroot)/doc/man/src/pwrtitlepage.spec.xml
+#	$(xsltproc) -o $(target) $(docbook_stylesheetdir)/template/titlepage.xsl $(source)
 
 # explicit rules updating dependent master files if their includes have been changed.
-%/dbpwr.xml :: %/dbpwr_intro.xml %/dbpwr_editering.xml %/dbpwr_exempel.xml %/dbpwr_utdata.xml %/dbpwr_omdocbook.xml 
-	touch $(target)
+#%/dbpwr.xml :: %/dbpwr_intro.xml %/dbpwr_editering.xml %/dbpwr_exempel.xml %/dbpwr_utdata.xml %/dbpwr_omdocbook.xml 
+#	touch $(target)
 
 #end of
 

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

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

src/exe/co_merge/src/os_templ/link_rule.mk

@@ -2,6 +2,6 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) $(export_obj) \
-	$(objects) -lpwr_co $(pwre_conf_lib)
+	$(objects) -lpwr_co $(pwre_conf_libdir) $(pwre_conf_lib)
 
 endif

src/exe/pwr_user/src/os_templ/link_rule.mk

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -2,7 +2,7 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) $(export_obj) \
-	$(objects) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+	$(objects) $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
 
 
 endif

src/exe/rt_elog/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
 
 endif

src/exe/rt_emon/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_emon/src/rt_emon.c

@@ -2168,7 +2168,7 @@ handleMessage (
   mh_sHead *hp;
   XDR xdrs;
 
-  switch (get->type.b) {
+  switch ( (int)get->type.b) {
   case mh_cMsgClass:
     hp = (mh_sHead*) get->data;
     if (hp->xdr) {

src/exe/rt_fast/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_gdhget/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_ini/src/os_templ/link_rule.mk

@@ -5,11 +5,11 @@ ifeq ($(export_type),exp)
   link = $(ld) $(explinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\
 	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
 else
    link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\
 	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
 endif
 endif

src/exe/rt_io_comm/src/os_templ/link_rule.mk

@@ -2,15 +2,15 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 ifeq ($(export_type),exp)			 
-  link = $(ld) $(explinkflags) $(domap) -o $(export_exe) \
+  link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) \
 	$(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrotherio)
 else
-  link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
+  link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 endif
 endif

src/exe/rt_neth_acp/src/rt_neth_acp.c

@@ -85,7 +85,7 @@ main (
       continue;
     }
 
-    switch (get.type.s) {
+    switch ( (int)get.type.s) {
     case net_eMsg_nodeUp:
       nodeUp((net_sNodeUp *) mp);
       break;

src/exe/rt_pvd_udb/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_rtt/src/os_templ/link_rule.mk

@@ -3,7 +3,7 @@ link_rule_mk := 1
 
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) $(pwr_obj)/dtt_rttsys.o\
-	$(pwr_obj)/rt_io_user.o $(pwr_lib)/libpwr_dtt.a -L$(pwr_elib)\
+	$(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) $(pwr_conf_libpwrdtt) -L$(pwr_elib)\
 	$(pwre_conf_libpwrdtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_sevhistmon/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_sevhistmon/src/rt_sevhistmon.cpp

@@ -1020,9 +1020,9 @@ int rt_sevhistmon::mainloop()
       continue;
     }
 
-    switch (get.type.b) {
+    switch ( (int)get.type.b) {
       case sev_cMsgClass:
-        switch ( get.type.s) {
+        switch ( (int)get.type.s) {
           case sev_eMsgType_NodeUp:
             printf("rt_sevhistmon: Node up recevied\n");
             send_itemlist( get.sender.nid);

src/exe/rt_statussrv/src/os_templ/link_rule.mk

@@ -3,7 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) $(pwr_obj)/stdsoap2.o\
-	-lpwr_statussrv \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/rt_sysmon/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exe/wb_rtt/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs)\
 	$(pwr_obj)/rt_io_user.o -L$(pwr_elib) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/tools/bld/src/os_linux/link_rule_generic.mk

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/tools/exe/tools_cmsg2c/src/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_lib)
+link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_libdir) $(pwre_conf_lib)
 
 endif

src/tools/exe/tools_javac/src/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_lib)
+link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_libdir) $(pwre_conf_lib)
 
 endif

src/tools/exe/tools_msg2cmsg/src/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_lib)
+link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_libdir) $(pwre_conf_lib)
 
 endif

src/tools/exe/tools_pdrgen/src/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_lib)
+link = $(ld) $(linkflags) $(domap) -o $(export_exe) $(export_obj) $(objects) $(pwre_conf_libdir) $(pwre_conf_lib)
 
 endif

src/tools/pkg/rpm/pwr/build.sh

@@ -190,11 +190,17 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
 # Create package
 echo "-- Building package"
 
-  rpmbuild -bb  --quiet \
+ rpmbuild -bb  \
                 --define "_topdir $pkgroot/rpm" \
                 --define "ver $ver" \
                 --define "pwre_target $pwre_target" \
-                --buildroot $pkgroot $pkgsrc/pwr.spec > /dev/null 2>&1
+                --buildroot $pkgroot $pkgsrc/pwr.spec
+
+# rpmbuild -bb  --quiet \
+#                --define "_topdir $pkgroot/rpm" \
+#                --define "ver $ver" \
+#                --define "pwre_target $pwre_target" \
+#                --buildroot $pkgroot $pkgsrc/pwr.spec > /dev/null 2>&1
 
 mv $pkgroot/rpm/RPMS/i386/*.rpm $pwre_broot/$pwre_target/bld/pkg/.
 rm -r $pkgroot

src/tools/pkg/rpm/pwr/pwr.spec

@@ -8,9 +8,9 @@
 #
 
 
-Name: pwr47
+Name: pwr48
 Summary: Proview/R development and runtime environment
-Version: 4.7.1
+Version: 4.8.0
 Release: 1
 License: GPL
 BuildArch: i386
@@ -78,7 +78,7 @@ co_convert -t -d %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/doc %{buildroot}/
   echo "</head></html>"
 } > %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/doc/en_us/package_version.html
 
-#%clean
+%clean
 
 %files
 %defattr(-,root,root)
@@ -200,5 +200,5 @@ fi
 #%postun
 
 %changelog
-* Fri Aug 27 2010 Claes Sjofors <claes.sjofors@proview.se> 4.7.1-1
+* Sun Nov 28 2010 Claes Sjofors <claes.sjofors@proview.se> 4.8.0-1
   - Base release.

src/tools/pkg/rpm/pwrdemo/pwrdemo.spec

@@ -8,9 +8,9 @@
 #
 
 
-Name:		pwrdemo47
+Name:		pwrdemo48
 Summary: 	Proview/R demo project
-Version:        4.7.1
+Version:        4.8.0
 Release: 	1
 License:        GPL
 BuildArch:      i386
@@ -27,7 +27,7 @@ For more information please see www.proview.se.
 
 #%install
 
-#%clean
+%clean
 
 %files
 %defattr(-,root,root)
@@ -128,6 +128,6 @@ fi
 #%postun
 
 %changelog
-* Fri Aug 27 2010 Claes Sjofors <claes.sjofors@proview.se> 4.7.1-1
+* Sun Nov 28 2010 Claes Sjofors <claes.sjofors@proview.se> 4.8.0-1
 - Base release
  

src/tools/pkg/rpm/pwrrt/build.sh

@@ -182,7 +182,7 @@ cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwrrt/cnf/user
 # Create package
 echo "-- Building package"
 
-  rpmbuild -bb --quiet \
+ rpmbuild -bb --quiet \
                --define "_topdir $pkgroot/rpm" \
                --buildroot $pkgroot $pkgsrc/pwrrt.spec > /dev/null 2>&1
 

src/tools/pkg/rpm/pwrrt/pwrrt.spec

@@ -10,7 +10,7 @@
 
 Name: pwrrt
 Summary: Proview/R runtime environment
-Version: 4.7.1
+Version: 4.8.0
 Release: 1
 License: GPL
 BuildArch: i386
@@ -80,7 +80,7 @@ co_convert -t -d %{buildroot}/usr/pwrrt/doc %{buildroot}/usr/pwrrt/exe/xtt_versi
 # Print rt version file
 echo "Version: %{version}-%{release}" > %{buildroot}/usr/pwrrt/exe/rt_version.dat
 
-#%clean
+%clean
 
 %files
 %defattr(-,root,root)
@@ -486,5 +486,5 @@ fi
 #%postun
 
 %changelog
-* Fri Aug 27 2010 Claes Sjofors <claes.sjofors@proview.se> 4.7.1-1
+* Sun Nov 28 2010 Claes Sjofors <claes.sjofors@proview.se> 4.8.0-1
   - Base release.

src/tools/pkg/rpm/pwrsev/pwrsev.spec

@@ -10,7 +10,7 @@
 
 Name: pwrsev
 Summary: Proview/R storage environment
-Version: 4.7.1
+Version: 4.8.0
 Release: 1
 License: GPL
 BuildArch: i386
@@ -77,7 +77,7 @@ co_convert -t -d %{buildroot}/usr/pwrsev/doc %{buildroot}/usr/pwrsev/exe/sev_xtt
   echo "</head></html>"
 } > %{buildroot}/usr/pwrsev/doc/en_us/package_version.html
 
-#%clean
+%clean
 
 %files
 %defattr(-,root,root)
@@ -419,5 +419,5 @@ fi
 #%postun
 
 %changelog
-* Fri Aug 27 2010 Claes Sjofors <claes.sjofors@proview.se> 4.7.1-1
+* Sun Nov 28 2010 Claes Sjofors <claes.sjofors@proview.se> 4.8.0-1
   - Base release.

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -274,25 +274,26 @@ if test $pwre_hw == "hw_arm"; then
   echo "export pwre_conf_incdirgtk=\"$conf_incdirgtk\"" >> $cfile
   echo "export pwre_conf_dtt_platform=\"arm_linux\"" >> $cfile
 else
-#Gtk
 
+  #Gtk
   pwre_config_check_lib gtk    	  GTK      gtk gtk 0 /usr/lib/libgtk-x11-2.0.so
   pwre_config_check_lib motif     MRM      motif motif 0 /usr/lib/libMrm.so
 
   pwre_config_check_lib libantlr  LIBANTLR lib lib 0 /usr/local/lib/libantlr.a
   pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 /usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a
-  pwre_config_check_lib libasound LIBASOUND lib lib 0 /usr/lib/libasound.so:usr/lib/libasound.a
-  pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 /usr/lib/libpthread.so:usr/lib/libpthread.a
-  pwre_config_check_lib libm      LIBM     lib lib 0 /usr/lib/libm.so:usr/lib/libm.a
+  pwre_config_check_lib libasound LIBASOUND lib lib 0 /usr/lib/libasound.so:/usr/lib/libasound.a
+  pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 /usr/lib/libpthread.so:/usr/lib/libpthread.a
+  pwre_config_check_lib libm      LIBM     lib lib 0 /usr/lib/libm.so:/usr/lib/libm.a
   pwre_config_check_lib libdb_cxx LIBDB_CXX lib lib 0 /usr/lib/libdb_cxx.so
-  pwre_config_check_lib libz      LIBZ     lib lib 0 /usr/lib/libz.so:usr/lib/libz.a
-  pwre_config_check_lib libcrypt  LIBCRYPT lib lib 0 /usr/lib/libcrypt.so:usr/lib/libcrypt.a
-  pwre_config_check_lib mysql     MYSQL    lib lib 1 /usr/lib/libmysqlclient.so
+  pwre_config_check_lib libz      LIBZ     lib lib 0 /usr/lib/libz.so:/usr/lib/libz.a
+  pwre_config_check_lib libcrypt  LIBCRYPT lib lib 0 /usr/lib/libcrypt.so:/usr/lib/libcrypt.a
+  pwre_config_check_lib mysql     MYSQL    lib lib 1 /usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so
   pwre_config_check_lib mq        MQ       lib lib 1 /usr/lib/libdmq.so
   pwre_config_check_lib libpnioif PNAK     lib lib 1 /usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a
   pwre_config_check_lib libusb    LIBUSB   lib lib 1 /usr/lib/libusb-1.0.so
-  pwre_config_check_lib librt     LIBRT    lib lib 0 /usr/lib/librt.so:usr/lib/librt.a
-  pwre_config_check_lib libfl     LIBFL    lib lib 0 /usr/lib/libfl.so:usr/lib/libfl.a
+  pwre_config_check_lib librt     LIBRT    lib lib 0 /usr/lib/librt.so:/usr/lib/librt.a
+  pwre_config_check_lib libfl     LIBFL    lib lib 0 /usr/lib/libfl.so:/usr/lib/libfl.a
+  pwre_config_check_lib libX11    LIBX11   lib lib 0 /usr/lib/libX11.so
 
 #set -o xtrace
 

tlog/exe/rs_tlog/src/os_templ/link_rule.mk

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

wb/exe/wb/gtk/os_templ/link_rule.mk

@@ -5,7 +5,7 @@ ifeq ($(export_type),exp)
   link = $(ldxx) $(explinkflags) $(domap) -o $(pwr_exe)/wb_gtk \
 	$(bld_dir)/wb_gtk.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
-	$(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
@@ -14,7 +14,7 @@ else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_gtk \
 	$(bld_dir)/wb_gtk.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
-	$(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)

wb/exe/wb/motif/os_templ/link_rule.mk

@@ -5,33 +5,19 @@ ifeq ($(export_type),exp)
   link = $(ldxx) $(explinkflags) $(domap) -o $(pwr_exe)/wb_motif \
 	$(bld_dir)/wb_motif.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
-	$(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
-#	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-#	-L/opt/gnome/lib \
-#	-lpwr_wb_motif -lpwr_wb -lpwr_wb_motif -lpwr_wb -lpwr_rt -lpwr_ge_motif -lpwr_ge \
-#	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_cow_motif -lpwr_cow -lpwr_co \
-#	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lXmu -lSM -lICE\
-#	-lrpcsvc -lpthread -lm -ldb_cxx -lz -lcrypt $(linkmysql)
 else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_motif \
 	$(bld_dir)/wb_motif.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
-	$(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
-#	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-#	-L/opt/gnome/lib \
-#	-lpwr_wb_motif -lpwr_wb -lpwr_rt -lpwr_ge_motif -lpwr_ge \
-#	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_cow_motif -lpwr_cow -lpwr_co \
-#	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lXmu -lSM -lICE\
-#	-lrpcsvc -lpthread -lm -ldb_cxx -lz -lcrypt $(linkmysql)
 endif
 endif

wb/exe/wb/src/os_templ/link_rule.mk

@@ -4,13 +4,13 @@ link_rule_mk := 1
 ifeq ($(export_type),exp)			 
   link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \
 	$(bld_dir)/wb.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 #-lpwr_co
 else
   link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(bld_dir)/wb.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 #-lpwr_co
 endif

wb/exe/wb_cmd/gtk/os_templ/link_rule.mk

@@ -4,7 +4,7 @@ link_rule_mk := 1
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_cmd_gtk \
 	$(bld_dir)/wb_cmd_gtk.o $(bld_dir)/wb_cmd_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
-	$(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)

wb/exe/wb_cmd/motif/os_templ/link_rule.mk

@@ -4,16 +4,8 @@ link_rule_mk := 1
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_cmd_motif \
 	$(bld_dir)/wb_cmd_motif.o $(bld_dir)/wb_cmd_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
-	$(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
-
-#	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-#	-L/opt/gnome/lib \
-#	-lpwr_wb_motif -lpwr_wb -lpwr_rt -lpwr_ge_motif -lpwr_ge \
-#	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_cow_motif -lpwr_cow -lpwr_co \
-#	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lXmu -lSM -lICE\
-#	-l crypt -lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)
 endif

wb/exe/wb_cmd/src/os_templ/link_rule.mk

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

wb/exe/wb_ldlist/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
-	$(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

wb/exe/wb_upgrade/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
-	$(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -4,7 +4,7 @@ link_rule_mk := 1
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/co_help_gtk \
 	$(bld_dir)/co_help_gtk.o $(bld_dir)/help_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

xtt/exe/co_help/src/os_templ/link_rule.mk

@@ -3,5 +3,5 @@ link_rule_mk := 1
 
   link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) \
-	$(pwre_conf_libpwrco) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrco) $(pwre_conf_lib)
 endif

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

@@ -5,7 +5,7 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/pwr_rtmon_gtk \
 	$(bld_dir)/pwr_rtmon_gtk.o \
 	$(pwr_eobj)/stdsoap2.o \
 	$(wb_msg_eobjs) $(rt_msg_eobjs) \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

xtt/exe/pwr_rtmon/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o\
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -5,7 +5,7 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_statusmon_gtk \
 	$(bld_dir)/rt_statusmon_gtk.o \
 	$(pwr_eobj)/stdsoap2.o \
 	$(wb_msg_eobjs) $(rt_msg_eobjs) \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

xtt/exe/rt_statusmon/src/os_templ/link_rule.mk

@@ -2,6 +2,6 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) $(export_obj) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

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

@@ -5,7 +5,7 @@ ifeq ($(export_type),exp)
   link = $(ldxx) $(explinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
 	$(bld_dir)/rt_xtt_gtk.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
@@ -14,7 +14,7 @@ else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
 	$(bld_dir)/rt_xtt_gtk.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)

xtt/exe/rt_xtt/motif/os_templ/link_rule.mk

@@ -5,7 +5,7 @@ ifeq ($(export_type),exp)
   link = $(ldxx) $(explinkflags) $(domap) -o $(pwr_exe)/rt_xtt_motif \
 	$(bld_dir)/rt_xtt_motif.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
@@ -14,7 +14,7 @@ else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_motif \
 	$(bld_dir)/rt_xtt_motif.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
 	$(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)

xtt/exe/rt_xtt/src/os_templ/link_rule.mk

@@ -3,12 +3,5 @@ link_rule_mk := 1
 
   link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
-#	$(export_obj) $(rt_msg_eobjs) \
-#	$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib\
-#	-L/opt/gnome/lib \
-#	-lpwr_xtt -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \
-#	-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lSM -lICE\
-#	-ldb -lrpcsvc -lpthread -lm -lrt -lasound
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 endif

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

@@ -4,7 +4,7 @@ link_rule_mk := 1
 link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(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_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)

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

@@ -4,7 +4,7 @@ link_rule_mk := 1
 link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
 	$(bld_dir)/wb_ge_motif.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_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)

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

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

xtt/exe/xtt_ge_jprint/src/os_templ/link_rule.mk

@@ -3,6 +3,6 @@ link_rule_mk := 1
 
 link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) \
-	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libdir) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif