projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-simplify
[oweals/gnunet.git]
/
src
/
hostlist
/
Makefile.am
diff --git
a/src/hostlist/Makefile.am
b/src/hostlist/Makefile.am
index d51d52f67328558f98f6f2f12028058f542c01ea..726251aec03851ac6f04c1a3e2aea947a1d3221c 100644
(file)
--- a/
src/hostlist/Makefile.am
+++ b/
src/hostlist/Makefile.am
@@
-1,17
+1,30
@@
INCLUDES = -I$(top_srcdir)/src/include
INCLUDES = -I$(top_srcdir)/src/include
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+dist_pkgcfg_DATA = \
+ hostlist.conf
+
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
endif
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
endif
+if HAVE_MHD
+ HOSTLIST_SERVER_SOURCES = hostlist-server.c hostlist-server.h
+ GN_LIBMHD = -lmicrohttpd
+endif
-bin_PROGRAMS = \
+if HAVE_LIBCURL
+libexec_PROGRAMS = \
gnunet-daemon-hostlist
gnunet-daemon-hostlist
+endif
gnunet_daemon_hostlist_SOURCES = \
gnunet_daemon_hostlist_SOURCES = \
- gnunet-daemon-hostlist.c \
+ gnunet-daemon-hostlist.c
gnunet-daemon-hostlist.h
\
hostlist-client.c hostlist-client.h \
hostlist-client.c hostlist-client.h \
- hostlist-server.c hostlist-server.h
+ $(HOSTLIST_SERVER_SOURCES)
gnunet_daemon_hostlist_LDADD = \
$(top_builddir)/src/core/libgnunetcore.la \
gnunet_daemon_hostlist_LDADD = \
$(top_builddir)/src/core/libgnunetcore.la \
@@
-20,39
+33,55
@@
gnunet_daemon_hostlist_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
-
-lmicrohttpd
\
- @LIBCURL@ \
+
$(GN_LIBMHD)
\
+ @LIBCURL@
\
$(GN_LIBINTL)
gnunet_daemon_hostlist_CPPFLAGS = \
@LIBCURL_CPPFLAGS@
$(GN_LIBINTL)
gnunet_daemon_hostlist_CPPFLAGS = \
@LIBCURL_CPPFLAGS@
+if HAVE_LIBCURL
check_PROGRAMS = \
test_gnunet_daemon_hostlist \
check_PROGRAMS = \
test_gnunet_daemon_hostlist \
+ test_gnunet_daemon_hostlist_reconnect \
test_gnunet_daemon_hostlist_learning
test_gnunet_daemon_hostlist_learning
-
-TESTS = $(check_PROGRAMS)
+if HAVE_MHD
+if ENABLE_TEST_RUN
+TESTS = \
+ test_gnunet_daemon_hostlist \
+ test_gnunet_daemon_hostlist_reconnect \
+ test_gnunet_daemon_hostlist_learning
+endif
+endif
+endif
test_gnunet_daemon_hostlist_SOURCES = \
test_gnunet_daemon_hostlist.c
test_gnunet_daemon_hostlist_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
test_gnunet_daemon_hostlist_SOURCES = \
test_gnunet_daemon_hostlist.c
test_gnunet_daemon_hostlist_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_gnunet_daemon_hostlist_reconnect_SOURCES = \
+ test_gnunet_daemon_hostlist_reconnect.c
+test_gnunet_daemon_hostlist_reconnect_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la
test_gnunet_daemon_hostlist_learning_SOURCES = \
test_gnunet_daemon_hostlist_learning.c
test_gnunet_daemon_hostlist_learning_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la
test_gnunet_daemon_hostlist_learning_SOURCES = \
test_gnunet_daemon_hostlist_learning.c
test_gnunet_daemon_hostlist_learning_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
+ test_hostlist_defaults.conf \
test_gnunet_daemon_hostlist_data.conf \
test_gnunet_daemon_hostlist_data.conf \
- test_gnunet_daemon_hostlist_
data_
peer1.conf \
- test_gnunet_daemon_hostlist_
data_
peer2.conf \
-
learning_data
.conf \
-
learning_data_peer1
.conf \
- learning_data_peer2.conf
-
+ test_gnunet_daemon_hostlist_peer1.conf \
+ test_gnunet_daemon_hostlist_peer2.conf \
+
test_learning_adv_peer
.conf \
+
test_learning_learn_peer
.conf \
+ test_learning_learn_peer2.conf \
+ learning_data.conf