diff options
author | ng0 <ng0@n0.is> | 2019-11-25 20:59:49 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-25 20:59:49 +0000 |
commit | 799d929e2555a089f0823d5da897236855757e9f (patch) | |
tree | 097bced820f215f2842f4030ffa7610f03c611b8 | |
parent | 23ec14dabe8a643f3095d9cf91eefef100a658a1 (diff) | |
download | gnunet-799d929e2555a089f0823d5da897236855757e9f.tar.gz gnunet-799d929e2555a089f0823d5da897236855757e9f.zip |
add .inc file to .am
-rw-r--r-- | contrib/Makefile.am | 5 | ||||
-rw-r--r-- | contrib/Makefile.inc | 45 |
2 files changed, 49 insertions, 1 deletions
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 | |||
3 | 3 | ||
4 | SUBDIRS = scripts hellos services | 4 | SUBDIRS = scripts hellos services |
5 | 5 | ||
6 | include Makefile.inc | ||
7 | |||
6 | dist_pkgdata_DATA = \ | 8 | dist_pkgdata_DATA = \ |
7 | gns/gns-bcd.html \ | 9 | gns/gns-bcd.html \ |
8 | gns/gns-bcd.tex \ | 10 | gns/gns-bcd.tex \ |
@@ -47,7 +49,8 @@ EXTRA_DIST = \ | |||
47 | conf/nss/nssswitch.conf \ | 49 | conf/nss/nssswitch.conf \ |
48 | conf/wireshark/wireshark.lua \ | 50 | conf/wireshark/wireshark.lua \ |
49 | $(PACKAGES_FILES) \ | 51 | $(PACKAGES_FILES) \ |
50 | $(INITD_FILES) | 52 | $(INITD_FILES) \ |
53 | Makefile.inc | ||
51 | 54 | ||
52 | check_PROGRAMS = \ | 55 | check_PROGRAMS = \ |
53 | test_gnunet_prefix | 56 | 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 @@ | |||
1 | # This file has to be copied into the directory one level above. | ||
2 | # This also means (obviously): this file is excluded from including | ||
3 | # itself. | ||
4 | |||
5 | BUILDCOMMON_SHLIB_FILES = \ | ||
6 | build-common/sh/bin.sh/python.sh \ | ||
7 | build-common/sh/lib.sh/existence.sh \ | ||
8 | build-common/sh/lib.sh/existence_python.sh \ | ||
9 | build-common/sh/lib.sh/msg.sh \ | ||
10 | build-common/sh/lib.sh/progname.sh \ | ||
11 | build-common/sh/lib.sh/version_gnunet.sh \ | ||
12 | build-common/LICENSE | ||
13 | |||
14 | BUILDCOMMON_CONF_FILES = \ | ||
15 | build-common/conf/.dir-locals.el \ | ||
16 | build-common/conf/.prettierrc \ | ||
17 | build-common/conf/.style.yapf \ | ||
18 | build-common/conf/.vscode/settings.json \ | ||
19 | build-common/conf/.vscode/tasks.json \ | ||
20 | build-common/conf/.yarnrc \ | ||
21 | build-common/conf/uncrustify-mode.el \ | ||
22 | build-common/conf/uncrustify.cfg \ | ||
23 | build-common/conf/uncrustify.el \ | ||
24 | build-common/conf/uncrustify.sh \ | ||
25 | build-common/conf/uncrustify_precommit | ||
26 | |||
27 | BUILDCOMMON_BUILD_FILES = \ | ||
28 | build-common/bootstrap.template \ | ||
29 | build-common/configure \ | ||
30 | build-common/configure.py.template \ | ||
31 | build-common/talerbuildconfig.py \ | ||
32 | build-common/testconfigure.py | ||
33 | |||
34 | BUILDCOMMON_DOC_FILES = \ | ||
35 | build-common/README | ||
36 | |||
37 | BUILDCOMMON_SCRIPT_FILES = \ | ||
38 | build-common/coverage.sh | ||
39 | |||
40 | BUILD_COMMON_FILES = \ | ||
41 | $(BUILDCOMMON_SHLIB_FILES) \ | ||
42 | $(BUILDCOMMON_CONF_FILES) \ | ||
43 | $(BUILDCOMMON_BUILD_FILES) \ | ||
44 | $(BUILDCOMMON_DOC_FILES) \ | ||
45 | $(BUILDCOMMON_SCRIPT_FILES) \ | ||