aboutsummaryrefslogtreecommitdiff
path: root/src/nse
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/nse
parente184df6030ab5c5374fe3b8a94482ff5a30c1580 (diff)
downloadgnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.tar.gz
gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.zip
fixing parallel build, getting rid of useless _DEPENDENCIES declarations
Diffstat (limited to 'src/nse')
-rw-r--r--src/nse/Makefile.am19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 460498d79..18bbbfd5a 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -19,13 +19,10 @@ pkgcfg_DATA = \
19bin_PROGRAMS = gnunet-nse 19bin_PROGRAMS = gnunet-nse
20 20
21gnunet_nse_SOURCES = gnunet-nse.c 21gnunet_nse_SOURCES = gnunet-nse.c
22gnunet_nse_LDFLAGS = \ 22gnunet_nse_LDADD = \
23 libgnunetnse.la \ 23 libgnunetnse.la \
24 $(top_builddir)/src/util/libgnunetutil.la \ 24 $(top_builddir)/src/util/libgnunetutil.la \
25 $(XLIB) $(GN_LIBINTL) 25 $(XLIB) $(GN_LIBINTL)
26gnunet_nse_DEPENDENCIES = \
27 libgnunetnse.la \
28 $(top_builddir)/src/util/libgnunetutil.la
29 26
30lib_LTLIBRARIES = libgnunetnse.la 27lib_LTLIBRARIES = libgnunetnse.la
31 28
@@ -50,31 +47,25 @@ endif
50gnunet_nse_profiler_SOURCES = \ 47gnunet_nse_profiler_SOURCES = \
51 gnunet-nse-profiler.c 48 gnunet-nse-profiler.c
52gnunet_nse_profiler_LDADD = -lm \ 49gnunet_nse_profiler_LDADD = -lm \
53 $(top_builddir)/src/nse/libgnunetnse.la \ 50 libgnunetnse.la \
54 $(top_builddir)/src/util/libgnunetutil.la \ 51 $(top_builddir)/src/util/libgnunetutil.la \
55 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 52 $(top_builddir)/src/statistics/libgnunetstatistics.la \
56 $(top_builddir)/src/testbed/libgnunettestbed.la \ 53 $(top_builddir)/src/testbed/libgnunettestbed.la \
57 $(GN_LIBINTL) 54 $(GN_LIBINTL)
58gnunet_nse_profiler_DEPENDENCIES = \
59 libgnunetnse.la
60 55
61gnunet_service_nse_SOURCES = \ 56gnunet_service_nse_SOURCES = \
62 gnunet-service-nse.c 57 gnunet-service-nse.c
63gnunet_service_nse_LDADD = \ 58gnunet_service_nse_LDADD = \
64 $(top_builddir)/src/nse/libgnunetnse.la \ 59 libgnunetnse.la \
65 $(top_builddir)/src/util/libgnunetutil.la \ 60 $(top_builddir)/src/util/libgnunetutil.la \
66 $(top_builddir)/src/core/libgnunetcore.la \ 61 $(top_builddir)/src/core/libgnunetcore.la \
67 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 62 $(top_builddir)/src/statistics/libgnunetstatistics.la \
68 $(LIBGCRYPT_LIBS) \ 63 $(LIBGCRYPT_LIBS) \
69 -lm -lgcrypt \ 64 -lm -lgcrypt \
70 $(GN_LIBINTL) 65 $(GN_LIBINTL)
71gnunet_service_nse_DEPENDENCIES = \
72 libgnunetnse.la
73if ENABLE_NSE_HISTOGRAM 66if ENABLE_NSE_HISTOGRAM
74 gnunet_service_nse_LDADD += \ 67 gnunet_service_nse_LDADD += \
75 $(top_builddir)/src/testbed/libgnunettestbedlogger.la 68 $(top_builddir)/src/testbed/libgnunettestbedlogger.la
76 gnunet_service_nse_DEPENDENCIES += \
77 $(top_builddir)/src/testbed/libgnunettestbedlogger.la
78endif 69endif
79 70
80 71
@@ -97,14 +88,14 @@ endif
97test_nse_api_SOURCES = \ 88test_nse_api_SOURCES = \
98 test_nse_api.c 89 test_nse_api.c
99test_nse_api_LDADD = \ 90test_nse_api_LDADD = \
100 $(top_builddir)/src/nse/libgnunetnse.la \ 91 libgnunetnse.la \
101 $(top_builddir)/src/testing/libgnunettesting.la \ 92 $(top_builddir)/src/testing/libgnunettesting.la \
102 $(top_builddir)/src/util/libgnunetutil.la 93 $(top_builddir)/src/util/libgnunetutil.la
103 94
104test_nse_multipeer_SOURCES = \ 95test_nse_multipeer_SOURCES = \
105 test_nse_multipeer.c 96 test_nse_multipeer.c
106test_nse_multipeer_LDADD = \ 97test_nse_multipeer_LDADD = \
107 $(top_builddir)/src/nse/libgnunetnse.la \ 98 libgnunetnse.la \
108 $(top_builddir)/src/util/libgnunetutil.la \ 99 $(top_builddir)/src/util/libgnunetutil.la \
109 $(top_builddir)/src/testbed/libgnunettestbed.la \ 100 $(top_builddir)/src/testbed/libgnunettestbed.la \
110 -lm 101 -lm