Commit 0c9f1106 authored by Claes Sjofors's avatar Claes Sjofors

Dependency of lidbcxx in pwrrt removed

parent f712c9e4
...@@ -56,7 +56,20 @@ pwre_config_check_include() ...@@ -56,7 +56,20 @@ pwre_config_check_include()
echo "...Checking No $1" echo "...Checking No $1"
fi fi
} }
#
# Search for archive and insert in list
#
# Arguments
# 1: archive name
# 2: define name (PWRE_CONF_$2 will be defined)
# 3: special archives for gtk and motif (lib, gtk, motif)
# 4: variable to insert archive in (rt, wb, gtk, motif)
# 5: if 1, add -DPWRE_CONF_$2 to cc command.
# 6: search list for archive.
# Examples
# pwre_config_check_lib libm LIBM lib lib 0 /usr/lib/libm.so:/usr/lib/libm.a
# pwre_config_check_lib gtk GTK gtk gtk 0 /usr/lib/libgtk-x11-2.0.so
#
pwre_config_check_lib() pwre_config_check_lib()
{ {
let i=0 let i=0
...@@ -96,6 +109,8 @@ pwre_config_check_lib() ...@@ -96,6 +109,8 @@ pwre_config_check_lib()
conf_libgtk=$conf_libgtk" -l${lib%.*}" conf_libgtk=$conf_libgtk" -l${lib%.*}"
elif test $4 == "motif"; then elif test $4 == "motif"; then
conf_libmotif=$conf_libmotif" -l${lib%.*}" conf_libmotif=$conf_libmotif" -l${lib%.*}"
elif test $4 == "wb"; then
conf_libwb=$conf_libwb" -l${lib%.*}"
else else
conf_lib=$conf_lib" -l${lib%.*}" conf_lib=$conf_lib" -l${lib%.*}"
fi fi
...@@ -184,6 +199,7 @@ dos=`eval echo ${pwre_os} | tr [:lower:] [:upper:]` ...@@ -184,6 +199,7 @@ dos=`eval echo ${pwre_os} | tr [:lower:] [:upper:]`
dhw=`eval echo ${pwre_hw} | tr [:lower:] [:upper:]` dhw=`eval echo ${pwre_hw} | tr [:lower:] [:upper:]`
conf_cc_define="-D$dos=1 -D$dhw=1 -DOS=${pwre_os:3} -DHW=${pwre_hw:3} -D_${dos:3}" conf_cc_define="-D$dos=1 -D$dhw=1 -DOS=${pwre_os:3} -DHW=${pwre_hw:3} -D_${dos:3}"
conf_lib="" conf_lib=""
conf_libwb=""
conf_libgtk="" conf_libgtk=""
conf_libmotif="" conf_libmotif=""
conf_libdir="" conf_libdir=""
...@@ -267,6 +283,7 @@ if test $pwre_hw == "hw_arm"; then ...@@ -267,6 +283,7 @@ if test $pwre_hw == "hw_arm"; then
echo "export pwre_conf_libpwrtlog=\"-lpwr_tlog\"" >> $cfile echo "export pwre_conf_libpwrtlog=\"-lpwr_tlog\"" >> $cfile
echo "export pwre_conf_libpwrsev=\"-lpwr_sev\"" >> $cfile echo "export pwre_conf_libpwrsev=\"-lpwr_sev\"" >> $cfile
echo "export pwre_conf_lib=\"-lpthread -lm -lrt -lcrypt\"" >> $cfile echo "export pwre_conf_lib=\"-lpthread -lm -lrt -lcrypt\"" >> $cfile
echo "export pwre_conf_libwb=\"$conf_libwb\"" >> $cfile
echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile
echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile
echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile
...@@ -279,12 +296,13 @@ else ...@@ -279,12 +296,13 @@ else
pwre_config_check_lib gtk GTK gtk gtk 0 /usr/lib/libgtk-x11-2.0.so 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 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 libantlr LIBANTLR lib wb 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 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 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 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 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 libdb LIBDB lib lib 0 /usr/lib/libdb.so
pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 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 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 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 mysql MYSQL lib lib 1 /usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so
...@@ -336,6 +354,7 @@ else ...@@ -336,6 +354,7 @@ else
echo "export pwre_conf_libpwrtlog=\"-lpwr_tlog\"" >> $cfile echo "export pwre_conf_libpwrtlog=\"-lpwr_tlog\"" >> $cfile
echo "export pwre_conf_libpwrsev=\"-lpwr_sev\"" >> $cfile echo "export pwre_conf_libpwrsev=\"-lpwr_sev\"" >> $cfile
echo "export pwre_conf_lib=\"$conf_lib\"" >> $cfile echo "export pwre_conf_lib=\"$conf_lib\"" >> $cfile
echo "export pwre_conf_libwb=\"$conf_libwb\"" >> $cfile
echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile
echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile
echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile
......
...@@ -8,7 +8,7 @@ ifeq ($(export_type),exp) ...@@ -8,7 +8,7 @@ ifeq ($(export_type),exp)
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \ $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
else else
link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_gtk \ link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_gtk \
...@@ -17,7 +17,7 @@ else ...@@ -17,7 +17,7 @@ else
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
$(pwre_conf_libgtk) \ $(pwre_conf_libgtk) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
endif endif
...@@ -8,7 +8,7 @@ ifeq ($(export_type),exp) ...@@ -8,7 +8,7 @@ ifeq ($(export_type),exp)
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \ $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
else else
link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_motif \ link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_motif \
...@@ -17,7 +17,7 @@ else ...@@ -17,7 +17,7 @@ else
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
$(pwre_conf_libmotif) \ $(pwre_conf_libmotif) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
endif endif
...@@ -4,6 +4,7 @@ link_rule_mk := 1 ...@@ -4,6 +4,7 @@ link_rule_mk := 1
link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_objs) $(rt_msg_objs) \ $(export_obj) $(objects) $(wb_msg_objs) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \ $(pwr_obj)/rt_io_user.o \
$(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) \
$(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
...@@ -7,5 +7,5 @@ link_rule_mk := 1 ...@@ -7,5 +7,5 @@ link_rule_mk := 1
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
$(pwre_conf_libgtk) \ $(pwre_conf_libgtk) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
...@@ -7,5 +7,5 @@ link_rule_mk := 1 ...@@ -7,5 +7,5 @@ link_rule_mk := 1
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
$(pwre_conf_libmotif) \ $(pwre_conf_libmotif) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
...@@ -5,6 +5,7 @@ link_rule_mk := 1 ...@@ -5,6 +5,7 @@ link_rule_mk := 1
link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_objs) $(rt_msg_objs) \ $(export_obj) $(objects) $(wb_msg_objs) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \ $(pwr_obj)/rt_io_user.o \
$(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) \
$(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
...@@ -4,6 +4,7 @@ link_rule_mk := 1 ...@@ -4,6 +4,7 @@ link_rule_mk := 1
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \ $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
$(pwre_conf_libdir) $(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_libwb) $(pwre_conf_lib)
endif endif
...@@ -4,6 +4,7 @@ link_rule_mk := 1 ...@@ -4,6 +4,7 @@ link_rule_mk := 1
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \ $(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \
$(pwre_conf_libdir) $(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_libwb) $(pwre_conf_lib)
endif endif
...@@ -5,11 +5,13 @@ ifeq ($(export_type),exp) ...@@ -5,11 +5,13 @@ ifeq ($(export_type),exp)
link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(explinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \ $(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_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) \
$(pwre_conf_libwb) $(pwre_conf_lib)
else else
link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \ $(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_provider.o \ $(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_libpwrwb) $(pwre_conf_libpwrxtt) $(pwre_conf_libpwrrt) \
$(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
endif endif
...@@ -7,6 +7,6 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \ ...@@ -7,6 +7,6 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \ $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
...@@ -7,6 +7,6 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \ ...@@ -7,6 +7,6 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
$(pwre_conf_libdir) $(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_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \ $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrrt) $(pwre_conf_libwb) $(pwre_conf_lib)
endif endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment