aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-09-13 13:54:57 +0000
committerChristian Grothoff <christian@grothoff.org>2014-09-13 13:54:57 +0000
commitd94c5185fcdf47c6a57d3233b946fa7e621f7ad9 (patch)
tree1ded577285183d6457bde8787b9bccaa01f12143 /src/testbed
parente184df6030ab5c5374fe3b8a94482ff5a30c1580 (diff)
downloadgnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.tar.gz
gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.zip
fixing parallel build, getting rid of useless _DEPENDENCIES declarations
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/Makefile.am28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index a87ff5817..1428106a5 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -53,26 +53,19 @@ gnunet_service_testbed_LDADD = $(XLIB) \
53 $(top_builddir)/src/hello/libgnunethello.la \ 53 $(top_builddir)/src/hello/libgnunethello.la \
54 $(top_builddir)/src/transport/libgnunettransport.la \ 54 $(top_builddir)/src/transport/libgnunettransport.la \
55 $(top_builddir)/src/testing/libgnunettesting.la \ 55 $(top_builddir)/src/testing/libgnunettesting.la \
56 $(top_builddir)/src/testbed/libgnunettestbed.la \ 56 libgnunettestbed.la \
57 $(top_builddir)/src/arm/libgnunetarm.la \ 57 $(top_builddir)/src/arm/libgnunetarm.la \
58 $(LTLIBINTL) $(Z_LIBS) 58 $(LTLIBINTL) $(Z_LIBS)
59gnunet_service_testbed_DEPENDENCIES = \
60 libgnunettestbed.la
61 59
62gnunet_service_testbed_logger_SOURCES = \ 60gnunet_service_testbed_logger_SOURCES = \
63 gnunet-service-testbed-logger.c 61 gnunet-service-testbed-logger.c
64gnunet_service_testbed_logger_LDADD = \ 62gnunet_service_testbed_logger_LDADD = \
65 $(top_builddir)/src/util/libgnunetutil.la 63 $(top_builddir)/src/util/libgnunetutil.la
66gnunet_service_testbed_logger_DEPENDENCIES = \
67 $(top_builddir)/src/util/libgnunetutil.la
68 64
69gnunet_testbed_profiler_SOURCES = \ 65gnunet_testbed_profiler_SOURCES = \
70 gnunet-testbed-profiler.c 66 gnunet-testbed-profiler.c
71gnunet_testbed_profiler_LDADD = $(XLIB) \ 67gnunet_testbed_profiler_LDADD = $(XLIB) \
72 $(top_builddir)/src/util/libgnunetutil.la \ 68 $(top_builddir)/src/util/libgnunetutil.la \
73 $(top_builddir)/src/testbed/libgnunettestbed.la
74gnunet_testbed_profiler_DEPENDENCIES = \
75 $(top_builddir)/src/util/libgnunetutil.la \
76 libgnunettestbed.la 69 libgnunettestbed.la
77 70
78gnunet_helper_testbed_SOURCES = \ 71gnunet_helper_testbed_SOURCES = \
@@ -82,36 +75,24 @@ gnunet_helper_testbed_LDADD = $(XLIB) \
82 $(top_builddir)/src/testing/libgnunettesting.la \ 75 $(top_builddir)/src/testing/libgnunettesting.la \
83 libgnunettestbed.la \ 76 libgnunettestbed.la \
84 $(LTLIBINTL) $(Z_LIBS) 77 $(LTLIBINTL) $(Z_LIBS)
85gnunet_helper_testbed_DEPENDENCIES = \
86 gnunet-service-testbed.$(OBJEXT) \
87 libgnunettestbed.la
88 78
89gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c 79gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
90gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \ 80gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \
91 $(top_builddir)/src/transport/libgnunettransport.la \ 81 $(top_builddir)/src/transport/libgnunettransport.la \
92 $(top_builddir)/src/util/libgnunetutil.la \ 82 $(top_builddir)/src/util/libgnunetutil.la \
93 $(LTLIBINTL) 83 $(LTLIBINTL)
94gnunet_daemon_testbed_blacklist_DEPENDENCIES = \
95 $(top_builddir)/src/transport/libgnunettransport.la \
96 $(top_builddir)/src/util/libgnunetutil.la
97 84
98gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c 85gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c
99gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \ 86gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \
100 $(top_builddir)/src/transport/libgnunettransport.la \ 87 $(top_builddir)/src/transport/libgnunettransport.la \
101 $(top_builddir)/src/util/libgnunetutil.la \ 88 $(top_builddir)/src/util/libgnunetutil.la \
102 $(LTLIBINTL) -lsqlite3 89 $(LTLIBINTL) -lsqlite3
103gnunet_daemon_testbed_underlay_DEPENDENCIES = \
104 $(top_builddir)/src/transport/libgnunettransport.la \
105 $(top_builddir)/src/util/libgnunetutil.la
106 90
107gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c 91gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c
108gnunet_daemon_latency_logger_LDADD = $(XLIB) \ 92gnunet_daemon_latency_logger_LDADD = $(XLIB) \
109 $(top_builddir)/src/ats/libgnunetats.la \ 93 $(top_builddir)/src/ats/libgnunetats.la \
110 $(top_builddir)/src/util/libgnunetutil.la \ 94 $(top_builddir)/src/util/libgnunetutil.la \
111 $(LTLIBINTL) -lsqlite3 95 $(LTLIBINTL) -lsqlite3
112gnunet_daemon_latency_logger_DEPENDENCIES = \
113 $(top_builddir)/src/ats/libgnunetats.la \
114 $(top_builddir)/src/util/libgnunetutil.la
115 96
116lib_LTLIBRARIES = \ 97lib_LTLIBRARIES = \
117 libgnunettestbed.la \ 98 libgnunettestbed.la \
@@ -154,11 +135,8 @@ libgnunettestbedlogger_la_LDFLAGS = \
154generate_underlay_topology_SOURCES = generate-underlay-topology.c 135generate_underlay_topology_SOURCES = generate-underlay-topology.c
155generate_underlay_topology_LDADD = $(XLIB) \ 136generate_underlay_topology_LDADD = $(XLIB) \
156 $(top_builddir)/src/util/libgnunetutil.la \ 137 $(top_builddir)/src/util/libgnunetutil.la \
157 $(top_builddir)/src/testbed/libgnunettestbed.la \ 138 libgnunettestbed.la \
158 $(LTLIBINTL) -lsqlite3 139 $(LTLIBINTL) -lsqlite3
159generate_underlay_topology_DEPENDENCIES = \
160 $(top_builddir)/src/util/libgnunetutil.la \
161 libgnunettestbed.la
162 140
163check_PROGRAMS = \ 141check_PROGRAMS = \
164 test_testbed_api_hosts \ 142 test_testbed_api_hosts \
@@ -399,8 +377,6 @@ test_testbed_api_barriers_SOURCES = \
399test_testbed_api_barriers_LDADD = \ 377test_testbed_api_barriers_LDADD = \
400 $(top_builddir)/src/util/libgnunetutil.la \ 378 $(top_builddir)/src/util/libgnunetutil.la \
401 libgnunettestbed.la 379 libgnunettestbed.la
402test_testbed_api_barriers_DEPENDENCIES = \
403 gnunet-service-test-barriers$(EXEEXT)
404 380
405gnunet_service_test_barriers_SOURCES = \ 381gnunet_service_test_barriers_SOURCES = \
406 gnunet-service-test-barriers.c \ 382 gnunet-service-test-barriers.c \