switch to a single rule for all command lists

diff --git a/Makefile.in b/Makefile.in
index aef0c0c95b2b6d4984c586906e84196612a3a292..6ff6a016a49c5684a26f1dbdf12fb38cd0fef90c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,30 +148,9 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
                --set-package="para_$(subst .cmdline,,$(*F))" \
                --set-version="$V"  < $<
 
-server_command_list.c: server.cmd server_command_list.h
-       ./command_util.sh c_file < $< >>$@
-server_command_list.h: server.cmd
-       ./command_util.sh header < $< >> $@
-
-mysql_selector_command_list.c: mysql_selector.cmd mysql_selector_command_list.h
-       ./command_util.sh c_file < $< >>$@
-mysql_selector_command_list.h: mysql_selector.cmd
-       ./command_util.sh header < $< >> $@
-
-random_selector_command_list.c: random_selector.cmd random_selector_command_list.h
-       ./command_util.sh c_file < $< >>$@
-random_selector_command_list.h: random_selector.cmd
-       ./command_util.sh header < $< >> $@
-
-playlist_selector_command_list.c: playlist_selector.cmd playlist_selector_command_list.h
-       ./command_util.sh c_file < $< >>$@
-playlist_selector_command_list.h: playlist_selector.cmd
-       ./command_util.sh header < $< >> $@
-
-audiod_command_list.c: audiod.cmd audiod_command_list.h
-       ./command_util.sh c_file < $< >>$@
-audiod_command_list.h: audiod.cmd
-       ./command_util.sh header < $< >> $@
+%_command_list.c %_command_list.h: %.cmd
+       ./command_util.sh c < $< >$@
+       ./command_util.sh h < $< >$(@:%.c=%.h)
 
 ortp_recv.o: ortp_recv.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<

diff --git a/command_util.sh b/command_util.sh
index 25fc0884f009afa15ebded0bbf813475afea1d1a..43f4dba850a92a93b2a0857645d121ca395c7440 100755 (executable)
--- a/command_util.sh
+++ b/command_util.sh
@@ -242,10 +242,10 @@ read_header
 arg="$1"
 shift
 case "$arg" in
-       "c_file")
+       "c")
                com_c_file
                ;;
-       "header")
+       "h")
                com_header
                ;;
        "man")