[beast: 7/8] BEAST-GTK: res/: fix resource file paths



commit 45f53a8f3fcb552930197db05e19d55d1fdad02a
Author: Tim Janik <timj gnu org>
Date:   Fri Jan 30 05:59:32 2015 +0100

    BEAST-GTK: res/: fix resource file paths

 beast-gtk/res/Makefile.am |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/beast-gtk/res/Makefile.am b/beast-gtk/res/Makefile.am
index a8a2ba6..02b1478 100644
--- a/beast-gtk/res/Makefile.am
+++ b/beast-gtk/res/Makefile.am
@@ -2,23 +2,19 @@
 include $(top_srcdir)/Makefile.decl
 
 RAPIDRES     = rapidres
+XMLLINTCALL  = $(if $(XMLLINT),$(XMLLINT),true) # handle undefined XMLLINT
 
-RESOURCES = $(strip \
-       $(srcdir)/radgets-standard.xml  \
-       $(srcdir)/radgets-beast.xml     \
+RESOURCES = $(strip            \
+       radgets-standard.xml    \
+       radgets-beast.xml       \
 )
-XML_FILES  = $(filter-out bst-%, $(RESOURCES))
-EXTRA_DIST += $(XML_FILES)
+EXTRA_DIST += $(RESOURCES)
 
-
-XMLLINTCALL=$(if $(XMLLINT),$(XMLLINT),true) # handle undefined XMLLINT
-
-beast-resources.cc: $(XML_FILES)
+noinst_DATA = beast-resources.cc
+beast-resources.cc: $(RESOURCES)
        cd .                                            \
-       && $(XMLLINTCALL) --noout $(XML_FILES)          \
-       && $(RAPIDRES) $(RESOURCES) > xgen-bxc          \
+       && $(XMLLINTCALL) --noout $(RESOURCES)          \
+       && (cd $(srcdir) && $(RAPIDRES) $(RESOURCES) ) > xgen-bxc               \
        && cp xgen-bxc $@                               \
        && rm -f xgen-bxc
 CLEANFILES += xgen-bxc beast-resources.cc
-
-noinst_DATA = beast-resources.cc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]