X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=dec0636f8acec1333d261bfd597868b51b28e54e;hp=e18a22e4d9f361ed3c18dd9adb0ad3755c05f23a;hb=e8f3104cc1c1f243f4b7c8b1eabdc24c93a6ad35;hpb=782e47ecd725dd44d4425351e21540a6914b13aa

diff --git a/configure.ac b/configure.ac
index e18a22e4..dec0636f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,9 +101,25 @@ recv_cmdline_objs="
 "
 
 recv_errlist_objs="
-	http_recv recv_common recv time string net dccp_recv fd
-	sched stdout ggo udp_recv buffer_tree afh_recv afh_common
-	wma_afh wma_common mp3_afh version
+	http_recv
+	recv_common
+	recv
+	time
+	string
+	net
+	dccp_recv
+	fd
+	sched
+	stdout
+	ggo
+	udp_recv
+	buffer_tree
+	afh_recv
+	afh_common
+	wma_afh
+	wma_common
+	mp3_afh
+	version
 "
 
 recv_ldflags=""
@@ -114,11 +130,38 @@ filter_cmdline_objs="
 	amp_filter
 	prebuffer_filter
 "
-filter_errlist_objs="filter_common wav_filter compress_filter filter string
-	stdin stdout sched fd amp_filter ggo fecdec_filter fec version
-	prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
+filter_errlist_objs="
+	filter_common
+	wav_filter
+	compress_filter
+	filter
+	string
+	stdin
+	stdout
+	sched
+	fd
+	amp_filter
+	ggo
+	fecdec_filter
+	fec
+	version
+	prebuffer_filter
+	time
+	bitstream
+	imdct
+	wma_common
+	wmadec_filter
+	buffer_tree
+"
 filter_ldflags="-lm"
-filters=" compress wav amp fecdec wmadec prebuffer"
+filters="
+	compress
+	wav
+	amp
+	fecdec
+	wmadec
+	prebuffer
+"
 
 audioc_cmdline_objs="audioc"
 audioc_errlist_objs="
@@ -132,25 +175,72 @@ audioc_errlist_objs="
 audioc_ldflags=""
 
 afh_cmdline_objs="afh"
-afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common
-	version ggo"
+afh_errlist_objs="
+	afh
+	string
+	fd
+	mp3_afh
+	afh_common
+	time
+	wma_afh
+	wma_common
+	version
+	ggo
+"
 afh_ldflags=""
 
-write_cmdline_objs="write file_write"
-write_errlist_objs="write write_common file_write time fd string sched stdin
-	buffer_tree ggo check_wav version"
+write_cmdline_objs="
+	write
+	file_write
+"
+write_errlist_objs="
+	write
+	write_common
+	file_write
+	time
+	fd
+	string
+	sched
+	stdin
+	buffer_tree
+	ggo
+	check_wav
+	version
+"
 write_ldflags=""
-writers=" file"
+writers="file"
 default_writer="FILE_WRITE"
 
-play_errlist_objs="play fd sched ggo buffer_tree time string net
-	afh_recv afh_common
-	wma_afh wma_common mp3_afh
-	recv_common udp_recv http_recv dccp_recv
-	filter_common fec bitstream imdct
-	wav_filter compress_filter amp_filter prebuffer_filter fecdec_filter
-		wmadec_filter
-	write_common file_write
+play_errlist_objs="
+	play
+	fd
+	sched
+	ggo
+	buffer_tree
+	time
+	string
+	net
+	afh_recv
+	afh_common
+	wma_afh
+	wma_common
+	mp3_afh
+	recv_common
+	udp_recv
+	http_recv
+	dccp_recv
+	filter_common
+	fec
+	bitstream
+	imdct
+	wav_filter
+	compress_filter
+	amp_filter
+	prebuffer_filter
+	fecdec_filter
+	wmadec_filter
+	write_common
+	file_write
 	version
 "
 play_cmdline_objs="
@@ -1242,8 +1332,6 @@ else
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 ############################################################# error2.h
-AC_MSG_NOTICE(creating error2.h)
-
 # these are always built
 all_errlist_objs="
 	$recv_errlist_objs
@@ -1273,10 +1361,14 @@ fi
 
 all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
 
+object_executable_matrix=
 for i in $executables; do
-	echo "$i: "
-	eval echo \$${i}_errlist_objs
-done | ./error2.pl > error2.h
+	eval objs=\$${i}_errlist_objs
+	object_executable_matrix="$object_executable_matrix $i: $objs"
+done
+# use echo to replace newlines by space
+AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix))
+
 for obj in $all_errlist_objs; do
 	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
 done
@@ -1284,7 +1376,6 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[enum {$SS NUM_SS}],
 	[list of all objects that use the paraslash error facility]
 )
-
 ################################################################## status items
 
 status_items="basename status num_played mtime bitrate frequency file_size
@@ -1407,7 +1498,7 @@ unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
 audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
-filters: $filters
+filters: $(echo $filters)
 writers: $writers
 
 $mixer_summary