Working on libs

This commit is contained in:
thorkill 2015-06-13 21:17:50 +02:00
parent d24a91a7cf
commit 6d9853618a

View file

@ -13,9 +13,14 @@ if LINUX
sbin_PROGRAMS += sptps_speed sbin_PROGRAMS += sptps_speed
endif endif
DEFAULT_INCLUDES = lib_LTLIBRARIES = libtincd.la libed25519.la libchacha_poly1305.la libtincconf.la
ed25519_SOURCES = \ libchacha_poly1305_la_SOURCES = \
chacha-poly1305/chacha.c chacha-poly1305/chacha.h \
chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
libed25519_la_SOURCES = \
ed25519/add_scalar.c \ ed25519/add_scalar.c \
ed25519/ed25519.h \ ed25519/ed25519.h \
ed25519/fe.c ed25519/fe.h \ ed25519/fe.c ed25519/fe.h \
@ -29,15 +34,13 @@ ed25519_SOURCES = \
ed25519/sign.c \ ed25519/sign.c \
ed25519/verify.c ed25519/verify.c
chacha_poly1305_SOURCES = \ libtincconf_la_SOURCES = \
chacha-poly1305/chacha.c chacha-poly1305/chacha.h \ conf.c conf.h
chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
tincd_SOURCES = \ libtincd_la_SOURCES = \
conf.h \
buffer.c buffer.h \ buffer.c buffer.h \
cipher.h \ cipher.h \
conf.c conf.h \
connection.c connection.h \ connection.c connection.h \
control.c control.h \ control.c control.h \
control_common.h \ control_common.h \
@ -74,7 +77,7 @@ tincd_SOURCES = \
netutl.c netutl.h \ netutl.c netutl.h \
node.c node.h \ node.c node.h \
prf.h \ prf.h \
process.c process.h \ process.h process.c \
protocol.c protocol.h \ protocol.c protocol.h \
protocol_auth.c \ protocol_auth.c \
protocol_edge.c \ protocol_edge.c \
@ -91,168 +94,105 @@ tincd_SOURCES = \
subnet.c subnet.h \ subnet.c subnet.h \
subnet_parse.c \ subnet_parse.c \
system.h \ system.h \
tincd.c \
utils.c utils.h \ utils.c utils.h \
xalloc.h \ xalloc.h \
version.c version.h \ version.c version.h \
ed25519/ecdh.c \ ed25519/ecdh.c \
ed25519/ecdsa.c \ ed25519/ecdsa.c \
$(ed25519_SOURCES) \
$(chacha_poly1305_SOURCES)
tinc_SOURCES = \
dropin.c dropin.h \ dropin.c dropin.h \
getopt.c getopt.h \ getopt.c getopt.h \
getopt1.c \ getopt1.c \
$(libed25519_la_SOURCES) \
$(libchacha_poly1305_la_SOURCES)
tinc_SOURCES = \
invitation.c invitation.h \
top.c top.h \
fsck.c fsck.h \ fsck.c fsck.h \
info.c info.h \ info.c info.h \
invitation.c invitation.h \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
script.c script.h \
sptps.c sptps.h \
subnet_parse.c subnet.h \
tincctl.c tincctl.h \ tincctl.c tincctl.h \
top.c top.h \ $(libed25519_la_SOURCES) \
utils.c utils.h \ $(libchacha_poly1305_la_SOURCES)
version.c version.h \
ed25519/ecdh.c \
ed25519/ecdsa.c \
ed25519/ecdsagen.c \
$(ed25519_SOURCES) \
$(chacha_poly1305_SOURCES)
sptps_test_SOURCES = \ sptps_test_SOURCES = \
logger.c logger.h \
sptps.c sptps.h \
sptps_test.c \ sptps_test.c \
utils.c utils.h \ $(libed25519_la_SOURCES) \
ed25519/ecdh.c \ $(libchacha_poly1305_la_SOURCES)
ed25519/ecdsa.c \
$(ed25519_SOURCES) \
$(chacha_poly1305_SOURCES)
sptps_keypair_SOURCES = \ sptps_keypair_SOURCES = \
sptps_keypair.c \ sptps_keypair.c \
utils.c utils.h \ $(libed25519_la_SOURCES)
ed25519/ecdsagen.c \
$(ed25519_SOURCES)
sptps_speed_SOURCES = \ sptps_speed_SOURCES = \
logger.c logger.h \
sptps.c sptps.h \
sptps_speed.c \ sptps_speed.c \
utils.c utils.h \ $(libed25519_la_SOURCES) \
ed25519/ecdh.c \ $(libchacha_poly1305_la_SOURCES)
ed25519/ecdsa.c \
ed25519/ecdsagen.c \
$(ed25519_SOURCES) \
$(chacha_poly1305_SOURCES)
## Conditionally compile device drivers ## Conditionally compile device drivers
if LINUX if LINUX
tincd_SOURCES += linux/device.c libtincd_la_SOURCES += linux/device.c
endif endif
if BSD if BSD
tincd_SOURCES += bsd/device.c libtincd_la_SOURCES += bsd/device.c
if TUNEMU if TUNEMU
tincd_SOURCES += bsd/tunemu.c bsd/tunemu.h libtincd_la_SOURCES += bsd/tunemu.c bsd/tunemu.h
endif endif
endif endif
if SOLARIS if SOLARIS
tincd_SOURCES += solaris/device.c libtincd_la_SOURCES += solaris/device.c
endif endif
if MINGW if MINGW
tincd_SOURCES += mingw/device.c mingw/common.h libtincd_la_SOURCES += mingw/device.c mingw/common.h
endif endif
if CYGWIN if CYGWIN
tincd_SOURCES += cygwin/device.c libtincd_la_SOURCES += cygwin/device.c
endif endif
if UML if UML
tincd_SOURCES += uml_device.c libtincd_la_SOURCES += uml_device.c
endif endif
if VDE if VDE
tincd_SOURCES += vde_device.c libtincd_la_SOURCES += vde_device.c
endif endif
if OPENSSL if OPENSSL
tincd_SOURCES += \ libtincd_la_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/rsa.c
tinc_SOURCES += \
openssl/cipher.c \ openssl/cipher.c \
openssl/crypto.c \ openssl/crypto.c \
openssl/digest.c openssl/digest.h \ openssl/digest.c openssl/digest.h \
openssl/prf.c \ openssl/prf.c \
openssl/rsa.c \ openssl/rsa.c \
openssl/rsagen.c openssl/rsagen.c
sptps_test_SOURCES += \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c
sptps_keypair_SOURCES += \
openssl/crypto.c
sptps_speed_SOURCES += \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c
else else
if GCRYPT if GCRYPT
tincd_SOURCES += \ libtincd_la_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
gcrypt/digest.c gcrypt/digest.h \
gcrypt/prf.c \
gcrypt/rsa.c
tinc_SOURCES += \
gcrypt/cipher.c \ gcrypt/cipher.c \
gcrypt/crypto.c \ gcrypt/crypto.c \
gcrypt/digest.c gcrypt/digest.h \ gcrypt/digest.c gcrypt/digest.h \
gcrypt/prf.c \ gcrypt/prf.c \
gcrypt/rsa.c \ gcrypt/rsa.c \
gcrypt/rsagen.c gcrypt/rsagen.c
sptps_test_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
gcrypt/digest.c gcrypt/digest.h \
gcrypt/prf.c
sptps_keypair_SOURCES += \
openssl/crypto.c
sptps_speed_SOURCES += \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c
else else
tincd_SOURCES += \ libtincd_la_SOURCES += \
nolegacy/crypto.c \
nolegacy/prf.c
tinc_SOURCES += \
nolegacy/crypto.c \
nolegacy/prf.c
sptps_test_SOURCES += \
nolegacy/crypto.c \
nolegacy/prf.c
sptps_keypair_SOURCES += \
nolegacy/crypto.c
sptps_speed_SOURCES += \
nolegacy/crypto.c \ nolegacy/crypto.c \
nolegacy/prf.c nolegacy/prf.c
endif endif
endif endif
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS) tincd_SOURCES = \
sptps_speed_LDADD = -lrt process.h \
tincd.c
tincd_LDADD = libtincd.la libed25519.la libchacha_poly1305.la libtincconf.la
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS) libtincd.la libtincconf.la
sptps_speed_LDADD = -lrt libtincd.la libed25519.la
sptps_test_LDADD = -lrt libtincd.la libed25519.la
LIBS = @LIBS@ -lm LIBS = @LIBS@ -lm
@ -261,3 +201,4 @@ LIBS += -lpcap
endif endif
AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote. AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote.
#-fsanitize=address