From c02ded5c6ae07691831a734d285f6bd7eeff3d59 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 2 Mar 2011 15:08:20 +0000 Subject: [PATCH] link with hello ' --- src/transport/Makefile.am | 31 +++++++++++++++++++++++++-- src/transport/test_transport_api_wlan | 10 ++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 7ce86094d..ee01b00cf 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -261,42 +261,49 @@ test_transport_api_tcp_SOURCES = \ test_transport_api.c test_transport_api_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_tcp_nat_SOURCES = \ test_transport_api.c test_transport_api_tcp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_reliability_tcp_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_reliability_tcp_nat_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_tcp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_udp_SOURCES = \ test_transport_api.c test_transport_api_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la - + test_transport_api_udp_nat_SOURCES = \ test_transport_api.c test_transport_api_udp_nat_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la - + test_transport_api_unix_SOURCES = \ test_transport_api.c test_transport_api_unix_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_plugin_transport_http_SOURCES = \ @@ -305,18 +312,21 @@ test_plugin_transport_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @LIBCURL@ \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_http_SOURCES = \ test_transport_api.c test_transport_api_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_reliability_http_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_plugin_transport_https_SOURCES = \ @@ -325,30 +335,35 @@ test_plugin_transport_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @LIBCURL@ \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_https_SOURCES = \ test_transport_api.c test_transport_api_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_reliability_https_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_unreliability_unix_SOURCES = \ test_transport_api_unreliability.c test_transport_api_unreliability_unix_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_transport_api_unreliability_udp_SOURCES = \ test_transport_api_unreliability.c test_transport_api_unreliability_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la if HAVE_PCAP @@ -357,6 +372,7 @@ test_transport_api_wlan_SOURCES = \ test_transport_api.c test_transport_api_wlan_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la endif endif @@ -365,12 +381,14 @@ test_quota_compliance_tcp_SOURCES = \ test_quota_compliance.c test_quota_compliance_tcp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_quota_compliance_tcp_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la #test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \ @@ -383,12 +401,14 @@ test_quota_compliance_http_SOURCES = \ test_quota_compliance.c test_quota_compliance_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_http_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la #test_quota_compliance_http_asymmetric_send_constant_SOURCES = \ @@ -401,12 +421,14 @@ test_quota_compliance_https_SOURCES = \ test_quota_compliance.c test_quota_compliance_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_quota_compliance_https_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_https_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la #test_quota_compliance_https_asymmetric_send_constant_SOURCES = \ @@ -419,12 +441,14 @@ test_quota_compliance_udp_SOURCES = \ test_quota_compliance.c test_quota_compliance_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la #test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \ @@ -437,12 +461,14 @@ test_quota_compliance_unix_SOURCES = \ test_quota_compliance.c test_quota_compliance_unix_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la test_quota_compliance_unix_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_unix_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -450,6 +476,7 @@ test_transport_api_multi_SOURCES = \ test_transport_api.c test_transport_api_multi_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la EXTRA_DIST = \ gnunet-transport-certificate-creation \ diff --git a/src/transport/test_transport_api_wlan b/src/transport/test_transport_api_wlan index 49f205d3b..e5aab67e8 100755 --- a/src/transport/test_transport_api_wlan +++ b/src/transport/test_transport_api_wlan @@ -1,7 +1,7 @@ -#! /bin/sh +#! /bin/bash # test_transport_api_wlan - temporary wrapper script for .libs/test_transport_api_wlan -# Generated by ltmain.sh (GNU libtool) 2.2.6b +# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2 # # The test_transport_api_wlan program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -32,13 +32,13 @@ DUALCASE=1; export DUALCASE # for MKS sh # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -relink_command="(cd /home/david/Dokumente/gnunet/src/transport; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/usr/lib64/qt-3.3/bin:/usr/kerberos/sbin:/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/david/bin; export PATH; gcc -fno-strict-aliasing -Wall -g -O2 -o \$progdir/\$file test_transport_api.o -L/home/david/lib ../../src/transport/.libs/libgnunettransport.so /home/david/Dokumente/gnunet/src/hello/.libs/libgnunethello.so /home/david/Dokumente/gnunet/src/util/.libs/libgnunetutil.so ../../src/util/.libs/libgnunetutil.so -lgcrypt -lgpg-error -lltdl -lz -lm -ldl -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/transport/.libs -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/hello/.libs -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/util/.libs -Wl,-rpath -Wl,/home/david/lib)" +relink_command="(cd /home/grothoff/svn/gnunet/src/transport; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/grothoff/lib; export LD_LIBRARY_PATH; PATH=/opt/jdk1.6.0_22/bin/:/home/grothoff/gn9/bin:/home/grothoff/bin/:/usr/local/bin:/usr/bin:/bin:/usr/games; export PATH; gcc -fno-strict-aliasing -Wall -g -O0 -Wall -Werror -o \$progdir/\$file test_transport_api.o -L/home/grothoff/gn9//lib ../../src/transport/.libs/libgnunettransport.so ../../src/hello/.libs/libgnunethello.so ../../src/util/.libs/libgnunetutil.so -ldl -Wl,-rpath -Wl,/home/grothoff/svn/gnunet/src/transport/.libs -Wl,-rpath -Wl,/home/grothoff/svn/gnunet/src/hello/.libs -Wl,-rpath -Wl,/home/grothoff/svn/gnunet/src/util/.libs -Wl,-rpath -Wl,/home/grothoff/gn9/lib)" # This environment variable determines our operation mode. if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then # install mode needs the following variables: generated_by_libtool_version='2.2.6b' - notinst_deplibs=' ../../src/transport/libgnunettransport.la /home/david/Dokumente/gnunet/src/hello/libgnunethello.la /home/david/Dokumente/gnunet/src/util/libgnunetutil.la ../../src/util/libgnunetutil.la' + notinst_deplibs=' ../../src/transport/libgnunettransport.la ../../src/hello/libgnunethello.la ../../src/util/libgnunetutil.la' else # When we are sourced in execute mode, $file and $ECHO are already set. if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then @@ -53,7 +53,7 @@ else : else # Restart under the correct shell, and then maybe $ECHO will work. - exec /bin/sh "$0" --no-reexec ${1+"$@"} + exec /bin/bash "$0" --no-reexec ${1+"$@"} fi fi -- 2.25.1