[lmi-commits] [lmi] master b13c4fea 5/6: Add $(srcdir)/ prefix to excluded data files

[Greg Chicares]

branch: master
commit b13c4feadb8e3433c717556902890a9c518fc158
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Add $(srcdir)/ prefix to excluded data files
    
    $(data_files) is prefixed with $(srcdir)/ , which is appropriate because
    it is used for more than one purpose. In scripts that create fardels, it
    is convenient to specify $(excluded_data_files) without such a prefix
    (e.g., if 'skin.xrc' is to be excluded, then specify only its basename),
    and add the $(srcdir)/ prefix in this makefile.
---
 workhorse.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index bd7a6ae1..5c20d058 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -529,9 +529,10 @@ lmi_msw_res.o: lmi.ico
 excluded_data_files :=
 
 data_files := \
-  $(wildcard $(addprefix $(srcdir)/,*.ico *.png *.xml *.xrc *.xsd *.xsl)) \
-
-data_files := $(filter-out $(excluded_data_files), $(data_files))
+  $(filter-out \
+               $(addprefix $(srcdir)/,$(excluded_data_files)), \
+    $(wildcard $(addprefix $(srcdir)/,*.ico *.png *.xml *.xrc *.xsd *.xsl)) \
+   )
 
 help_files := \
   $(wildcard $(addprefix $(srcdir)/,*.html)) \