projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor changes for address conversion
[oweals/gnunet.git]
/
src
/
dns
/
Makefile.am
diff --git
a/src/dns/Makefile.am
b/src/dns/Makefile.am
index 780b80d56b4afc84a4656f1382e23ec547110eed..0ef1623f9f01759595e92c6dd240c0ee06c788ad 100644
(file)
--- a/
src/dns/Makefile.am
+++ b/
src/dns/Makefile.am
@@
-1,4
+1,4
@@
-
INCLUDE
S = -I$(top_srcdir)/src/include
+
AM_CPPFLAG
S = -I$(top_srcdir)/src/include
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@
-10,6
+10,8
@@
endif
pkgcfgdir= $(pkgdatadir)/config.d/
pkgcfgdir= $(pkgdatadir)/config.d/
+libexecdir= $(pkglibdir)/libexec/
+
plugindir = $(libdir)/gnunet
pkgcfg_DATA = \
plugindir = $(libdir)/gnunet
pkgcfg_DATA = \
@@
-18,7
+20,7
@@
pkgcfg_DATA = \
if LINUX
HIJACKBIN = gnunet-helper-dns
install-exec-hook:
if LINUX
HIJACKBIN = gnunet-helper-dns
install-exec-hook:
- $(top_srcdir)/src/dns/install-dns-helper.sh $(
bin
dir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
+ $(top_srcdir)/src/dns/install-dns-helper.sh $(
libexec
dir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
else
install-exec-hook:
endif
else
install-exec-hook:
endif
@@
-28,7
+30,7
@@
lib_LTLIBRARIES = \
libgnunetdnsstub.la \
libgnunetdns.la
libgnunetdnsstub.la \
libgnunetdns.la
-
bin
_PROGRAMS = \
+
libexec
_PROGRAMS = \
gnunet-service-dns $(HIJACKBIN)
noinst_PROGRAMS = \
gnunet-service-dns $(HIJACKBIN)
noinst_PROGRAMS = \
@@
-71,20
+73,22
@@
gnunet_dns_redirector_DEPENDENCIES = \
gnunet_service_dns_SOURCES = \
gnunet-service-dns.c
gnunet_service_dns_LDADD = \
gnunet_service_dns_SOURCES = \
gnunet-service-dns.c
gnunet_service_dns_LDADD = \
- libgnunetdnsstub.la \
+
$(top_builddir)/src/dns/
libgnunetdnsstub.la \
$(top_builddir)/src/tun/libgnunettun.la \
$(top_builddir)/src/tun/libgnunettun.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_dns_DEPENDENCIES = \
+ libgnunetdnsstub.la
libgnunetdnsparser_la_SOURCES = \
dnsparser.c
libgnunetdnsparser_la_LIBADD = \
libgnunetdnsparser_la_SOURCES = \
dnsparser.c
libgnunetdnsparser_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ -lidn
libgnunetdnsparser_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
libgnunetdnsparser_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info
0:0:0
+ -version-info
1:0:1
libgnunetdnsstub_la_SOURCES = \
dnsstub.c
libgnunetdnsstub_la_SOURCES = \
dnsstub.c
@@
-111,6
+115,7
@@
libgnunet_plugin_block_dns_la_LDFLAGS = \
if ENABLE_TEST_RUN
if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
endif
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
endif