github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
pull/589/head
Frank Lichtenheld 2023-01-19 13:33:42 +01:00 committed by Selva Nair
parent 6c6bf9e4e6
commit 724a2409f9
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -23,6 +23,8 @@ RCCOMPILE = $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
AUTOMAKE_OPTIONS = foreign 1.9 AUTOMAKE_OPTIONS = foreign 1.9
DISTCHECK_CONFIGURE_FLAGS = --host=x86_64-w64-mingw32
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
config.log config.status \ config.log config.status \
$(srcdir)/Makefile.in $(srcdir)/configure \ $(srcdir)/Makefile.in $(srcdir)/configure \
@ -36,8 +38,11 @@ SUBDIRS = . plap
bin_PROGRAMS = openvpn-gui bin_PROGRAMS = openvpn-gui
dist_doc_DATA = \ dist_doc_DATA = \
BUILD.rst \
CHANGES.rst \
COPYRIGHT.GPL \ COPYRIGHT.GPL \
COPYING COPYING \
README.rst
AM_CPPFLAGS = $(OPENSSL_CRYPTO_CFLAGS) -D_UNICODE $(JSON_CFLAGS) AM_CPPFLAGS = $(OPENSSL_CRYPTO_CFLAGS) -D_UNICODE $(JSON_CFLAGS)
AM_CFLAGS = -municode AM_CFLAGS = -municode
@ -70,9 +75,16 @@ openvpn_gui_RESOURCES = \
res/disconnected.ico \ res/disconnected.ico \
res/openvpn-gui.ico \ res/openvpn-gui.ico \
res/reconnecting.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 = \ openvpn_gui_SOURCES = \
main.c main.h \ main.c main.h \

12
plap/Makefile.am
View File

@ -35,6 +35,8 @@ bin_PROGRAMS = test_plap
#endif #endif
lib_LTLIBRARIES = libopenvpn_plap.la lib_LTLIBRARIES = libopenvpn_plap.la
AM_CPPFLAGS = -I$(srcdir)/..
libopenvpn_plap_la_CFLAGS = -DDISABLE_PASSWORD_CHANGE -D_UNICODE -municode libopenvpn_plap_la_CFLAGS = -DDISABLE_PASSWORD_CHANGE -D_UNICODE -municode
test_plap_CXXFLAGS = -DDEBUG -D_UNICODE -municode test_plap_CXXFLAGS = -DDEBUG -D_UNICODE -municode
@ -69,7 +71,12 @@ libopenvpn_plap_la_RESOURCES = \
openvpn-plap.manifest openvpn-plap.manifest
openvpn-plap-res.lo: $(libopenvpn_plap_la_RESOURCES) $(top_srcdir)/openvpn-gui-res.h 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 BUILT_SOURCES = credentialprovider.h
libopenvpn_plap_la_SOURCES = \ libopenvpn_plap_la_SOURCES = \
@ -78,9 +85,12 @@ libopenvpn_plap_la_SOURCES = \
plap_connection.h plap_connection.c \ plap_connection.h plap_connection.c \
plap_common.h plap_common.c \ plap_common.h plap_common.c \
plap_dll.h plap_dll.c \ plap_dll.h plap_dll.c \
resource.h \
ui_glue.h ui_glue.c \ ui_glue.h ui_glue.c \
$(top_srcdir)/openvpn.c \ $(top_srcdir)/openvpn.c \
$(top_srcdir)/localization.h\
$(top_srcdir)/localization.c\ $(top_srcdir)/localization.c\
$(top_srcdir)/options.h \
$(top_srcdir)/options.c \ $(top_srcdir)/options.c \
$(top_srcdir)/proxy.c \ $(top_srcdir)/proxy.c \
$(top_srcdir)/registry.c \ $(top_srcdir)/registry.c \