~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.4.x' into 2.5.x
[catacomb]
/
progs
/
Makefile.am
diff --git
a/progs/Makefile.am
b/progs/Makefile.am
index
4d1dbd9
..
6de619f
100644
(file)
--- a/
progs/Makefile.am
+++ b/
progs/Makefile.am
@@
-33,7
+33,7
@@
UTILS_LIBS = \
libcatcrypt.la $(top_builddir)/libcatacomb.la \
$(mLib_LIBS) $(LIBS)
libcatcrypt.la $(top_builddir)/libcatacomb.la \
$(mLib_LIBS) $(LIBS)
-LDADD = $(UTILS_LIBS)
+LDADD = $(UTILS_LIBS)
$(CATACOMB_LIBS)
###--------------------------------------------------------------------------
### The `catcrypt' library.
###--------------------------------------------------------------------------
### The `catcrypt' library.
@@
-99,7
+99,9
@@
bin_PROGRAMS += perftest
## Remember passphrases for limited periods of time.
bin_PROGRAMS += pixie
pixie_SOURCES = pixie.c
## Remember passphrases for limited periods of time.
bin_PROGRAMS += pixie
pixie_SOURCES = pixie.c
-pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS)
+pixie_LDADD = $(top_builddir)/base/libbase.la
+pixie_LDADD += $(top_builddir)/key/libkey.la
+pixie_LDADD += $(mLib_LIBS) $(PIXIE_LIBS) $(LOGLIBS)
dist_man_MANS += pixie.1
EXTRA_DIST += xpixie
dist_man_MANS += pixie.1
EXTRA_DIST += xpixie