aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorРуслан Ижбулатов <lrn1986@gmail.com>2017-02-25 21:10:46 +0000
committerРуслан Ижбулатов <lrn1986@gmail.com>2017-02-26 14:44:09 +0000
commitfea058a5297479ea66088c8b96c7d3ee9beb1182 (patch)
treeabe438a3bab5b1a39737c813733d97331d0590c8 /src
parente4493604cbfacd02c1a82da4a469591150df0dcd (diff)
downloadgnunet-fea058a5297479ea66088c8b96c7d3ee9beb1182.tar.gz
gnunet-fea058a5297479ea66088c8b96c7d3ee9beb1182.zip
Change helper libraries to be noinst_LTLIBTRARIES
This is the standard way to make helper/convenience libraries with libtool. Doesn't link on W32 otherwise.
Diffstat (limited to 'src')
-rw-r--r--src/cadet/Makefile.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 3cf92c349..b52079b2e 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -110,13 +110,13 @@ endif
110 110
111 111
112if HAVE_TESTING 112if HAVE_TESTING
113 noinst_LIBRARIES = libgnunetcadettest.a libgnunetcadettestnew.a $(noinst_LIB_EXP) 113 noinst_LTLIBRARIES = libgnunetcadettest.la libgnunetcadettestnew.la $(noinst_LIB_EXP)
114 noinst_PROGRAMS = gnunet-cadet-profiler 114 noinst_PROGRAMS = gnunet-cadet-profiler
115endif 115endif
116 116
117libgnunetcadettest_a_SOURCES = \ 117libgnunetcadettest_la_SOURCES = \
118 cadet_test_lib.c cadet_test_lib.h 118 cadet_test_lib.c cadet_test_lib.h
119libgnunetcadettest_a_LIBADD = \ 119libgnunetcadettest_la_LIBADD = \
120 $(top_builddir)/src/util/libgnunetutil.la \ 120 $(top_builddir)/src/util/libgnunetutil.la \
121 $(top_builddir)/src/testbed/libgnunettestbed.la \ 121 $(top_builddir)/src/testbed/libgnunettestbed.la \
122 libgnunetcadet.la 122 libgnunetcadet.la
@@ -164,14 +164,14 @@ endif
164ld_cadet_test_lib = \ 164ld_cadet_test_lib = \
165 $(top_builddir)/src/util/libgnunetutil.la \ 165 $(top_builddir)/src/util/libgnunetutil.la \
166 $(top_builddir)/src/testing/libgnunettesting.la \ 166 $(top_builddir)/src/testing/libgnunettesting.la \
167 libgnunetcadettest.a \ 167 libgnunetcadettest.la \
168 libgnunetcadet.la \ 168 libgnunetcadet.la \
169 $(top_builddir)/src/testbed/libgnunettestbed.la \ 169 $(top_builddir)/src/testbed/libgnunettestbed.la \
170 $(top_builddir)/src/statistics/libgnunetstatistics.la 170 $(top_builddir)/src/statistics/libgnunetstatistics.la
171 171
172dep_cadet_test_lib = \ 172dep_cadet_test_lib = \
173 libgnunetcadet.la \ 173 libgnunetcadet.la \
174 libgnunetcadettest.a \ 174 libgnunetcadettest.la \
175 $(top_builddir)/src/statistics/libgnunetstatistics.la 175 $(top_builddir)/src/statistics/libgnunetstatistics.la
176 176
177 177
@@ -263,9 +263,9 @@ test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
263 263
264 264
265# NEW TESTS 265# NEW TESTS
266libgnunetcadettestnew_a_SOURCES = \ 266libgnunetcadettestnew_la_SOURCES = \
267 cadet_test_lib_new.c cadet_test_lib_new.h 267 cadet_test_lib_new.c cadet_test_lib_new.h
268libgnunetcadettestnew_a_LIBADD = \ 268libgnunetcadettestnew_la_LIBADD = \
269 $(top_builddir)/src/util/libgnunetutil.la \ 269 $(top_builddir)/src/util/libgnunetutil.la \
270 $(top_builddir)/src/testbed/libgnunettestbed.la \ 270 $(top_builddir)/src/testbed/libgnunettestbed.la \
271 libgnunetcadetnew.la 271 libgnunetcadetnew.la
@@ -274,12 +274,12 @@ ld_cadet_test_lib_new = \
274 $(top_builddir)/src/util/libgnunetutil.la \ 274 $(top_builddir)/src/util/libgnunetutil.la \
275 $(top_builddir)/src/testing/libgnunettesting.la \ 275 $(top_builddir)/src/testing/libgnunettesting.la \
276 libgnunetcadetnew.la \ 276 libgnunetcadetnew.la \
277 libgnunetcadettestnew.a \ 277 libgnunetcadettestnew.la \
278 $(top_builddir)/src/testbed/libgnunettestbed.la \ 278 $(top_builddir)/src/testbed/libgnunettestbed.la \
279 $(top_builddir)/src/statistics/libgnunetstatistics.la 279 $(top_builddir)/src/statistics/libgnunetstatistics.la
280dep_cadet_test_lib_new = \ 280dep_cadet_test_lib_new = \
281 libgnunetcadetnew.la \ 281 libgnunetcadetnew.la \
282 libgnunetcadettestnew.a \ 282 libgnunetcadettestnew.la \
283 $(top_builddir)/src/statistics/libgnunetstatistics.la 283 $(top_builddir)/src/statistics/libgnunetstatistics.la
284 284
285test_cadet_2_forward_new_SOURCES = \ 285test_cadet_2_forward_new_SOURCES = \