projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Debian Vcs-* fields to point to git repository
[onak.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index b952ff0c578875ec3f3bcd61a2192a32ee89e8ce..b48d884fe2b9b082889ab2af95f3601ae59e4a30 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-11,12
+11,14
@@
DBTYPE = @DBTYPE@
#
LIBS = @LIBS@ @NETTLE_LIBS@
DB4LIBS = @DB4LIBS@
#
LIBS = @LIBS@ @NETTLE_LIBS@
DB4LIBS = @DB4LIBS@
+CURLLIBS = @LIBCURL@
#MAKEDEPEND = makedepend -f- --
MAKEDEPEND = $(CC) -MM
prefix ?= @prefix@
exec_prefix ?= @exec_prefix@
#MAKEDEPEND = makedepend -f- --
MAKEDEPEND = $(CC) -MM
prefix ?= @prefix@
exec_prefix ?= @exec_prefix@
-PROGS = add lookup hashquery gpgwww onak splitkeys onak-mail.pl stripkey
+PROGS = add lookup hashquery gpgwww onak splitkeys onak-mail.pl stripkey \
+ wotsap
CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o marshal.o \
keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sigcheck.o \
log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o
CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o marshal.o \
keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sigcheck.o \
log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o keyarray.o
@@
-49,7
+51,7
@@
endif
OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
- $(BACKENDS)
+
wotsap
$(BACKENDS)
test: onak $(BACKENDS)
@./runtests
test: onak $(BACKENDS)
@./runtests
@@
-81,13
+83,16
@@
keydctl: keydctl.o onak-conf.o ll.o log.o
-o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
libkeydb_db4.so: keydb_db4.o $(CORE_OBJS)
-o keydctl keydctl.o onak-conf.o ll.o log.o $(LIBS)
libkeydb_db4.so: keydb_db4.o $(CORE_OBJS)
- $(CC) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
+ $(CC) $(LDFLAGS) -shared $(DB4LIBS) -o libkeydb_db4.so keydb_db4.o $(CORE_OBJS)
+
+libkeydb_hkp.so: keydb_hkp.o $(CORE_OBJS)
+ $(CC) $(LDFLAGS) -shared $(CURLLIBS) -o libkeydb_hkp.so keydb_hkp.o $(CORE_OBJS)
libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
libkeydb_pg.so: keydb_pg.o $(CORE_OBJS)
- $(CC) -shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
+ $(CC)
$(LDFLAGS)
-shared $(PQLIBS) -o libkeydb_pg.so keydb_pg.o $(CORE_OBJS)
libkeydb_%.so: keydb_%.o $(CORE_OBJS)
libkeydb_%.so: keydb_%.o $(CORE_OBJS)
- $(CC) -shared -o $@ $< $(CORE_OBJS)
+ $(CC)
$(LDFLAGS)
-shared -o $@ $< $(CORE_OBJS)
splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
$(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
splitkeys: splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ)
$(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(KEYDB_OBJ) \
@@
-105,6
+110,10
@@
sixdegrees: sixdegrees.o $(OBJS)
$(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS) \
$(PROGS_LDFLAGS_EXTRA)
$(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS) \
$(PROGS_LDFLAGS_EXTRA)
+wotsap: wotsap.o $(OBJS)
+ $(CC) $(LDFLAGS) -o wotsap wotsap.o $(OBJS) $(LIBS) \
+ $(PROGS_LDFLAGS_EXTRA)
+
stripkey: stripkey.o $(OBJS)
$(CC) $(LDFLAGS) -o stripkey stripkey.o $(OBJS) $(LIBS) \
$(PROGS_LDFLAGS_EXTRA)
stripkey: stripkey.o $(OBJS)
$(CC) $(LDFLAGS) -o stripkey stripkey.o $(OBJS) $(LIBS) \
$(PROGS_LDFLAGS_EXTRA)
@@
-152,7
+161,8
@@
clean:
$(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \
$(RM) $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
sixdegrees.o splitkeys.o stripkey.o onak.conf keyd.o \
- keydctl.o hashquery.o version.h \
+ keydctl.o hashquery.o wotsap.o version.h \
+ TAGS cscope.out cscope.files \
$(foreach be,@BACKENDS@,keydb_$(be).o) *.so
ifeq (x@KEYD@, xyes)
$(RM) keyd.o keydb_$(DBTYPE).o
$(foreach be,@BACKENDS@,keydb_$(be).o) *.so
ifeq (x@KEYD@, xyes)
$(RM) keyd.o keydb_$(DBTYPE).o