[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7961 - in GNUnet/src: applications/advertising application
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7961 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat/lib applications/chat/module applications/chat/tools applications/datastore applications/dht/module applications/dht/tools applications/dstore_mysql applications/dstore_sqlite applications/fragmentation applications/fs applications/fs/collection applications/fs/ecrs applications/fs/fsui applications/fs/gap applications/fs/lib applications/fs/namespace applications/fs/tools applications/fs/uritrack applications/getoption applications/hostlist applications/identity applications/kvstore_sqlite applications/pingpong applications/rpc applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/state applications/stats applications/tbench applications/template applications/testing applications/topology_default applications/tracekit applications/traffic applications/transport libs/mysql server setup setup/cocoa setup/gtk setup/ncurses setup/qt setup/text transports transports/upnp |
|
Date: |
Sat, 22 Nov 2008 00:23:52 -0700 (MST) |
Author: holindho
Date: 2008-11-22 00:23:52 -0700 (Sat, 22 Nov 2008)
New Revision: 7961
Modified:
GNUnet/src/applications/advertising/Makefile.am
GNUnet/src/applications/bootstrap_http/Makefile.am
GNUnet/src/applications/chat/lib/Makefile.am
GNUnet/src/applications/chat/module/Makefile.am
GNUnet/src/applications/chat/tools/Makefile.am
GNUnet/src/applications/datastore/Makefile.am
GNUnet/src/applications/dht/module/Makefile.am
GNUnet/src/applications/dht/tools/Makefile.am
GNUnet/src/applications/dstore_mysql/Makefile.am
GNUnet/src/applications/dstore_sqlite/Makefile.am
GNUnet/src/applications/fragmentation/Makefile.am
GNUnet/src/applications/fs/Makefile.am
GNUnet/src/applications/fs/collection/Makefile.am
GNUnet/src/applications/fs/ecrs/Makefile.am
GNUnet/src/applications/fs/fsui/Makefile.am
GNUnet/src/applications/fs/gap/Makefile.am
GNUnet/src/applications/fs/lib/Makefile.am
GNUnet/src/applications/fs/namespace/Makefile.am
GNUnet/src/applications/fs/tools/Makefile.am
GNUnet/src/applications/fs/uritrack/Makefile.am
GNUnet/src/applications/getoption/Makefile.am
GNUnet/src/applications/hostlist/Makefile.am
GNUnet/src/applications/identity/Makefile.am
GNUnet/src/applications/kvstore_sqlite/Makefile.am
GNUnet/src/applications/pingpong/Makefile.am
GNUnet/src/applications/rpc/Makefile.am
GNUnet/src/applications/session/Makefile.am
GNUnet/src/applications/sqstore_mysql/Makefile.am
GNUnet/src/applications/sqstore_sqlite/Makefile.am
GNUnet/src/applications/state/Makefile.am
GNUnet/src/applications/stats/Makefile.am
GNUnet/src/applications/tbench/Makefile.am
GNUnet/src/applications/template/Makefile.am
GNUnet/src/applications/testing/Makefile.am
GNUnet/src/applications/topology_default/Makefile.am
GNUnet/src/applications/tracekit/Makefile.am
GNUnet/src/applications/traffic/Makefile.am
GNUnet/src/applications/transport/Makefile.am
GNUnet/src/libs/mysql/Makefile.am
GNUnet/src/server/Makefile.am
GNUnet/src/setup/Makefile.am
GNUnet/src/setup/cocoa/Makefile.am
GNUnet/src/setup/gtk/Makefile.am
GNUnet/src/setup/ncurses/Makefile.am
GNUnet/src/setup/qt/Makefile.am
GNUnet/src/setup/text/Makefile.am
GNUnet/src/transports/Makefile.am
GNUnet/src/transports/upnp/Makefile.am
Log:
add libintl where needed, based on ld complaints
Modified: GNUnet/src/applications/advertising/Makefile.am
===================================================================
--- GNUnet/src/applications/advertising/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/advertising/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -13,10 +13,11 @@
advertising.c \
bootstrap.c \
bootstrap.h
+libgnunetmodule_advertising_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
libgnunetmodule_advertising_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-libgnunetmodule_advertising_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/bootstrap_http/Makefile.am
===================================================================
--- GNUnet/src/applications/bootstrap_http/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/bootstrap_http/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -12,7 +12,8 @@
libgnunetmodule_bootstrap_la_SOURCES = \
http.c
libgnunetmodule_bootstrap_la_LIBADD = @LIBCURL@ \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunetmodule_bootstrap_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_bootstrap_la_CPPFLAGS = \
Modified: GNUnet/src/applications/chat/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/lib/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/chat/lib/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -15,7 +15,8 @@
libgnunetchat_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetchat_api_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
loopback_test
Modified: GNUnet/src/applications/chat/module/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/module/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/chat/module/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -14,8 +14,8 @@
libgnunetmodule_chat_la_SOURCES = \
chat.c
-libgnunetmodule_chat_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_chat_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-
+libgnunetmodule_chat_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/chat/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/tools/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/chat/tools/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -4,14 +4,12 @@
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
-LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
bin_PROGRAMS = \
gnunet-chat
gnunet_chat_SOURCES = \
gnunet-chat.c
gnunet_chat_LDADD = \
- $(top_builddir)/src/applications/chat/lib/libgnunetchat_api.la
-
+ $(top_builddir)/src/applications/chat/lib/libgnunetchat_api.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/datastore/Makefile.am
===================================================================
--- GNUnet/src/applications/datastore/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/datastore/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -16,5 +16,6 @@
libgnunetmodule_datastore_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_datastore_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/dht/module/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/module/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/dht/module/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -14,13 +14,9 @@
routing.c routing.h \
service.c service.h \
table.c table.h
-
-libgnunetmodule_dht_la_LIBADD = -lm \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la
libgnunetmodule_dht_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-
-
-
-
+libgnunetmodule_dht_la_LIBADD = -lm \
+ $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/dht/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/tools/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/dht/tools/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -12,16 +12,18 @@
libgnunetdht_api_la_SOURCES = \
dht_api.c dht_api.h
-libgnunetdht_api_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetdht_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
+libgnunetdht_api_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
gnunet_dht_query_SOURCES = \
dht-query.c
gnunet_dht_query_LDADD = \
$(top_builddir)/src/applications/dht/tools/libgnunetdht_api.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/dstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/dstore_mysql/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/dstore_mysql/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -32,7 +32,8 @@
libgnunetmodule_dstore_mysql_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/libs/mysql/libgnunetmysql.la \
- -lmysqlclient $(ZLIB_LNK)
+ -lmysqlclient $(ZLIB_LNK) \
+ $(LTLIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/dstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/dstore_sqlite/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/dstore_sqlite/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -27,7 +27,8 @@
$(SQLITE_LDFLAGS)
libgnunetmodule_dstore_sqlite_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- -lsqlite3
+ -lsqlite3 \
+ $(LTLIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/fragmentation/Makefile.am
===================================================================
--- GNUnet/src/applications/fragmentation/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/fragmentation/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -12,7 +12,8 @@
libgnunetmodule_fragmentation_la_SOURCES = \
fragmentation.c
libgnunetmodule_fragmentation_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunetmodule_fragmentation_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
Modified: GNUnet/src/applications/fs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/fs/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -16,7 +16,8 @@
libgnunetecrs_core_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetecrs_core_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/fs/collection/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/collection/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/fs/collection/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -10,12 +10,13 @@
libgnunetcollection_la_SOURCES = \
collection.c
+libgnunetcollection_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS)
libgnunetcollection_la_LIBADD = \
$(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
-libgnunetcollection_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
collectiontest
Modified: GNUnet/src/applications/fs/ecrs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/ecrs/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/fs/ecrs/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -25,13 +25,14 @@
libgnunetecrs_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetecrs_la_LIBADD = \
- -lz \
- -lextractor \
- $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
- $(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
- $(top_builddir)/src/applications/fs/lib/libgnunetfs.la \
- $(top_builddir)/src/applications/getoption/libgnunetgetoption_api.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ -lz \
+ -lextractor \
+ $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
+ $(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
+ $(top_builddir)/src/applications/fs/lib/libgnunetfs.la \
+ $(top_builddir)/src/applications/getoption/libgnunetgetoption_api.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/fs/fsui/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/fsui/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/fs/fsui/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -21,13 +21,14 @@
libgnunetfsui_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetfsui_la_LIBADD = \
- -lextractor \
- $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
- $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/applications/fs/lib/libgnunetfs.la \
- $(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
- $(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ -lextractor \
+ $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
+ $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+ $(top_builddir)/src/applications/fs/lib/libgnunetfs.la \
+ $(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
+ $(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
EXTRA_DIST = \
check.conf \
Modified: GNUnet/src/applications/fs/gap/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/gap/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/fs/gap/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -22,13 +22,13 @@
pid_table.c pid_table.h \
querymanager.c querymanager.h \
shared.c shared.h
-
libgnunetmodule_fs_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_fs_la_LIBADD = \
$(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
$(top_builddir)/src/util/libgnunetutil.la \
- -lm
+ -lm \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/fs/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/lib/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/fs/lib/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -13,8 +13,9 @@
libgnunetfs_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetfs_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/fs/libgnunetecrs_core.la
+ $(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/fs/namespace/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/namespace/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/fs/namespace/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -17,8 +17,9 @@
libgnunetnamespace_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetnamespace_la_LIBADD = \
- $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
namespace_infotest \
Modified: GNUnet/src/applications/fs/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/tools/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/fs/tools/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -8,7 +8,8 @@
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
bin_PROGRAMS = \
gnunet-auto-share \
@@ -22,17 +23,18 @@
gnunet_auto_share_SOURCES = \
- gnunet-auto-share.c
+ gnunet-auto-share.c
+
gnunet_insert_SOURCES = \
gnunet-insert.c
-
gnunet_insert_LDADD = \
$(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
gnunet_unindex_SOURCES = \
@@ -43,7 +45,8 @@
gnunet_directory_LDADD = \
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
gnunet_pseudonym_SOURCES = \
@@ -53,7 +56,8 @@
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/applications/fs/collection/libgnunetcollection.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
gnunet_search_SOURCES = \
gnunet-search.c
Modified: GNUnet/src/applications/fs/uritrack/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/uritrack/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/fs/uritrack/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -13,8 +13,9 @@
libgnuneturitrack_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnuneturitrack_la_LIBADD = \
- $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/getoption/Makefile.am
===================================================================
--- GNUnet/src/applications/getoption/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/getoption/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -22,7 +22,8 @@
libgnunetmodule_getoption_la_SOURCES = \
getoption.c getoption.h
-libgnunetmodule_getoption_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_getoption_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_getoption_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/hostlist/Makefile.am
===================================================================
--- GNUnet/src/applications/hostlist/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/hostlist/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -15,13 +15,14 @@
libgnunetmodule_hostlist_la_SOURCES = \
hostlist.c
-libgnunetmodule_hostlist_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la -lmicrohttpd
libgnunetmodule_hostlist_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_hostlist_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ -lmicrohttpd \
+ $(LTLIBINTL)
-
check_PROGRAMS = \
hostlisttest
Modified: GNUnet/src/applications/identity/Makefile.am
===================================================================
--- GNUnet/src/applications/identity/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/identity/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -18,10 +18,11 @@
libgnunetmodule_identity_la_SOURCES = \
identity.c identity.h \
hostkey.c hostkey.h
-libgnunetmodule_identity_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_identity_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_identity_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunetidentity_api_la_SOURCES = \
@@ -29,7 +30,8 @@
libgnunetidentity_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetidentity_api_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/kvstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/kvstore_sqlite/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -24,8 +24,9 @@
$(GN_PLUGIN_LDFLAGS) \
$(SQLITE_LDFLAGS)
libgnunetmodule_kvstore_sqlite_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- -lsqlite3
+ $(top_builddir)/src/util/libgnunetutil.la \
+ -lsqlite3 \
+ $(LTLIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/pingpong/Makefile.am
===================================================================
--- GNUnet/src/applications/pingpong/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/pingpong/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -10,7 +10,8 @@
libgnunetmodule_pingpong_la_SOURCES = \
pingpong.c
-libgnunetmodule_pingpong_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_pingpong_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_pingpong_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/rpc/Makefile.am
===================================================================
--- GNUnet/src/applications/rpc/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/rpc/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -13,14 +13,13 @@
libgnunetmodule_rpc_la_SOURCES = \
rpc.c
-
+libgnunetmodule_rpc_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
libgnunetmodule_rpc_la_LIBADD = \
+ $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la
+ $(LTLIBINTL)
-libgnunetmodule_rpc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
libgnunetrpc_util_la_SOURCES = \
parameters.c
libgnunetrpc_util_la_LDFLAGS = \
Modified: GNUnet/src/applications/session/Makefile.am
===================================================================
--- GNUnet/src/applications/session/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/session/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -11,10 +11,11 @@
libgnunetmodule_session_la_SOURCES = \
cache.c cache.h \
connect.c
-libgnunetmodule_session_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_session_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_session_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
if HAVE_MHD
httptest = sessiontest_http sessiontest_nat_http
Modified: GNUnet/src/applications/sqstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_mysql/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/sqstore_mysql/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -32,7 +32,8 @@
libgnunetmodule_sqstore_mysql_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/libs/mysql/libgnunetmysql.la \
- $(ZLIB_LNK)
+ $(ZLIB_LNK) \
+ $(LTLIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/sqstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/sqstore_sqlite/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -26,8 +26,9 @@
$(GN_PLUGIN_LDFLAGS) \
$(SQLITE_LDFLAGS)
libgnunetmodule_sqstore_sqlite_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- -lsqlite3
+ $(top_builddir)/src/util/libgnunetutil.la \
+ -lsqlite3 \
+ $(LTLIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/state/Makefile.am
===================================================================
--- GNUnet/src/applications/state/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/state/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -10,10 +10,8 @@
libgnunetmodule_state_la_SOURCES = \
state.c
-libgnunetmodule_state_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_state_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-
-
-
+libgnunetmodule_state_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/stats/Makefile.am
===================================================================
--- GNUnet/src/applications/stats/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/stats/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -3,8 +3,6 @@
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
-LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
plugindir = $(libdir)/GNUnet
@@ -23,20 +21,24 @@
gnunet_stats_SOURCES = \
gnunet-stats.c
gnunet_stats_LDADD = \
- $(top_builddir)/src/applications/stats/libgnunetstats_api.la
+ $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunetstats_api_la_SOURCES = \
clientapi.c
libgnunetstats_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetstats_api_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunetmodule_stats_la_SOURCES = \
statistics.c \
statistics.h
-libgnunetmodule_stats_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_stats_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_stats_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/tbench/Makefile.am
===================================================================
--- GNUnet/src/applications/tbench/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/tbench/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -5,9 +5,6 @@
endif
plugindir = $(libdir)/GNUnet
-LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
bin_PROGRAMS = \
gnunet-tbench
@@ -18,16 +15,19 @@
gnunet_tbench_SOURCES = \
gnunet-tbench.c \
tbench.h
+gnunet_tbench_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
-
libgnunetmodule_tbench_la_SOURCES = \
- tbench.c\
+ tbench.c \
tbench.h
-libgnunetmodule_tbench_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_tbench_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_tbench_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
if HAVE_MHD
Modified: GNUnet/src/applications/template/Makefile.am
===================================================================
--- GNUnet/src/applications/template/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/template/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -5,9 +5,6 @@
endif
plugindir = $(libdir)/GNUnet
-LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
# change to bin_PROGRAMS for real apps
noinst_PROGRAMS = \
gnunet-template
@@ -18,13 +15,15 @@
gnunet_template_SOURCES = \
gnunet-template.c
+gnunet_template_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+
libgnunetmodule_template_la_SOURCES = \
template.c
libgnunetmodule_template_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_template_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
-
-
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/testing/Makefile.am
===================================================================
--- GNUnet/src/applications/testing/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/testing/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -14,16 +14,18 @@
libgnunettesting_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunettesting_api_la_LIBADD = \
+ $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/identity/libgnunetidentity_api.la
+ $(LTLIBINTL)
libgnunetremote_api_la_SOURCES = \
remote.c remote.h
libgnunetremote_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetremote_api_la_LIBADD = \
+ $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/identity/libgnunetidentity_api.la
+ $(LTLIBINTL)
bin_PROGRAMS = \
remotetest
Modified: GNUnet/src/applications/topology_default/Makefile.am
===================================================================
--- GNUnet/src/applications/topology_default/Makefile.am 2008-11-21
08:14:01 UTC (rev 7960)
+++ GNUnet/src/applications/topology_default/Makefile.am 2008-11-22
07:23:52 UTC (rev 7961)
@@ -10,7 +10,8 @@
libgnunetmodule_topology_default_la_SOURCES = \
topology.c
-libgnunetmodule_topology_default_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_topology_default_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_topology_default_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/tracekit/Makefile.am
===================================================================
--- GNUnet/src/applications/tracekit/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/tracekit/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -5,9 +5,6 @@
plugindir = $(libdir)/GNUnet
-LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
bin_PROGRAMS = \
gnunet-tracekit
@@ -20,10 +17,10 @@
gnunet_tracekit_SOURCES = \
gnunet-tracekit.c \
tracekit.h
-
gnunet_tracekit_LDADD = \
+ $(top_builddir)/src/applications/tracekit/libgnunettracekit_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/tracekit/libgnunettracekit_api.la
+ $(LTLIBINTL)
libgnunetmodule_tracekit_la_SOURCES = \
@@ -32,7 +29,8 @@
libgnunetmodule_tracekit_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_tracekit_la_LIBADD = \
- $(LDADD)
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunettracekit_api_la_SOURCES = \
@@ -40,7 +38,8 @@
libgnunettracekit_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunettracekit_api_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/traffic/Makefile.am
===================================================================
--- GNUnet/src/applications/traffic/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/applications/traffic/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -14,12 +14,14 @@
libgnunettraffic_api_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunettraffic_api_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
libgnunetmodule_traffic_la_SOURCES = \
traffic.c traffic.h
-libgnunetmodule_traffic_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_traffic_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_traffic_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/applications/transport/Makefile.am
===================================================================
--- GNUnet/src/applications/transport/Makefile.am 2008-11-21 08:14:01 UTC
(rev 7960)
+++ GNUnet/src/applications/transport/Makefile.am 2008-11-22 07:23:52 UTC
(rev 7961)
@@ -11,8 +11,8 @@
libgnunetmodule_transport_la_SOURCES = \
transport.c
-libgnunetmodule_transport_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_transport_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-
+libgnunetmodule_transport_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/libs/mysql/Makefile.am
===================================================================
--- GNUnet/src/libs/mysql/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/libs/mysql/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -20,5 +20,6 @@
$(GN_LIB_LDFLAGS) $(MYSQL_LDFLAGS)
libgnunetmysql_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- -lmysqlclient $(ZLIB_LNK)
+ -lmysqlclient $(ZLIB_LNK) \
+ $(LTLIBINTL)
Modified: GNUnet/src/server/Makefile.am
===================================================================
--- GNUnet/src/server/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/server/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -21,30 +21,35 @@
tcpserver.c tcpserver.h \
startup.c startup.h \
version.c version.h
-libgnunetcore_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
libgnunetcore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
+libgnunetcore_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
gnunetd_SOURCES = \
gnunetd.c
gnunetd_LDADD = \
- $(top_builddir)/src/server/libgnunetcore.la
+ $(top_builddir)/src/server/libgnunetcore.la \
+ $(LTLIBINTL)
gnunet_update_SOURCES = \
gnunet-update.c
gnunet_update_LDADD = \
- $(top_builddir)/src/server/libgnunetcore.la
+ $(top_builddir)/src/server/libgnunetcore.la \
+ $(LTLIBINTL)
gnunet_peer_info_SOURCES = \
gnunet-peer-info.c
gnunet_peer_info_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/server/libgnunetcore.la
+ $(top_builddir)/src/server/libgnunetcore.la \
+ $(LTLIBINTL)
gnunet_transport_check_SOURCES = \
gnunet-transport-check.c
gnunet_transport_check_LDADD = \
- $(top_builddir)/src/server/libgnunetcore.la
+ $(top_builddir)/src/server/libgnunetcore.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/setup/Makefile.am
===================================================================
--- GNUnet/src/setup/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/setup/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -28,9 +28,6 @@
plugindir = $(libdir)/GNUnet
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
-
if MINGW
WINTOOL = gnunet-win-tool
endif
@@ -41,10 +38,10 @@
gnunet_setup_SOURCES = \
gnunet-setup.c
-
gnunet_setup_LDADD = \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
gnunet_win_tool_SOURCE = \
gnunet-win-tool.c
Modified: GNUnet/src/setup/cocoa/Makefile.am
===================================================================
--- GNUnet/src/setup/cocoa/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/setup/cocoa/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -2,32 +2,27 @@
plugindir = $(libdir)/GNUnet
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
-
plugin_LTLIBRARIES = \
- libgnunetsetup_cocoa.la
+ libgnunetsetup_cocoa.la
if HAVE_GUILE
GUILE_SRC = \
- GNUNETSetupView.m GNUNETSetupView.h \
- config_cocoa.m config_cocoa.h
+ GNUNETSetupView.m GNUNETSetupView.h \
+ config_cocoa.m config_cocoa.h
endif
EXTRA_DIST = \
- GNUNETSetupView.m GNUNETSetupView.h \
- config_cocoa.m config_cocoa.h
+ GNUNETSetupView.m GNUNETSetupView.h \
+ config_cocoa.m config_cocoa.h
libgnunetsetup_cocoa_la_SOURCES = \
- $(GUILE_SRC) \
- PackingBoxContainer.m PackingBoxContainer.h
-
+ $(GUILE_SRC) \
+ PackingBoxContainer.m PackingBoxContainer.h
libgnunetsetup_cocoa_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) \
- -framework Cocoa
-
+ $(GN_PLUGIN_LDFLAGS) \
+ -framework Cocoa
libgnunetsetup_cocoa_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/setup/lib/libgnunetsetup.la \
- -lm
+ $(top_builddir)/src/setup/lib/libgnunetsetup.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/setup/gtk/Makefile.am
===================================================================
--- GNUnet/src/setup/gtk/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/setup/gtk/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -4,9 +4,6 @@
plugindir = $(libdir)/GNUnet
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
-
plugin_LTLIBRARIES = \
libgnunetsetup_gtk.la
@@ -28,20 +25,17 @@
$(GUILE_SRC) \
glade_support.h glade_support.c \
wizard_gtk.c wizard_gtk.h
-
libgnunetsetup_gtk_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-
libgnunetsetup_gtk_la_CFLAGS = \
-I$(top_scrdir)/include \
@GNUNETGTK_CFLAGS@ \
@GTK_CFLAGS@
-
libgnunetsetup_gtk_la_LIBADD = \
@GTK_LIBS@ @EXT_LIB_PATH@ @EXT_LIBS@ \
@GNUNETGTK_LIBS@ \
- $(INTLLIBS) \
-lgthread-2.0 \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/setup/lib/libgnunetsetup.la
+ $(top_builddir)/src/setup/lib/libgnunetsetup.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/setup/ncurses/Makefile.am
===================================================================
--- GNUnet/src/setup/ncurses/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/setup/ncurses/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -2,9 +2,6 @@
plugindir = $(libdir)/GNUnet
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
-
plugin_LTLIBRARIES = \
libgnunetsetup_curses.la
@@ -15,9 +12,6 @@
EXTRA_DIST = mconf.c mconf.h
-libgnunetsetup_curses_la_SOURCES = \
- $(GUILE_SRC) \
- wizard_curs.c wizard_curs.h
if HAVE_DIALOG
DIALOG_LIBS = -ldialog
@@ -27,11 +21,14 @@
DIALOG_LIBS = -lcdialog
endif
+libgnunetsetup_curses_la_SOURCES = \
+ $(GUILE_SRC) \
+ wizard_curs.c wizard_curs.h
libgnunetsetup_curses_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-
libgnunetsetup_curses_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
- -lncursesw $(DIALOG_LIBS) -lm
+ -lncursesw $(DIALOG_LIBS) -lm \
+ $(LTLIBINTL)
Modified: GNUnet/src/setup/qt/Makefile.am
===================================================================
--- GNUnet/src/setup/qt/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/setup/qt/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -26,9 +26,9 @@
libgnunetsetup_qt_la_LIBADD = \
@QTLIBS@ @EXT_LIB_PATH@ @EXT_LIBS@ \
- $(INTLLIBS) \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/setup/lib/libgnunetsetup.la
+ $(top_builddir)/src/setup/lib/libgnunetsetup.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/setup/text/Makefile.am
===================================================================
--- GNUnet/src/setup/text/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/setup/text/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -2,18 +2,14 @@
plugindir = $(libdir)/GNUnet
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
-
plugin_LTLIBRARIES = \
libgnunetsetup_text.la
libgnunetsetup_text_la_SOURCES = \
conf.c conf.h
-
libgnunetsetup_text_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
+ $(GN_PLUGIN_LDFLAGS)
libgnunetsetup_text_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/setup/lib/libgnunetsetup.la
+ $(top_builddir)/src/setup/lib/libgnunetsetup.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
Modified: GNUnet/src/transports/Makefile.am
===================================================================
--- GNUnet/src/transports/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
+++ GNUnet/src/transports/Makefile.am 2008-11-22 07:23:52 UTC (rev 7961)
@@ -41,7 +41,8 @@
libgnunetip_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
libgnunetip_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
plugin_LTLIBRARIES = \
libgnunettransport_tcp.la \
@@ -51,7 +52,9 @@
libgnunettransport_smtp_la_SOURCES = smtp.c
libgnunettransport_smtp_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la -lesmtp
+ $(top_builddir)/src/util/libgnunetutil.la \
+ -lesmtp \
+ $(LTLIBINTL)
libgnunettransport_smtp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
@@ -59,7 +62,8 @@
libgnunettransport_http_la_LIBADD = \
-lmicrohttpd @LIBCURL@ \
$(top_builddir)/src/util/libgnunetutil.la \
- libgnunetip.la
+ libgnunetip.la \
+ $(LTLIBINTL)
libgnunettransport_http_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunettransport_http_la_CPPFLAGS = \
@@ -68,7 +72,8 @@
libgnunettransport_tcp_la_SOURCES = tcp.c
libgnunettransport_tcp_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- libgnunetip.la
+ libgnunetip.la \
+ $(LTLIBINTL)
libgnunettransport_tcp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
@@ -82,7 +87,8 @@
libgnunettransport_udp_la_SOURCES = udp.c
libgnunettransport_udp_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- libgnunetip.la
+ libgnunetip.la \
+ $(LTLIBINTL)
libgnunettransport_udp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
Modified: GNUnet/src/transports/upnp/Makefile.am
===================================================================
--- GNUnet/src/transports/upnp/Makefile.am 2008-11-21 08:14:01 UTC (rev
7960)
+++ GNUnet/src/transports/upnp/Makefile.am 2008-11-22 07:23:52 UTC (rev
7961)
@@ -9,8 +9,6 @@
plugindir = $(libdir)/GNUnet
-LIBS = @LIBINTL@ @LIBS@
-
plugin_LTLIBRARIES = \
libgnunetmodule_upnp.la
@@ -29,7 +27,8 @@
@LIBCURL_CPPFLAGS@ @XML_CPPFLAGS@
libgnunetmodule_upnp_la_LIBADD = \
@EXT_LIB_PATH@ @EXT_LIBS@ @XML_LIBS@ @LIBCURL@ \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
check_PROGRAMS = \
upnptest
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7961 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat/lib applications/chat/module applications/chat/tools applications/datastore applications/dht/module applications/dht/tools applications/dstore_mysql applications/dstore_sqlite applications/fragmentation applications/fs applications/fs/collection applications/fs/ecrs applications/fs/fsui applications/fs/gap applications/fs/lib applications/fs/namespace applications/fs/tools applications/fs/uritrack applications/getoption applications/hostlist applications/identity applications/kvstore_sqlite applications/pingpong applications/rpc applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/state applications/stats applications/tbench applications/template applications/testing applications/topology_default applications/tracekit applications/traffic applications/transport libs/mysql server setup setup/cocoa setup/gtk setup/ncurses setup/qt setup/text transports transports/upnp,
gnunet <=