From: Andre Noll <maan@systemlinux.org>
Date: Sun, 5 Feb 2012 12:36:49 +0000 (+0100)
Subject: configure.ac: Kill $gui_other_objs.
X-Git-Tag: v0.4.10~5^2~3
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e3647569f0dec8a5c54d4e858dc21ef73ada90f9

configure.ac: Kill $gui_other_objs.

Just treat these two objects as ordinary objects which do
not define own error codes.
---

diff --git a/configure.ac b/configure.ac
index 89242d96..98b6ea28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ http_recv dccp_recv recv_common write_common file_write audiod_command
 client_common recv stdout filter stdin audioc write client exec send_common ggo
 udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
 server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
-wma_common wmadec_filter buffer_tree crypt_common
+wma_common wmadec_filter buffer_tree crypt_common gui gui_theme
 "
 
 executables="recv filter audioc write client afh audiod"
@@ -157,9 +157,8 @@ client_errlist_objs="client net string fd sched stdin stdout time
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
-gui_errlist_objs="exec signal string stat ringbuffer fd"
-gui_other_objs="gui gui_theme"
-gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
+gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme"
+gui_objs="$gui_cmdline_objs $gui_errlist_objs"
 
 fade_cmdline_objs="add_cmdline(fade)"
 fade_errlist_objs="fade exec string fd"
diff --git a/error.h b/error.h
index e34d8094..cfd2b1bd 100644
--- a/error.h
+++ b/error.h
@@ -17,6 +17,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
 #define GUI_ERRORS
+#define GUI_THEME_ERRORS
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
 #define RBTREE_ERRORS