diff options
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Makefile.am | 32 | ||||
-rw-r--r-- | src/util/common_logging.c | 8 |
2 files changed, 2 insertions, 38 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 7d347424b..fc8f424dc 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -139,41 +139,11 @@ libgnunetutil_la_LDFLAGS = \ | |||
139 | $(GN_LIB_LDFLAGS) \ | 139 | $(GN_LIB_LDFLAGS) \ |
140 | -version-info 13:2:0 | 140 | -version-info 13:2:0 |
141 | 141 | ||
142 | libgnunetutil_taler_wallet_la_SOURCES = \ | ||
143 | common_allocation.c \ | ||
144 | common_endian.c \ | ||
145 | common_logging.c \ | ||
146 | container_heap.c \ | ||
147 | container_multihashmap.c \ | ||
148 | container_multihashmap32.c \ | ||
149 | crypto_symmetric.c \ | ||
150 | crypto_crc.c \ | ||
151 | crypto_ecc.c \ | ||
152 | crypto_hash.c \ | ||
153 | crypto_hkdf.c \ | ||
154 | crypto_kdf.c \ | ||
155 | crypto_mpi.c \ | ||
156 | crypto_random.c \ | ||
157 | crypto_rsa.c \ | ||
158 | strings.c \ | ||
159 | time.c | ||
160 | |||
161 | libgnunetutil_taler_wallet_la_LIBADD = \ | ||
162 | $(LIBGCRYPT_LIBS) \ | ||
163 | -lunistring | ||
164 | |||
165 | libgnunetutil_taler_wallet_la_LDFLAGS = \ | ||
166 | $(GN_LIB_LDFLAGS) \ | ||
167 | -version-info 0:0:0 | ||
168 | |||
169 | if HAVE_TESTING | 142 | if HAVE_TESTING |
170 | GNUNET_ECC = gnunet-ecc | 143 | GNUNET_ECC = gnunet-ecc |
171 | GNUNET_SCRYPT = gnunet-scrypt | 144 | GNUNET_SCRYPT = gnunet-scrypt |
172 | endif | 145 | endif |
173 | 146 | ||
174 | if TALER_ONLY | ||
175 | lib_LTLIBRARIES = libgnunetutil_taler_wallet.la | ||
176 | else | ||
177 | lib_LTLIBRARIES = libgnunetutil.la | 147 | lib_LTLIBRARIES = libgnunetutil.la |
178 | 148 | ||
179 | libexec_PROGRAMS = \ | 149 | libexec_PROGRAMS = \ |
@@ -201,8 +171,6 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT | |||
201 | TESTS = $(check_PROGRAMS) | 171 | TESTS = $(check_PROGRAMS) |
202 | endif | 172 | endif |
203 | 173 | ||
204 | endif | ||
205 | |||
206 | gnunet_timeout_SOURCES = \ | 174 | gnunet_timeout_SOURCES = \ |
207 | gnunet-timeout.c | 175 | gnunet-timeout.c |
208 | 176 | ||
diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 430f75e70..27ac88a05 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c | |||
@@ -294,7 +294,6 @@ resize_logdefs () | |||
294 | } | 294 | } |
295 | 295 | ||
296 | 296 | ||
297 | #if ! TALER_WALLET_ONLY | ||
298 | /** | 297 | /** |
299 | * Rotate logs, deleting the oldest log. | 298 | * Rotate logs, deleting the oldest log. |
300 | * | 299 | * |
@@ -403,9 +402,6 @@ setup_log_file (const struct tm *tm) | |||
403 | } | 402 | } |
404 | 403 | ||
405 | 404 | ||
406 | #endif | ||
407 | |||
408 | |||
409 | /** | 405 | /** |
410 | * Utility function - adds a parsed definition to logdefs array. | 406 | * Utility function - adds a parsed definition to logdefs array. |
411 | * | 407 | * |
@@ -731,7 +727,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile) | |||
731 | log_file_name = GNUNET_STRINGS_filename_expand (logfile); | 727 | log_file_name = GNUNET_STRINGS_filename_expand (logfile); |
732 | if (NULL == log_file_name) | 728 | if (NULL == log_file_name) |
733 | return GNUNET_SYSERR; | 729 | return GNUNET_SYSERR; |
734 | #if TALER_WALLET_ONLY || defined(GNUNET_CULL_LOGGING) | 730 | #if defined(GNUNET_CULL_LOGGING) |
735 | /* log file option not allowed for wallet logic */ | 731 | /* log file option not allowed for wallet logic */ |
736 | GNUNET_assert (NULL == logfile); | 732 | GNUNET_assert (NULL == logfile); |
737 | return GNUNET_OK; | 733 | return GNUNET_OK; |
@@ -1023,7 +1019,7 @@ mylog (enum GNUNET_ErrorType kind, | |||
1023 | } | 1019 | } |
1024 | 1020 | ||
1025 | vsnprintf (buf, size, message, va); | 1021 | vsnprintf (buf, size, message, va); |
1026 | #if ! (defined(GNUNET_CULL_LOGGING) || TALER_WALLET_ONLY) | 1022 | #if ! defined(GNUNET_CULL_LOGGING) |
1027 | if (NULL != tmptr) | 1023 | if (NULL != tmptr) |
1028 | (void) setup_log_file (tmptr); | 1024 | (void) setup_log_file (tmptr); |
1029 | #endif | 1025 | #endif |