Never automatically try to bind to ports >= 32768.

[meshlink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d855d3a5a0ffc13e683336bedd081aadc751cd5d..fad47bff3a4af3aebb74c288b2af48491fd46aee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,10 +26,11 @@ chacha_poly1305_SOURCES = \
        chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
 utcp_SOURCES = \
-       utcp/utcp.c utcp/utcp.h \
-       utcp/utcp_priv.h
+       utcp.c utcp.h \
+       utcp_priv.h
 
 lib_LTLIBRARIES = libmeshlink.la
+EXTRA_PROGRAMS = utcp-test
 
 pkginclude_HEADERS = meshlink++.h meshlink.h
 
@@ -41,6 +42,7 @@ 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 \
@@ -52,6 +54,7 @@ libmeshlink_la_SOURCES = \
        have.h \
        list.c list.h \
        logger.c logger.h \
+       mdns.c mdns.h \
        meshlink.c meshlink.h meshlink.sym \
        meshlink_internal.h \
        meshlink_queue.h \
@@ -63,6 +66,7 @@ libmeshlink_la_SOURCES = \
        netutl.c netutl.h \
        node.c node.h \
        submesh.c submesh.h \
+       packmsg.h \
        prf.c prf.h \
        protocol.c protocol.h \
        protocol_auth.c \
@@ -82,20 +86,14 @@ libmeshlink_la_SOURCES = \
        $(chacha_poly1305_SOURCES) \
        $(utcp_SOURCES)
 
+utcp_test_SOURCES = \
+       utcp-test.c \
+       $(utcp_SOURCES)
+
 EXTRA_libmeshlink_la_DEPENDENCIES = $(srcdir)/meshlink.sym
 
 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_LIBADD = ${top_builddir}/catta/src/libcatta.la
-endif
+utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote.
+utcp_test_LDFLAGS = $(PTHREAD_LIBS)