Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 313165 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-17 / +16 lines)
Line  Link Here
0
-- src/server/Makefile.am
0
++ src/server/Makefile.am
Lines 30-55 Link Here
30
gnunetd_SOURCES = \
30
gnunetd_SOURCES = \
31
 gnunetd.c 
31
 gnunetd.c 
32
gnunetd_LDADD = \
32
gnunetd_LDADD = \
33
 $(top_builddir)/src/server/libgnunetcore.la \
33
 libgnunetcore.la \
34
 $(GN_LIBINTL)
34
 $(GN_LIBINTL)
35
35
36
36
37
gnunet_update_SOURCES = \
37
gnunet_update_SOURCES = \
38
 gnunet-update.c 
38
 gnunet-update.c 
39
gnunet_update_LDADD = \
39
gnunet_update_LDADD = \
40
 $(top_builddir)/src/server/libgnunetcore.la \
40
 libgnunetcore.la \
41
 $(GN_LIBINTL)
41
 $(GN_LIBINTL)
42
42
43
gnunet_peer_info_SOURCES = \
43
gnunet_peer_info_SOURCES = \
44
 gnunet-peer-info.c 
44
 gnunet-peer-info.c 
45
gnunet_peer_info_LDADD  = \
45
gnunet_peer_info_LDADD  = \
46
 $(top_builddir)/src/util/libgnunetutil.la \
46
 $(top_builddir)/src/util/libgnunetutil.la \
47
 $(top_builddir)/src/server/libgnunetcore.la \
47
 libgnunetcore.la \
48
 $(GN_LIBINTL)
48
 $(GN_LIBINTL)
49
49
50
gnunet_transport_check_SOURCES = \
50
gnunet_transport_check_SOURCES = \
51
 gnunet-transport-check.c 
51
 gnunet-transport-check.c 
52
gnunet_transport_check_LDADD  = \
52
gnunet_transport_check_LDADD  = \
53
 $(top_builddir)/src/server/libgnunetcore.la \
53
 libgnunetcore.la \
54
 $(GN_LIBINTL)
54
 $(GN_LIBINTL)
55
55
++ src/applications/stats/Makefile.am
56
-- src/applications/stats/Makefile.am
Lines 21-27 Link Here
21
gnunet_stats_SOURCES = \
21
gnunet_stats_SOURCES = \
22
 gnunet-stats.c 	
22
 gnunet-stats.c 	
23
gnunet_stats_LDADD = \
23
gnunet_stats_LDADD = \
24
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
24
  libgnunetstatsapi.la \
25
  $(top_builddir)/src/util/libgnunetutil.la \
25
  $(top_builddir)/src/util/libgnunetutil.la \
26
  $(GN_LIBINTL)
26
  $(GN_LIBINTL)
27
27
28
-- src/applications/rpc/Makefile.am
28
++ src/applications/rpc/Makefile.am
Lines 16-22 Link Here
16
libgnunetmodule_rpc_la_LDFLAGS = \
16
libgnunetmodule_rpc_la_LDFLAGS = \
17
  $(GN_PLUGIN_LDFLAGS)
17
  $(GN_PLUGIN_LDFLAGS)
18
libgnunetmodule_rpc_la_LIBADD = \
18
libgnunetmodule_rpc_la_LIBADD = \
19
  $(top_builddir)/src/applications/rpc/libgnunetrpcutil.la \
19
  libgnunetrpcutil.la \
20
  $(top_builddir)/src/util/libgnunetutil.la \
20
  $(top_builddir)/src/util/libgnunetutil.la \
21
  $(GN_LIBINTL)
21
  $(GN_LIBINTL)
22
22
23
-- src/applications/tracekit/Makefile.am
23
++ src/applications/tracekit/Makefile.am
Lines 18-24 Link Here
18
  gnunet-tracekit.c \
18
  gnunet-tracekit.c \
19
  tracekit.h
19
  tracekit.h
20
gnunet_tracekit_LDADD = \
20
gnunet_tracekit_LDADD = \
21
  $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
21
  libgnunettracekitapi.la \
22
  $(top_builddir)/src/util/libgnunetutil.la \
22
  $(top_builddir)/src/util/libgnunetutil.la \
23
  $(GN_LIBINTL)
23
  $(GN_LIBINTL)
24
24
Lines 53-57 Link Here
53
tracekittest_LDADD = \
53
tracekittest_LDADD = \
54
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
54
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
55
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
55
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
56
  $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
56
  libgnunettracekitapi.la \
57
  $(top_builddir)/src/util/libgnunetutil.la 
57
  $(top_builddir)/src/util/libgnunetutil.la 
58
-- src/applications/testing/Makefile.am
58
++ src/applications/testing/Makefile.am
Lines 40-59 Link Here
40
 testingtest.c 
40
 testingtest.c 
41
testingtest_LDADD = \
41
testingtest_LDADD = \
42
 $(top_builddir)/src/util/libgnunetutil.la \
42
 $(top_builddir)/src/util/libgnunetutil.la \
43
 $(top_builddir)/src/applications/testing/libgnunettestingapi.la
43
 libgnunettestingapi.la
44
44
45
remotetest_SOURCES = \
45
remotetest_SOURCES = \
46
 remotetest.c
46
 remotetest.c
47
remotetest_LDADD = \
47
remotetest_LDADD = \
48
 $(top_builddir)/src/util/libgnunetutil.la \
48
 $(top_builddir)/src/util/libgnunetutil.la \
49
 $(top_builddir)/src/applications/testing/libgnunetremoteapi.la
49
 libgnunetremoteapi.la
50
50
51
51
52
testingtest_loop_SOURCES = \
52
testingtest_loop_SOURCES = \
53
 testingtest_loop.c 
53
 testingtest_loop.c 
54
testingtest_loop_LDADD = \
54
testingtest_loop_LDADD = \
55
 $(top_builddir)/src/util/libgnunetutil.la \
55
 $(top_builddir)/src/util/libgnunetutil.la \
56
 $(top_builddir)/src/applications/testing/libgnunettestingapi.la
56
 libgnunettestingapi.la
57
57
58
58
59
pkgdata_DATA = \
59
pkgdata_DATA = \
(-)src/applications/fs/fsui/Makefile.am.orig (-10 / +10 lines)
Lines 37-43 Link Here
37
fsui_loader_SOURCES = \
37
fsui_loader_SOURCES = \
38
 fsui-loader.c 
38
 fsui-loader.c 
39
fsui_loader_LDADD = \
39
fsui_loader_LDADD = \
40
 $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
40
 libgnunetfsui.la \
41
 $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
41
 $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
42
 $(top_builddir)/src/util/libgnunetutil.la 
42
 $(top_builddir)/src/util/libgnunetutil.la 
43
43
Lines 59-72 Link Here
59
  basic_fsui_test.c 
59
  basic_fsui_test.c 
60
basic_fsui_test_LDADD = \
60
basic_fsui_test_LDADD = \
61
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
61
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
62
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
62
  libgnunetfsui.la \
63
  $(top_builddir)/src/util/libgnunetutil.la 
63
  $(top_builddir)/src/util/libgnunetutil.la 
64
64
65
fsui_start_stop_test_SOURCES = \
65
fsui_start_stop_test_SOURCES = \
66
  fsui_start_stop_test.c 
66
  fsui_start_stop_test.c 
67
fsui_start_stop_test_LDADD = \
67
fsui_start_stop_test_LDADD = \
68
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
68
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
69
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
69
  libgnunetfsui.la \
70
  $(top_builddir)/src/util/libgnunetutil.la 
70
  $(top_builddir)/src/util/libgnunetutil.la 
71
71
72
search_pause_resume_persistence_test_SOURCES = \
72
search_pause_resume_persistence_test_SOURCES = \
Lines 80-121 Link Here
80
  search_ranking_test.c 
80
  search_ranking_test.c 
81
search_ranking_test_LDADD = \
81
search_ranking_test_LDADD = \
82
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
82
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
83
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
83
  libgnunetfsui.la \
84
  $(top_builddir)/src/util/libgnunetutil.la 
84
  $(top_builddir)/src/util/libgnunetutil.la 
85
85
86
download_persistence_test_SOURCES = \
86
download_persistence_test_SOURCES = \
87
  download_persistence_test.c 
87
  download_persistence_test.c 
88
download_persistence_test_LDADD = \
88
download_persistence_test_LDADD = \
89
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
89
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
90
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
90
  libgnunetfsui.la \
91
  $(top_builddir)/src/util/libgnunetutil.la 
91
  $(top_builddir)/src/util/libgnunetutil.la 
92
92
93
recursive_download_test_SOURCES = \
93
recursive_download_test_SOURCES = \
94
  recursive_download_test.c 
94
  recursive_download_test.c 
95
recursive_download_test_LDADD = \
95
recursive_download_test_LDADD = \
96
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
96
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
97
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
97
  libgnunetfsui.la \
98
  $(top_builddir)/src/util/libgnunetutil.la 
98
  $(top_builddir)/src/util/libgnunetutil.la 
99
99
100
upload_unindex_persistence_test_SOURCES = \
100
upload_unindex_persistence_test_SOURCES = \
101
  upload_unindex_persistence_test.c 
101
  upload_unindex_persistence_test.c 
102
upload_unindex_persistence_test_LDADD = \
102
upload_unindex_persistence_test_LDADD = \
103
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
103
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
104
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
104
  libgnunetfsui.la \
105
  $(top_builddir)/src/util/libgnunetutil.la 
105
  $(top_builddir)/src/util/libgnunetutil.la 
106
106
107
search_linked_download_persistence_test_SOURCES = \
107
search_linked_download_persistence_test_SOURCES = \
108
  search_linked_download_persistence_test.c 
108
  search_linked_download_persistence_test.c 
109
search_linked_download_persistence_test_LDADD = \
109
search_linked_download_persistence_test_LDADD = \
110
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
110
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
111
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
111
  libgnunetfsui.la \
112
  $(top_builddir)/src/util/libgnunetutil.la 
112
  $(top_builddir)/src/util/libgnunetutil.la 
113
113
114
search_persistence_test_SOURCES = \
114
search_persistence_test_SOURCES = \
115
  search_persistence_test.c 
115
  search_persistence_test.c 
116
search_persistence_test_LDADD = \
116
search_persistence_test_LDADD = \
117
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
117
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
118
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
118
  libgnunetfsui.la \
119
  $(top_builddir)/src/util/libgnunetutil.la 
119
  $(top_builddir)/src/util/libgnunetutil.la 
120
120
121
121
Lines 123-128 Link Here
123
  recursive_download_persistence_test.c 
123
  recursive_download_persistence_test.c 
124
recursive_download_persistence_test_LDADD = \
124
recursive_download_persistence_test_LDADD = \
125
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
125
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
126
  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
126
  libgnunetfsui.la \
127
  $(top_builddir)/src/util/libgnunetutil.la 
127
  $(top_builddir)/src/util/libgnunetutil.la 
128
128
(-)src/applications/dv_dht/tools/Makefile.am.orig (-6 / +6 lines)
Lines 24-30 Link Here
24
gnunet_dvdht_query_SOURCES = \
24
gnunet_dvdht_query_SOURCES = \
25
  dht-query.c
25
  dht-query.c
26
gnunet_dvdht_query_LDADD =  \
26
gnunet_dvdht_query_LDADD =  \
27
  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
27
  libgnunetdvdhtapi.la \
28
  $(top_builddir)/src/util/libgnunetutil.la \
28
  $(top_builddir)/src/util/libgnunetutil.la \
29
  $(GN_LIBINTL)
29
  $(GN_LIBINTL)
30
30
Lines 34-40 Link Here
34
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
34
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
35
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
35
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
36
  $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
36
  $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
37
  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
37
  libgnunetdvdhtapi.la \
38
  $(top_builddir)/src/util/libgnunetutil.la
38
  $(top_builddir)/src/util/libgnunetutil.la
39
39
40
check_PROGRAMS = \
40
check_PROGRAMS = \
Lines 49-55 Link Here
49
dv_dht_loopback_test_LDADD = \
49
dv_dht_loopback_test_LDADD = \
50
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
50
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
51
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
51
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
52
  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
52
  libgnunetdvdhtapi.la \
53
  $(top_builddir)/src/util/libgnunetutil.la 
53
  $(top_builddir)/src/util/libgnunetutil.la 
54
54
55
dv_dht_twopeer_test_SOURCES = \
55
dv_dht_twopeer_test_SOURCES = \
Lines 57-63 Link Here
57
dv_dht_twopeer_test_LDADD = \
57
dv_dht_twopeer_test_LDADD = \
58
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
58
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
59
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
59
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
60
  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
60
  libgnunetdvdhtapi.la \
61
  $(top_builddir)/src/util/libgnunetutil.la 
61
  $(top_builddir)/src/util/libgnunetutil.la 
62
62
63
dv_dht_multipeer_test_SOURCES = \
63
dv_dht_multipeer_test_SOURCES = \
Lines 65-71 Link Here
65
dv_dht_multipeer_test_LDADD = \
65
dv_dht_multipeer_test_LDADD = \
66
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
66
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
67
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
67
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
68
  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
68
  libgnunetdvdhtapi.la \
69
  $(top_builddir)/src/util/libgnunetutil.la 
69
  $(top_builddir)/src/util/libgnunetutil.la 
70
  
70
  
71
dv_dht_multi_topology_test_SOURCES = \
71
dv_dht_multi_topology_test_SOURCES = \
Lines 74-80 Link Here
74
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
74
  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
75
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
75
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
76
  $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
76
  $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
77
  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
77
  libgnunetdvdhtapi.la \
78
  $(top_builddir)/src/util/libgnunetutil.la 
78
  $(top_builddir)/src/util/libgnunetutil.la 
79
79
80
EXTRA_DIST = \
80
EXTRA_DIST = \

Return to bug 313165