From: Guus Sliepen <guus@meshlink.io>
Date: Mon, 12 Dec 2022 19:17:44 +0000 (+0100)
Subject: Make autoconf builds work again.
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=895edea4c2a7e54df1fb3695f440bd3ea921d91a;p=meshlink

Make autoconf builds work again.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index fad47bff..8a7a28e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ utcp_SOURCES = \
 lib_LTLIBRARIES = libmeshlink.la
 EXTRA_PROGRAMS = utcp-test
 
-pkginclude_HEADERS = meshlink++.h meshlink.h
+pkginclude_HEADERS = ../include/meshlink++.h ../include/meshlink.h
 
 libmeshlink_la_LDFLAGS = -export-symbols $(srcdir)/meshlink.sym
 
@@ -55,7 +55,7 @@ libmeshlink_la_SOURCES = \
 	list.c list.h \
 	logger.c logger.h \
 	mdns.c mdns.h \
-	meshlink.c meshlink.h meshlink.sym \
+	meshlink.c ../include/meshlink.h meshlink.sym \
 	meshlink_internal.h \
 	meshlink_queue.h \
 	meta.c meta.h \
@@ -92,8 +92,8 @@ utcp_test_SOURCES = \
 
 EXTRA_libmeshlink_la_DEPENDENCIES = $(srcdir)/meshlink.sym
 
-libmeshlink_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote.
+libmeshlink_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote. -iquote$(top_srcdir)/include
 libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS)
 
-utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote.
+utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote. -iquote$(top_srcdir)/include
 utcp_test_LDFLAGS = $(PTHREAD_LIBS)
diff --git a/test/Makefile.am b/test/Makefile.am
index 001291cc..d0176224 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -43,7 +43,7 @@ endif
 
 dist_check_SCRIPTS = $(TESTS)
 
-AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -I${top_srcdir}/include -Wall
 AM_LDFLAGS = $(PTHREAD_LIBS)
 
 check_PROGRAMS = \