[beast: 29/41] BUILD: build/install data/ last, so it can symlink other installed files

[Tim Janik <timj src gnome org>]

commit 6cfae07f0a86ad0f4540345e767a3216441cf40a
Author: Tim Janik <timj gnu org>
Date:   Wed Jun 14 17:59:59 2017 +0200

    BUILD: build/install data/ last, so it can symlink other installed files
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am          |    2 +-
 beast-gtk/bstmain.cc |    5 ++++-
 data/Makefile.am     |   16 ----------------
 3 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 90b5c6b..09f6ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/Makefile.decl
 topdir = $(abs_top_srcdir)
 
-SUBDIRS                = . data sfi bse plugins drivers shell pybeast beast-gtk launchers library tools 
ebeast po tests docs
+SUBDIRS                = . sfi bse plugins drivers shell pybeast beast-gtk launchers library tools ebeast po 
docs data tests
 
 # == make setup ==
 noinst_DATA    =
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 6c5408d..b352d38 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -10,7 +10,6 @@
 #include "bstusermessage.hh"
 #include "bstparam.hh"
 #include "bstpreferences.hh"
-#include "data/beast-images.h"
 #include "../topbuildid.hh"
 #include "../config/config.h"
 #include <Python.h>
@@ -19,6 +18,10 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
+#define BST_SPLASH_IMAGE        "beast-splash.png"      // see ../data/beast-splash.png
+#define BST_SPLASH_WIDTH        (300)
+#define BST_SPLASH_HEIGHT       (350)
+
 /* --- prototypes --- */
 static void                    bst_args_parse_early    (int *argc_p, char **argv);
 static void                    bst_args_process        (int *argc_p, char **argv);
diff --git a/data/Makefile.am b/data/Makefile.am
index 1e289f4..58d4399 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,22 +15,6 @@ images_DATA = ${public_images}
 imagesdir = $(beastdatadir)/images
 EXTRA_DIST += $(private_images) $(public_images)
 
-# generate image header files
-noinst_build_sources = beast-images.h
-beast-images.h: ${public_images}
-       cd . \
-       && echo "/* Generated data from $< (by make $@) */" > xgen-bstih \
-       && echo >> xgen-bstih \
-       && echo "#define BST_SPLASH_IMAGE    \"beast-splash.png\"" >> xgen-bstih \
-       && echo "#define BST_SPLASH_WIDTH    (300)" >> xgen-bstih \
-       && echo "#define BST_SPLASH_HEIGHT   (350)" >> xgen-bstih \
-       && echo >> xgen-bstih \
-       && echo "/* Generated data ends here */" >> xgen-bstih \
-       && (cp xgen-bstih $@) \
-       && rm -f xgen-bstih
-noinst_DATA = $(noinst_build_sources)
-CLEANFILES += $(noinst_build_sources)
-
 
 # install pkg-config files
 pkgconfigdir = $(bselibdir)/pkgconfig