X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=8decac759ff1526939407cb202613857cd5a5fa5;hb=HEAD;hp=e9c335106d061daf2a91f62a7b6d1f0c0b7e608b;hpb=9447f2918f0680058705a6d12dc728450c47a471;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index e9c33510..fad47bff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ utcp_SOURCES = \
 	utcp_priv.h
 
 lib_LTLIBRARIES = libmeshlink.la
-noinst_PROGRAMS = utcp-test
+EXTRA_PROGRAMS = utcp-test
 
 pkginclude_HEADERS = meshlink++.h meshlink.h
 
@@ -42,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 \
@@ -96,16 +97,3 @@ libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS)
 
 utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote.
 utcp_test_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