Commit 314a44af authored by Iñigo Martínez's avatar Iñigo Martínez Committed by Debarshi Ray

build: Make the photos-generate-about script use files

Currently, the photos-generate-about script uses the paths to the
directories where AUTHORS and ARTISTS files are located. In order to
control file dependencies better with Meson, full file paths are used
instead of paths to their directories.

!48
parent 36b4ddcb
......@@ -489,7 +489,7 @@ photos-about-data.h: stamp-photos-about-data.h
stamp-photos-about-data.h: $(top_srcdir)/ARTISTS $(top_srcdir)/AUTHORS
$(AM_V_GEN) ( \
( $(srcdir)/photos-generate-about \
--header $(top_srcdir) \
--header \
) >> xgen-ah \
&& ( cmp -s xgen-ah photos-about-data.h || cp xgen-ah photos-about-data.h ) \
&& rm -f xgen-ah \
......@@ -499,7 +499,7 @@ stamp-photos-about-data.h: $(top_srcdir)/ARTISTS $(top_srcdir)/AUTHORS
photos-about-data.c: $(top_srcdir)/ARTISTS $(top_srcdir)/AUTHORS
$(AM_V_GEN) ( \
( $(srcdir)/photos-generate-about \
--body $(top_srcdir) \
--body $(top_srcdir)/ARTISTS $(top_srcdir)/AUTHORS \
) >> xgen-ac \
&& ( cmp -s xgen-ac photos-about-data.c || cp xgen-ac photos-about-data.c ) \
&& rm -f xgen-ac \
......
......@@ -38,7 +38,7 @@ while read line; do
[ ${#line} -eq 0 ] &&
continue
echo " \"$line\","
done < $2/ARTISTS
done < $2
echo " NULL"
echo "};"
......@@ -49,6 +49,6 @@ while read line; do
[ ${#line} -eq 0 ] &&
continue
echo " \"$line\","
done < $2/AUTHORS
done < $3
echo " NULL"
echo "};"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment