~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'privsep'
[tripe]
/
server
/
Makefile.am
diff --git
a/server/Makefile.am
b/server/Makefile.am
index
e033ab0
..
e54b797
100644
(file)
--- a/
server/Makefile.am
+++ b/
server/Makefile.am
@@
-28,13
+28,14
@@
include $(top_srcdir)/vars.am
sbin_PROGRAMS =
man_MANS =
sbin_PROGRAMS =
man_MANS =
+LDADD = $(libtripe) $(libpriv) $(catacomb_LIBS)
+
###--------------------------------------------------------------------------
### The main server.
sbin_PROGRAMS += tripe
tripe_SOURCES =
###--------------------------------------------------------------------------
### The main server.
sbin_PROGRAMS += tripe
tripe_SOURCES =
-tripe_LDADD = $(libtripe) $(catacomb_LIBS)
## Main header file.
tripe_SOURCES += tripe.h
## Main header file.
tripe_SOURCES += tripe.h
@@
-47,6
+48,7
@@
tripe_SOURCES += keyset.c
tripe_SOURCES += keyexch.c
tripe_SOURCES += chal.c
tripe_SOURCES += peer.c
tripe_SOURCES += keyexch.c
tripe_SOURCES += chal.c
tripe_SOURCES += peer.c
+tripe_SOURCES += privsep.c
tripe_SOURCES += admin.c
tripe_SOURCES += tripe.c
tripe_SOURCES += admin.c
tripe_SOURCES += tripe.c