Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / auction / Makefile.am

diff --git a/src/auction/Makefile.am b/src/auction/Makefile.am
index 0ced1ad223857f5bb9c62774bba3de07f9debdb6..28b52f3d561d84791f4dc8a23c30186bdbfc90ba 100644 (file)
--- a/src/auction/Makefile.am
+++ b/src/auction/Makefile.am
@@ -5,7 +5,8 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-dist_pkgcfg_DATA = \
+
+pkgcfg_DATA = \
   auction.conf
 
 if MINGW
@@ -16,37 +17,58 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-# Note: In a real installation,
-# bin_PROGRAMS should be used for gnunet-auction
-# libexec_PROGRAMS should be used for gnunet-service-auction
 
-noinst_PROGRAMS = \
- gnunet-auction \
+libexec_PROGRAMS = \
  gnunet-service-auction
 
+gnunet_service_auction_SOURCES = \
+ gnunet-service-auction.c
+gnunet_service_auction_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -ljansson \
+  $(GN_LIBINTL)
 
-gnunet_auction_SOURCES = \
- gnunet-auction.c
-gnunet_auction_LDADD = \
+
+bin_PROGRAMS = \
+ gnunet-auction-create \
+ gnunet-auction-info \
+ gnunet-auction-join
+
+gnunet_auction_create_SOURCES = \
+ gnunet-auction-create.c
+gnunet_auction_create_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  -ljansson \
   $(GN_LIBINTL)
 
-gnunet_service_auction_SOURCES = \
- gnunet-service-auction.c
-gnunet_service_auction_LDADD = \
+gnunet_auction_info_SOURCES = \
+ gnunet-auction-info.c
+gnunet_auction_info_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  -ljansson \
+  $(GN_LIBINTL)
+
+gnunet_auction_join_SOURCES = \
+ gnunet-auction-join.c
+gnunet_auction_join_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -ljansson \
   $(GN_LIBINTL)
 
 
 check_PROGRAMS = \
  test_auction_api
 
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
-TESTS = $(check_PROGRAMS)
-endif
-
 test_auction_api_SOURCES = \
  test_auction_api.c
 test_auction_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la
+
+
+check_SCRIPTS = \
+ test_auction_create.sh
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif