X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=21e45f7d8dc11ef3ab525bc52d63a8c045056a13;hb=b0f7726931e9339e91b8d49941626f015015bd98;hp=cae2ab95458666bd89d738bae7eab34890788914;hpb=31ab43d8a0691e773db6992fa3b52ca24f7f8db4;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index cae2ab95..21e45f7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,6 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = sptps_test sptps_keypair
-
-if LINUX
-sbin_PROGRAMS += sptps_speed
-endif
-
-DEFAULT_INCLUDES =
+AM_CPPFLAGS = -Wall
 
 ed25519_SOURCES = \
 	ed25519/add_scalar.c \
@@ -28,34 +22,13 @@ chacha_poly1305_SOURCES = \
 	chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
 	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
-sptps_test_SOURCES = \
-	crypto.c crypto.h \
-	logger.c logger.h \
-	prf.c prf.h \
-	sptps.c sptps.h \
-	sptps_test.c \
-	utils.c utils.h \
-	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
-
-sptps_keypair_SOURCES = \
-	crypto.c crypto.h \
-	sptps_keypair.c \
-	utils.c utils.h \
-	$(ed25519_SOURCES)
-
-sptps_speed_SOURCES = \
-	crypto.c crypto.h \
-	logger.c logger.h \
-	prf.c prf.h \
-	sptps.c sptps.h \
-	sptps_speed.c \
-	utils.c utils.h \
-	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
+utcp_SOURCES = \
+	utcp/utcp.c utcp/utcp.h
 
 lib_LTLIBRARIES = libmeshlink.la
 
+pkginclude_HEADERS = meshlink++.h meshlink.h
+
 libmeshlink_la_LDFLAGS = -export-symbols-regex '^(meshlink_|devtool_)'
 
 libmeshlink_la_SOURCES = \
@@ -101,28 +74,18 @@ libmeshlink_la_SOURCES = \
 	xalloc.h \
 	devtools.c devtools.h \
 	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
+	$(chacha_poly1305_SOURCES) \
+	$(utcp_SOURCES)
+
+libmeshlink_la_CFLAGS = -fPIC -I../catta/include/
 
-libmeshlink_la_CFLAGS = -fPIC -I../avahi/
+if MINGW
+libmeshlink_la_CFLAGS += -I../catta/src/compat/windows/include/
+endif
 
-libmeshlink_la_LIBADD = -lpthread -luuid ../avahi/avahi-core/.libs/libavahi-core.a ../avahi/avahi-common/.libs/libavahi-common.a
+libmeshlink_la_LIBADD = -lpthread ../catta/src/libcatta.la
 
 libmeshlink_la_SOURCES += \
 	ed25519/ecdh.c \
 	ed25519/ecdsa.c \
 	ed25519/ecdsagen.c
-sptps_test_SOURCES += \
-	ed25519/ecdh.c \
-	ed25519/ecdsa.c
-sptps_keypair_SOURCES += \
-	ed25519/ecdsagen.c
-sptps_speed_SOURCES += \
-	ed25519/ecdh.c \
-	ed25519/ecdsa.c \
-	ed25519/ecdsagen.c
-
-sptps_speed_LDADD = -lrt
-
-LIBS = @LIBS@
-
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"