From 799d929e2555a089f0823d5da897236855757e9f Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 25 Nov 2019 20:59:49 +0000 Subject: [PATCH] add .inc file to .am --- contrib/Makefile.am | 5 ++++- contrib/Makefile.inc | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 contrib/Makefile.inc diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c7b203989..e4f9e9331 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -3,6 +3,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include SUBDIRS = scripts hellos services +include Makefile.inc + dist_pkgdata_DATA = \ gns/gns-bcd.html \ gns/gns-bcd.tex \ @@ -47,7 +49,8 @@ EXTRA_DIST = \ conf/nss/nssswitch.conf \ conf/wireshark/wireshark.lua \ $(PACKAGES_FILES) \ - $(INITD_FILES) + $(INITD_FILES) \ + Makefile.inc check_PROGRAMS = \ test_gnunet_prefix diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc new file mode 100644 index 000000000..b64369251 --- /dev/null +++ b/contrib/Makefile.inc @@ -0,0 +1,45 @@ +# This file has to be copied into the directory one level above. +# This also means (obviously): this file is excluded from including +# itself. + +BUILDCOMMON_SHLIB_FILES = \ + build-common/sh/bin.sh/python.sh \ + build-common/sh/lib.sh/existence.sh \ + build-common/sh/lib.sh/existence_python.sh \ + build-common/sh/lib.sh/msg.sh \ + build-common/sh/lib.sh/progname.sh \ + build-common/sh/lib.sh/version_gnunet.sh \ + build-common/LICENSE + +BUILDCOMMON_CONF_FILES = \ + build-common/conf/.dir-locals.el \ + build-common/conf/.prettierrc \ + build-common/conf/.style.yapf \ + build-common/conf/.vscode/settings.json \ + build-common/conf/.vscode/tasks.json \ + build-common/conf/.yarnrc \ + build-common/conf/uncrustify-mode.el \ + build-common/conf/uncrustify.cfg \ + build-common/conf/uncrustify.el \ + build-common/conf/uncrustify.sh \ + build-common/conf/uncrustify_precommit + +BUILDCOMMON_BUILD_FILES = \ + build-common/bootstrap.template \ + build-common/configure \ + build-common/configure.py.template \ + build-common/talerbuildconfig.py \ + build-common/testconfigure.py + +BUILDCOMMON_DOC_FILES = \ + build-common/README + +BUILDCOMMON_SCRIPT_FILES = \ + build-common/coverage.sh + +BUILD_COMMON_FILES = \ + $(BUILDCOMMON_SHLIB_FILES) \ + $(BUILDCOMMON_CONF_FILES) \ + $(BUILDCOMMON_BUILD_FILES) \ + $(BUILDCOMMON_DOC_FILES) \ + $(BUILDCOMMON_SCRIPT_FILES) \ -- 2.25.1