From: Soeren Apel <redacted>
Date: Fri, 6 Sep 2024 20:40:18 +0000 (+0200)
Subject: Changes to make "make distcheck" pass
X-Git-Tag: libserialport-0.1.2~4
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f0bed655a5d85057191d040097297e3638b36ba9;p=libserialport.git

Changes to make "make distcheck" pass

There were two errors:

1) Changelog wasn't deleted by "make distclean"

2) libsigrok.h wasn't treated as a distributable file and hence couldn't be found. This is a result of two commits:

https://sigrok.org/gitweb/?p=libserialport.git;a=commit;h=f1c916ede191ec398cbe53d7f978078311c25785 marking libsigrok.h as non-distributable since it was build from libsigrok.h.in at the time and

https://sigrok.org/gitweb/?p=libserialport.git;a=commit;h=f6e32b2dfa322aa4bd4a279a46d588e0e73ea238 which removed libsigrok.h.in in favor of a static libsigrok.h

The second commit didn't revert the Makefile.am change that marked libsigrok.h as non-distributable, which this commit takes care of.
---

diff --git a/Makefile.am b/Makefile.am
index 9b017eb..ccb076b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,8 @@ if MACOSX
 libserialport_la_LDFLAGS += -framework IOKit -framework CoreFoundation
 endif
 
-nodist_include_HEADERS = libserialport.h
+library_includedir = $(includedir)
+library_include_HEADERS = libserialport.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libserialport.pc
@@ -70,7 +71,7 @@ EXTRA_DIST = Doxyfile \
 	examples/await_events.c \
 	examples/handle_errors.c
 
-MAINTAINERCLEANFILES = ChangeLog
+DISTCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog doc