X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=f793e91256da71e7ef038f111b409d29c22da772;hb=ed1f31db1e8840ffd6849b48bcad93e9975a24bb;hp=1e2037788b665222ea0e79931d1eb4c1b1a69539;hpb=7afe8daaf5ba221968a3e2beff61fa653f497cb1;p=meshlink diff --git a/src/Makefile.am b/src/Makefile.am index 1e203778..f793e912 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,9 @@ AM_CPPFLAGS = -Wall ed25519_SOURCES = \ ed25519/add_scalar.c \ + ed25519/ecdh.c \ + ed25519/ecdsa.c \ + ed25519/ecdsagen.c \ ed25519/ed25519.h \ ed25519/fe.c ed25519/fe.h \ ed25519/fixedint.h \ @@ -37,7 +40,6 @@ libmeshlink_la_SOURCES = \ conf.c conf.h \ connection.c connection.h \ crypto.c crypto.h \ - discovery.c discovery.h \ dropin.c dropin.h \ ecdh.h \ ecdsa.h \ @@ -62,6 +64,7 @@ libmeshlink_la_SOURCES = \ net_socket.c \ netutl.c netutl.h \ node.c node.h \ + submesh.c submesh.h \ prf.c prf.h \ protocol.c protocol.h \ protocol_auth.c \ @@ -80,16 +83,18 @@ libmeshlink_la_SOURCES = \ $(chacha_poly1305_SOURCES) \ $(utcp_SOURCES) -libmeshlink_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -I${top_srcdir}/catta/include/ -iquote. +libmeshlink_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote. +libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS) + +if CATTA +libmeshlink_la_SOURCES += \ + discovery.c discovery.h + +libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/include/ if MINGW libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/src/compat/windows/include/ endif -libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS) libmeshlink_la_LIBADD = ${top_builddir}/catta/src/libcatta.la - -libmeshlink_la_SOURCES += \ - ed25519/ecdh.c \ - ed25519/ecdsa.c \ - ed25519/ecdsagen.c +endif