From fea058a5297479ea66088c8b96c7d3ee9beb1182 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Sat, 25 Feb 2017 21:10:46 +0000 Subject: [PATCH] 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. --- src/cadet/Makefile.am | 18 +++++++++--------- 1 file 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 if HAVE_TESTING - noinst_LIBRARIES = libgnunetcadettest.a libgnunetcadettestnew.a $(noinst_LIB_EXP) + noinst_LTLIBRARIES = libgnunetcadettest.la libgnunetcadettestnew.la $(noinst_LIB_EXP) noinst_PROGRAMS = gnunet-cadet-profiler endif -libgnunetcadettest_a_SOURCES = \ +libgnunetcadettest_la_SOURCES = \ cadet_test_lib.c cadet_test_lib.h -libgnunetcadettest_a_LIBADD = \ +libgnunetcadettest_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ libgnunetcadet.la @@ -164,14 +164,14 @@ endif ld_cadet_test_lib = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - libgnunetcadettest.a \ + libgnunetcadettest.la \ libgnunetcadet.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la dep_cadet_test_lib = \ libgnunetcadet.la \ - libgnunetcadettest.a \ + libgnunetcadettest.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la @@ -263,9 +263,9 @@ test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) # NEW TESTS -libgnunetcadettestnew_a_SOURCES = \ +libgnunetcadettestnew_la_SOURCES = \ cadet_test_lib_new.c cadet_test_lib_new.h -libgnunetcadettestnew_a_LIBADD = \ +libgnunetcadettestnew_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ libgnunetcadetnew.la @@ -274,12 +274,12 @@ ld_cadet_test_lib_new = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ libgnunetcadetnew.la \ - libgnunetcadettestnew.a \ + libgnunetcadettestnew.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la dep_cadet_test_lib_new = \ libgnunetcadetnew.la \ - libgnunetcadettestnew.a \ + libgnunetcadettestnew.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la test_cadet_2_forward_new_SOURCES = \ -- 2.25.1