diff options
Diffstat (limited to 'src/gns/Makefile.am')
-rw-r--r-- | src/gns/Makefile.am | 60 |
1 files changed, 9 insertions, 51 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 0d38cb51e..4a152a6df 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -15,7 +15,6 @@ EXTRA_DIST = \ | |||
15 | test_gns_lookup.conf \ | 15 | test_gns_lookup.conf \ |
16 | test_gns_proxy.conf \ | 16 | test_gns_proxy.conf \ |
17 | test_gns_simple_lookup.conf \ | 17 | test_gns_simple_lookup.conf \ |
18 | gns-helper-service-w32.conf \ | ||
19 | w32nsp.def \ | 18 | w32nsp.def \ |
20 | openssl.cnf \ | 19 | openssl.cnf \ |
21 | gnunet-gns-proxy-setup-ca.in \ | 20 | gnunet-gns-proxy-setup-ca.in \ |
@@ -25,14 +24,6 @@ EXTRA_DIST = \ | |||
25 | $(check_SCRIPTS) \ | 24 | $(check_SCRIPTS) \ |
26 | $(pkgdata_DATA) | 25 | $(pkgdata_DATA) |
27 | 26 | ||
28 | if MINGW | ||
29 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
30 | DO_W32_HELPER = gnunet-gns-helper-service-w32 | ||
31 | DO_W32_NSP = libw32nsp.la | ||
32 | DO_W32_NSPTOOLS = w32nsp-install w32nsp-uninstall w32nsp-resolve | ||
33 | DO_W32_HS_CONF = gns-helper-service-w32.conf | ||
34 | DO_NONPOSIX_GNSIMPORT = gnunet-gns-import | ||
35 | endif | ||
36 | USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la | 27 | USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la |
37 | 28 | ||
38 | if USE_COVERAGE | 29 | if USE_COVERAGE |
@@ -46,11 +37,9 @@ libexecdir= $(pkglibdir)/libexec/ | |||
46 | plugindir = $(libdir)/gnunet | 37 | plugindir = $(libdir)/gnunet |
47 | 38 | ||
48 | pkgcfg_DATA = \ | 39 | pkgcfg_DATA = \ |
49 | gns.conf \ | 40 | gns.conf |
50 | $(DO_W32_HS_CONF) | ||
51 | 41 | ||
52 | lib_LTLIBRARIES = \ | 42 | lib_LTLIBRARIES = \ |
53 | $(DO_W32_NSP) \ | ||
54 | libgnunetgns.la | 43 | libgnunetgns.la |
55 | 44 | ||
56 | 45 | ||
@@ -73,12 +62,9 @@ endif | |||
73 | libexec_PROGRAMS = \ | 62 | libexec_PROGRAMS = \ |
74 | gnunet-service-gns \ | 63 | gnunet-service-gns \ |
75 | gnunet-dns2gns \ | 64 | gnunet-dns2gns \ |
76 | $(DO_W32_HELPER) \ | ||
77 | $(DO_PROXY) | 65 | $(DO_PROXY) |
78 | 66 | ||
79 | bin_PROGRAMS = \ | 67 | bin_PROGRAMS = \ |
80 | $(DO_W32_NSPTOOLS) \ | ||
81 | $(DO_NONPOSIX_GNSIMPORT) \ | ||
82 | gnunet-gns | 68 | gnunet-gns |
83 | 69 | ||
84 | noinst_PROGRAMS = \ | 70 | noinst_PROGRAMS = \ |
@@ -199,35 +185,15 @@ test_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \ | |||
199 | $(GN_LIBINTL) | 185 | $(GN_LIBINTL) |
200 | test_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) | 186 | test_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
201 | 187 | ||
202 | gnunet_gns_helper_service_w32_SOURCES = \ | 188 | #gnunet_gns_import_SOURCES = \ |
203 | gnunet-gns-helper-service-w32.c | 189 | # gnunet-gns-import.c |
204 | gnunet_gns_helper_service_w32_LDADD = \ | 190 | #gnunet_gns_import_LDADD = \ |
205 | libgnunetgns.la \ | 191 | # $(top_builddir)/src/identity/libgnunetidentity.la \ |
206 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 192 | # $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
207 | $(top_builddir)/src/util/libgnunetutil.la \ | 193 | # $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
208 | $(GN_LIBINTL) | 194 | # $(top_builddir)/src/util/libgnunetutil.la \ |
209 | 195 | # $(GN_LIBINTL) | |
210 | gnunet_gns_import_SOURCES = \ | ||
211 | gnunet-gns-import.c | ||
212 | gnunet_gns_import_LDADD = \ | ||
213 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
214 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | ||
215 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | ||
216 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
217 | $(GN_LIBINTL) | ||
218 | |||
219 | 196 | ||
220 | w32nsp_install_SOURCES = \ | ||
221 | w32nsp-install.c | ||
222 | w32nsp_install_LDADD = -lws2_32 | ||
223 | |||
224 | w32nsp_uninstall_SOURCES = \ | ||
225 | w32nsp-uninstall.c | ||
226 | w32nsp_uninstall_LDADD = -lws2_32 | ||
227 | |||
228 | w32nsp_resolve_SOURCES = \ | ||
229 | w32nsp-resolve.c | ||
230 | w32nsp_resolve_LDADD = -lws2_32 | ||
231 | 197 | ||
232 | gnunet_service_gns_SOURCES = \ | 198 | gnunet_service_gns_SOURCES = \ |
233 | gnunet-service-gns.c gnunet-service-gns.h \ | 199 | gnunet-service-gns.c gnunet-service-gns.h \ |
@@ -247,14 +213,6 @@ gnunet_service_gns_LDADD = \ | |||
247 | $(GN_LIBINTL) | 213 | $(GN_LIBINTL) |
248 | 214 | ||
249 | 215 | ||
250 | libw32nsp_la_SOURCES = \ | ||
251 | w32nsp.c | ||
252 | libw32nsp_la_LIBADD = \ | ||
253 | -lole32 -lws2_32 | ||
254 | libw32nsp_la_LDFLAGS = \ | ||
255 | -export-symbols $(top_srcdir)/src/gns/w32nsp.def \ | ||
256 | -no-undefined -static-libgcc | ||
257 | |||
258 | libgnunetgns_la_SOURCES = \ | 216 | libgnunetgns_la_SOURCES = \ |
259 | gns_api.c gns_api.h \ | 217 | gns_api.c gns_api.h \ |
260 | gns_tld_api.c gns.h | 218 | gns_tld_api.c gns.h |