[gnunet] branch master updated (0ade5ebc7 -> 97afa94de)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 0ade5ebc7 contrib: we use uncrustify
     new 290e735e7 contrib: remove deleted file from makefile
     new 97afa94de meson: fix new folder structure

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/Makefile.am           |  1 -
 contrib/meson.build           | 27 ---------------------------
 {contrib => data}/meson.build | 11 -----------
 scripts/meson.build           | 12 ++++++++++++
 4 files changed, 12 insertions(+), 39 deletions(-)
 copy {contrib => data}/meson.build (70%)
 create mode 100644 scripts/meson.build

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 65a8e8da9..0e8d89c71 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -196,7 +196,6 @@ EXTRA_DIST = \
   docker/README.md \
   benchmark/collect.awk \
   packages/guix/guix.scm \
-  indent_pre-commit \
   Makefile.inc \
   vagrant/Vagrantfile \
   vagrant/bootstrap.ubuntu.sh \
diff --git a/contrib/meson.build b/contrib/meson.build
index ff8a0a989..a1acbb32c 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,33 +1,6 @@
 subdir('conf')
-subdir('hellos')
 subdir('scripts')
 
-
-install_data(['gns'/'def.tex',
-              'gns'/'gns-bcd.html',
-              'gns'/'gns-bcd.tex',
-              'gns'/'gns-bcd-forbidden.html',
-              'gns'/'gns-bcd-internal-error.html',
-              'gns'/'gns-bcd-invalid-key.html',
-              'gns'/'gns-bcd-not-found.html',
-              'gns'/'gns-bcd-png.tex',
-              'gns'/'gns-bcd-simple.html',
-              'gns'/'gns-bcd-simple.tex',
-              'fcfsd'/'fcfsd-index.html',
-              'fcfsd'/'fcfsd-forbidden.html',
-              'fcfsd'/'fcfsd-notfound.html',
-              'branding'/'logo'/'gnunet-logo.png',
-              'branding'/'logo'/'gnunet-logo-dark-text.svg',
-              'branding'/'logo'/'gnunet-logo-dark-only-text.svg',
-              'testing_hostkeys.ecc',
-              'netjail'/'netjail_core.sh',
-              'netjail'/'netjail_exec.sh',
-              'netjail'/'netjail_start.sh',
-              'netjail'/'netjail_stop.sh',
-              'netjail'/'topo.sh',
-              ],
-              install_dir: get_option('datadir')/'gnunet')
-
 install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
              install_dir: get_option('datadir')/'applications')
 
diff --git a/contrib/meson.build b/data/meson.build
similarity index 70%
copy from contrib/meson.build
copy to data/meson.build
index ff8a0a989..20de89900 100644
--- a/contrib/meson.build
+++ b/data/meson.build
@@ -1,6 +1,4 @@
-subdir('conf')
 subdir('hellos')
-subdir('scripts')
 
 
 install_data(['gns'/'def.tex',
@@ -20,14 +18,5 @@ install_data(['gns'/'def.tex',
               'branding'/'logo'/'gnunet-logo-dark-text.svg',
               'branding'/'logo'/'gnunet-logo-dark-only-text.svg',
               'testing_hostkeys.ecc',
-              'netjail'/'netjail_core.sh',
-              'netjail'/'netjail_exec.sh',
-              'netjail'/'netjail_start.sh',
-              'netjail'/'netjail_stop.sh',
-              'netjail'/'topo.sh',
               ],
               install_dir: get_option('datadir')/'gnunet')
-
-install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
-             install_dir: get_option('datadir')/'applications')
-
diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644
index 000000000..fd45de0d2
--- /dev/null
+++ b/scripts/meson.build
@@ -0,0 +1,12 @@
+install_data([
+              'netjail'/'netjail_core.sh',
+              'netjail'/'netjail_exec.sh',
+              'netjail'/'netjail_start.sh',
+              'netjail'/'netjail_stop.sh',
+              'netjail'/'topo.sh',
+              ],
+              install_dir: get_option('datadir')/'gnunet')
+
+install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
+             install_dir: get_option('datadir')/'applications')
+

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.