summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ffb82bb)
This removes more lines than it adds and avoids the following warning;
configure.ac:689: warning: AC_DEFINE_UNQUOTED: `
configure.ac:689: result=
configure.ac:689: for i in $status_items; do
configure.ac:689: result="$result SI_$(echo $i | tr 'a-z' 'A-Z')' is not a valid preprocessor define value
(cherry picked from commit
5842e3e7f2aa17fe16cb806b4ba955ce1f25ce53)
lyrics_id duration directory lyrics_name image_name path hash channels
last_played num_chunks chunk_time amplification"
lyrics_id duration directory lyrics_name image_name path hash channels
last_played num_chunks chunk_time amplification"
-# $1: prefix, $2: items
-AC_DEFUN([make_enum_items], [$(
- for i in $2; do
- printf "$1_$(echo $i | tr 'a-z' 'A-Z'), "
- done
-)])
-
-# $1: prefix, $2: items
-AC_DEFUN([make_enum_array], [$(
- for i in $2; do
- printf "\"$i\", "
- done
-)])
-
-AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM,
- make_enum_items(SI, $status_items),
- [enum of all status items]
-)
-AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY,
- make_enum_array(SI, $status_items),
- [char * array of all status items]
-)
+result=
+for i in $status_items; do
+ result="$result SI_$(echo $i | tr 'a-z' 'A-Z'), "
+done
+AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, [$result],
+ [enum of all status items])
+
+result=
+for i in $status_items; do
+ result="$result \"$i\", "
+done
+AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
+ [char * array of all status items])
recv_objs="$recv_cmdline_objs $recv_errlist_objs"
recv_objs="$recv_cmdline_objs $recv_errlist_objs"