[xiph-cvs] cvs commit: ices/src Makefile.am ices.c

[Brendan]

brendan     03/07/03 09:24:37

  Modified:    src      Makefile.am ices.c
  Log:
  Prune garbage from make dist
  Use shout_init/shutdown to kill net dependencies

Revision  Changes    Path
1.23      +1 -1      ices/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -u -r1.22 -r1.23
--- Makefile.am	2 Jul 2003 07:48:45 -0000	1.22
+++ Makefile.am	3 Jul 2003 13:24:37 -0000	1.23
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = log
-EXTRA_DIST = timing net thread avl
+EXTRA_DIST = thread/thread.h timing/timing.h
 
 bin_PROGRAMS = ices
 AM_CPPFLAGS = @XIPH_CPPFLAGS@

<p><p>1.11      +3 -5      ices/src/ices.c

Index: ices.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/ices.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -u -r1.10 -r1.11
--- ices.c	1 Apr 2003 14:30:42 -0000	1.10
+++ ices.c	3 Jul 2003 13:24:37 -0000	1.11
@@ -1,7 +1,7 @@
 /* ices.c
  * - Main startup, thread launching, and cleanup code.
  *
- * $Id: ices.c,v 1.10 2003/04/01 14:30:42 msmith Exp $
+ * $Id: ices.c,v 1.11 2003/07/03 13:24:37 brendan Exp $
  *
  * Copyright (c) 2001-2002 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -19,8 +19,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-
-#include <net/resolver.h>
 #include <thread/thread.h>
 
 #include "cfgparse.h"
@@ -50,8 +48,8 @@ int main(int argc, char **argv)
 
     log_initialize();
     thread_initialize();
-    resolver_initialize();
     config_initialize();
+    shout_init();
 
     signals_setup();
 
@@ -87,8 +85,8 @@ int main(int argc, char **argv)
     log_close(log);
 
  fail:
+    shout_shutdown();
     config_shutdown();
-    resolver_shutdown();
     thread_shutdown();
     log_shutdown();
 

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.