aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am14
-rw-r--r--src/reclaim/Makefile.am24
-rw-r--r--src/reclaim/gnunet-reclaim.c30
3 files changed, 33 insertions, 35 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c1c708aa6..b16792e15 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,19 +11,17 @@ endif
11 11
12if HAVE_EXPERIMENTAL 12if HAVE_EXPERIMENTAL
13 EXP_DIR = \ 13 EXP_DIR = \
14 rps 14 rps \
15 credential \
16 reclaim-attribute \
17 reclaim
15if HAVE_ABE 18if HAVE_ABE
16if HAVE_JSON
17 EXP_DIR += \ 19 EXP_DIR += \
18 abe \ 20 abe \
19 credential \
20 reclaim-attribute \
21 reclaim
22endif
23endif 21endif
24if HAVE_JSON 22if HAVE_JSON
25 EXP_DIR += \ 23 EXP_DIR += \
26 auction 24 auction
27endif 25endif
28endif 26endif
29 27
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index bea8cd38e..210759fce 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -99,7 +99,7 @@ libgnunet_plugin_reclaim_sqlite_la_LIBADD = \
99 libgnunetreclaim.la \ 99 libgnunetreclaim.la \
100 $(top_builddir)/src/sq/libgnunetsq.la \ 100 $(top_builddir)/src/sq/libgnunetsq.la \
101 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 101 $(top_builddir)/src/statistics/libgnunetstatistics.la \
102 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ 102 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
103 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ 103 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
104 $(LTLIBINTL) 104 $(LTLIBINTL)
105libgnunet_plugin_reclaim_sqlite_la_LDFLAGS = \ 105libgnunet_plugin_reclaim_sqlite_la_LDFLAGS = \
@@ -126,26 +126,26 @@ libgnunetreclaim_la_SOURCES = \
126 reclaim.h 126 reclaim.h
127libgnunetreclaim_la_LIBADD = \ 127libgnunetreclaim_la_LIBADD = \
128 $(top_builddir)/src/util/libgnunetutil.la \ 128 $(top_builddir)/src/util/libgnunetutil.la \
129 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ 129 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
130 $(GN_LIBINTL) $(XLIB) 130 $(GN_LIBINTL) $(XLIB)
131libgnunetreclaim_la_LDFLAGS = \ 131libgnunetreclaim_la_LDFLAGS = \
132 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 132 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
133 -version-info 0:0:0 133 -version-info 0:0:0
134 134
135gnunet_reclaim_SOURCES = \ 135gnunet_reclaim_SOURCES = \
136 gnunet-reclaim.c 136 gnunet-reclaim.c
137gnunet_reclaim_LDADD = \ 137gnunet_reclaim_LDADD = \
138 $(top_builddir)/src/util/libgnunetutil.la \ 138 $(top_builddir)/src/util/libgnunetutil.la \
139 $(top_builddir)/src/namestore/libgnunetnamestore.la \ 139 $(top_builddir)/src/namestore/libgnunetnamestore.la \
140 libgnunetreclaim.la \ 140 libgnunetreclaim.la \
141 $(top_builddir)/src/identity/libgnunetidentity.la \ 141 $(top_builddir)/src/identity/libgnunetidentity.la \
142 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ 142 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
143 $(GN_LIBINTL) 143 $(GN_LIBINTL)
144 144
145check_SCRIPTS = \ 145check_SCRIPTS = \
146 test_reclaim_attribute.sh \ 146 test_reclaim_attribute.sh \
147 test_reclaim_issue.sh \ 147 test_reclaim_issue.sh \
148 test_reclaim_consume.sh \ 148 test_reclaim_consume.sh \
149 test_reclaim_revoke.sh 149 test_reclaim_revoke.sh
150 150
151if ENABLE_TEST_RUN 151if ENABLE_TEST_RUN
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index b10586feb..df6ebc66f 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -505,52 +505,52 @@ main(int argc, char *const argv[])
505 505
506 GNUNET_GETOPT_option_string ('a', 506 GNUNET_GETOPT_option_string ('a',
507 "add", 507 "add",
508 NULL, 508 "NAME",
509 gettext_noop ("Add attribute"), 509 gettext_noop ("Add an attribute NAME"),
510 &attr_name), 510 &attr_name),
511 511
512 GNUNET_GETOPT_option_string ('V', 512 GNUNET_GETOPT_option_string ('V',
513 "value", 513 "value",
514 NULL, 514 "VALUE",
515 gettext_noop ("Attribute value"), 515 gettext_noop ("The attribute VALUE"),
516 &attr_value), 516 &attr_value),
517 GNUNET_GETOPT_option_string ('e', 517 GNUNET_GETOPT_option_string ('e',
518 "ego", 518 "ego",
519 NULL, 519 "EGO",
520 gettext_noop ("Ego"), 520 gettext_noop ("The EGO to use"),
521 &ego_name), 521 &ego_name),
522 GNUNET_GETOPT_option_string ('r', 522 GNUNET_GETOPT_option_string ('r',
523 "rp", 523 "rp",
524 NULL, 524 "RP",
525 gettext_noop ("Audience (relying party)"), 525 gettext_noop ("Specify the relying party for issue"),
526 &rp), 526 &rp),
527 GNUNET_GETOPT_option_flag ('D', 527 GNUNET_GETOPT_option_flag ('D',
528 "dump", 528 "dump",
529 gettext_noop ("List attributes for Ego"), 529 gettext_noop ("List attributes for EGO"),
530 &list), 530 &list),
531 GNUNET_GETOPT_option_string ('i', 531 GNUNET_GETOPT_option_string ('i',
532 "issue", 532 "issue",
533 NULL, 533 "A1,A2,...",
534 gettext_noop ("Issue a ticket"), 534 gettext_noop ("Issue a ticket for a set of attributes separated by comma"),
535 &issue_attrs), 535 &issue_attrs),
536 GNUNET_GETOPT_option_string ('C', 536 GNUNET_GETOPT_option_string ('C',
537 "consume", 537 "consume",
538 NULL, 538 "TICKET",
539 gettext_noop ("Consume a ticket"), 539 gettext_noop ("Consume a ticket"),
540 &consume_ticket), 540 &consume_ticket),
541 GNUNET_GETOPT_option_string ('R', 541 GNUNET_GETOPT_option_string ('R',
542 "revoke", 542 "revoke",
543 NULL, 543 "TICKET",
544 gettext_noop ("Revoke a ticket"), 544 gettext_noop ("Revoke a ticket"),
545 &revoke_ticket), 545 &revoke_ticket),
546 GNUNET_GETOPT_option_string ('t', 546 GNUNET_GETOPT_option_string ('t',
547 "type", 547 "type",
548 NULL, 548 "TYPE",
549 gettext_noop ("Type of attribute"), 549 gettext_noop ("Type of attribute"),
550 &type_str), 550 &type_str),
551 GNUNET_GETOPT_option_relative_time ('E', 551 GNUNET_GETOPT_option_relative_time ('E',
552 "expiration", 552 "expiration",
553 NULL, 553 "INTERVAL",
554 gettext_noop ("Expiration interval of the attribute"), 554 gettext_noop ("Expiration interval of the attribute"),
555 &exp_interval), 555 &exp_interval),
556 556