From 50cebdea6143d8b1e407f76420e1062eb75242d6 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.com>
Date: Thu, 19 Jan 2023 13:33:42 +0100
Subject: [PATCH] Makefile.am: Fix dist* targets to include all required files

Also fix "make distcheck" to actually succeed.

Fixes #585

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 Makefile.am      | 18 +++++++++++++++---
 plap/Makefile.am | 12 +++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 488f8bd..b20dd53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@ RCCOMPILE = $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 
 AUTOMAKE_OPTIONS = foreign 1.9
 
+DISTCHECK_CONFIGURE_FLAGS = --host=x86_64-w64-mingw32
+
 MAINTAINERCLEANFILES = \
 	config.log config.status \
 	$(srcdir)/Makefile.in  $(srcdir)/configure \
@@ -36,8 +38,11 @@ SUBDIRS = . plap
 bin_PROGRAMS = openvpn-gui
 
 dist_doc_DATA = \
+	BUILD.rst \
+	CHANGES.rst \
 	COPYRIGHT.GPL \
-	COPYING
+	COPYING \
+	README.rst
 
 AM_CPPFLAGS = $(OPENSSL_CRYPTO_CFLAGS) -D_UNICODE $(JSON_CFLAGS)
 AM_CFLAGS = -municode
@@ -70,9 +75,16 @@ openvpn_gui_RESOURCES = \
 	res/disconnected.ico \
 	res/openvpn-gui.ico \
 	res/reconnecting.ico \
-	res/openvpn-gui.manifest
+	res/openvpn-gui.manifest \
+	res/tileimage.bmp
 
-EXTRA_DIST = $(openvpn_gui_RESOURCES)
+EXTRA_DIST = $(openvpn_gui_RESOURCES) \
+	CMakeLists.txt \
+	CMakePresets.json \
+	config-msvc.h.in \
+	vcpkg_manifests \
+	.editorconfig \
+	.kateconfig
 
 openvpn_gui_SOURCES = \
 	main.c main.h \
diff --git a/plap/Makefile.am b/plap/Makefile.am
index 5cd9d24..f55e8ad 100644
--- a/plap/Makefile.am
+++ b/plap/Makefile.am
@@ -35,6 +35,8 @@ bin_PROGRAMS = test_plap
 #endif
 lib_LTLIBRARIES = libopenvpn_plap.la
 
+AM_CPPFLAGS = -I$(srcdir)/..
+
 libopenvpn_plap_la_CFLAGS = -DDISABLE_PASSWORD_CHANGE -D_UNICODE -municode
 test_plap_CXXFLAGS = -DDEBUG -D_UNICODE -municode
 
@@ -69,7 +71,12 @@ libopenvpn_plap_la_RESOURCES = \
 	openvpn-plap.manifest
 
 openvpn-plap-res.lo: $(libopenvpn_plap_la_RESOURCES) $(top_srcdir)/openvpn-gui-res.h
-EXTRA_DIST = openvpn-plap-res.rc openvpn-plap.manifest
+EXTRA_DIST = \
+	openvpn_plap.def \
+	openvpn-plap-install.reg \
+	openvpn-plap-res.rc \
+	openvpn-plap-uninstall.reg \
+	openvpn-plap.manifest
 
 BUILT_SOURCES = credentialprovider.h
 libopenvpn_plap_la_SOURCES = \
@@ -78,9 +85,12 @@ libopenvpn_plap_la_SOURCES = \
 	plap_connection.h plap_connection.c \
 	plap_common.h plap_common.c \
 	plap_dll.h plap_dll.c \
+	resource.h \
 	ui_glue.h ui_glue.c \
 	$(top_srcdir)/openvpn.c \
+	$(top_srcdir)/localization.h\
 	$(top_srcdir)/localization.c\
+	$(top_srcdir)/options.h \
 	$(top_srcdir)/options.c \
 	$(top_srcdir)/proxy.c \
 	$(top_srcdir)/registry.c \