[xiph-cvs] cvs commit: thread Makefile.am thread.c
Karl Heyes
karl at xiph.org
Sun Mar 9 14:56:46 PST 2003
karl 03/03/09 17:56:46
Modified: src Makefile.am mp3.c shout.c shout_private.h util.c
vorbis.c
. Makefile.am avl.h
. Makefile.am httpp.c httpp.h
. Makefile.am resolver.c
. Makefile.am thread.c
Log:
reduce include file namespace clutter for libshout and the associated
smaller libs.
Revision Changes Path
1.9 +1 -1 libshout/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 8 Mar 2003 00:46:58 -0000 1.8
+++ Makefile.am 9 Mar 2003 22:56:45 -0000 1.9
@@ -18,7 +18,7 @@
libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
-INCLUDES = -I$(top_srcdir)/include/shout -I$(srcdir)/net -I$(srcdir)/timing -I$(srcdir)/avl -I$(srcdir)/thread -I$(srcdir)/httpp $(VORBIS_CFLAGS) $(OGG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/include $(VORBIS_CFLAGS) $(OGG_CFLAGS)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.4 +1 -1 libshout/src/mp3.c
Index: mp3.c
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/mp3.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mp3.c 7 Jan 2003 03:17:39 -0000 1.3
+++ mp3.c 9 Mar 2003 22:56:45 -0000 1.4
@@ -4,7 +4,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "shout.h"
+#include <shout/shout.h>
#include "shout_private.h"
/*
<p><p>1.32 +5 -5 libshout/src/shout.c
Index: shout.c
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/shout.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- shout.c 8 Mar 2003 16:05:38 -0000 1.31
+++ shout.c 9 Mar 2003 22:56:45 -0000 1.32
@@ -9,13 +9,13 @@
#include <string.h>
#include <errno.h>
-#include "shout.h"
-#include "shout_private.h"
+#include <shout/shout.h>
+#include <net/sock.h>
+#include <timing/timing.h>
+#include <httpp/httpp.h>
-#include "sock.h"
-#include "timing.h"
+#include "shout_private.h"
#include "util.h"
-#include "httpp/httpp.h"
/* -- local prototypes -- */
static int login_xaudiocast(shout_t *self);
<p><p>1.10 +3 -3 libshout/src/shout_private.h
Index: shout_private.h
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/shout_private.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- shout_private.h 22 Feb 2003 21:08:11 -0000 1.9
+++ shout_private.h 9 Mar 2003 22:56:45 -0000 1.10
@@ -3,10 +3,10 @@
#ifndef __LIBSHOUT_SHOUT_PRIVATE_H__
#define __LIBSHOUT_SHOUT_PRIVATE_H__
-#include "shout.h"
+#include <shout/shout.h>
+#include <net/sock.h>
+#include <timing/timing.h>
#include "util.h"
-#include "sock.h"
-#include "timing.h"
#include <sys/types.h>
#ifdef HAVE_STDINT_H
<p><p>1.13 +1 -1 libshout/src/util.c
Index: util.c
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/util.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- util.c 9 Mar 2003 08:25:06 -0000 1.12
+++ util.c 9 Mar 2003 22:56:45 -0000 1.13
@@ -11,7 +11,7 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include "shout.h"
+#include <shout/shout.h>
#include "util.h"
char *util_strdup(const char *s)
<p><p>1.5 +1 -1 libshout/src/vorbis.c
Index: vorbis.c
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/vorbis.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vorbis.c 8 Mar 2003 16:05:38 -0000 1.4
+++ vorbis.c 9 Mar 2003 22:56:46 -0000 1.5
@@ -10,7 +10,7 @@
#include <ogg/ogg.h>
#include <vorbis/codec.h>
-#include "shout.h"
+#include <shout/shout.h>
#include "shout_private.h"
/* -- local datatypes -- */
<p><p>1.3 +1 -1 avl/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/avl/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 8 Mar 2003 00:46:58 -0000 1.2
+++ Makefile.am 9 Mar 2003 22:56:46 -0000 1.3
@@ -8,7 +8,7 @@
libiceavl_la_SOURCES = avl.c
libiceavl_la_CFLAGS = @XIPH_CFLAGS@
-INCLUDES = -I$(srcdir)/../thread
+INCLUDES = -I$(srcdir)/..
# SCCS stuff (for BitKeeper)
GET = true
<p><p>1.5 +2 -2 avl/avl.h
Index: avl.h
===================================================================
RCS file: /usr/local/cvsroot/avl/avl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avl.h 6 Mar 2003 02:35:12 -0000 1.4
+++ avl.h 9 Mar 2003 22:56:46 -0000 1.5
@@ -2,7 +2,7 @@
* Copyright (C) 1995 by Sam Rushing <rushing at nightmare.com>
*/
-/* $Id: avl.h,v 1.4 2003/03/06 02:35:12 brendan Exp $ */
+/* $Id: avl.h,v 1.5 2003/03/09 22:56:46 karl Exp $ */
#ifndef __AVL_H
#define __AVL_H
@@ -12,7 +12,7 @@
#endif
#ifndef NO_THREAD
-#include "thread.h"
+#include <thread/thread.h>
#else
#define thread_rwlock_create(x) do{}while(0)
#define thread_rwlock_destroy(x) do{}while(0)
<p><p>1.3 +1 -1 httpp/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/httpp/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 8 Mar 2003 00:46:58 -0000 1.2
+++ Makefile.am 9 Mar 2003 22:56:46 -0000 1.3
@@ -8,7 +8,7 @@
libicehttpp_la_SOURCES = httpp.c
libicehttpp_la_CFLAGS = @XIPH_CFLAGS@
-INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../thread
+INCLUDES = -I$(srcdir)/..
# SCCS stuff (for BitKeeper)
GET = true
<p><p>1.17 +1 -1 httpp/httpp.c
Index: httpp.c
===================================================================
RCS file: /usr/local/cvsroot/httpp/httpp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- httpp.c 8 Mar 2003 16:05:38 -0000 1.16
+++ httpp.c 9 Mar 2003 22:56:46 -0000 1.17
@@ -13,7 +13,7 @@
#include <string.h>
#include <ctype.h>
-#include "avl.h"
+#include <avl/avl.h>
#include "httpp.h"
#ifdef _WIN32
<p><p>1.8 +1 -1 httpp/httpp.h
Index: httpp.h
===================================================================
RCS file: /usr/local/cvsroot/httpp/httpp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- httpp.h 8 Mar 2003 04:57:02 -0000 1.7
+++ httpp.h 9 Mar 2003 22:56:46 -0000 1.8
@@ -6,7 +6,7 @@
#ifndef __HTTPP_H
#define __HTTPP_H
-#include "avl.h"
+#include <avl/avl.h>
#define HTTPP_VAR_PROTOCOL "__protocol"
#define HTTPP_VAR_VERSION "__version"
<p><p>1.4 +1 -1 net/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/net/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 8 Mar 2003 00:46:58 -0000 1.3
+++ Makefile.am 9 Mar 2003 22:56:46 -0000 1.4
@@ -8,7 +8,7 @@
libicenet_la_SOURCES = sock.c resolver.c
libicenet_la_CFLAGS = @XIPH_CFLAGS@
-INCLUDES = -I$(srcdir)/../thread
+INCLUDES = -I$(srcdir)/..
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.9 +1 -1 net/resolver.c
Index: resolver.c
===================================================================
RCS file: /usr/local/cvsroot/net/resolver.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- resolver.c 8 Mar 2003 16:05:38 -0000 1.8
+++ resolver.c 9 Mar 2003 22:56:46 -0000 1.9
@@ -23,7 +23,7 @@
#endif
#ifndef NO_THREAD
-#include "thread.h"
+#include <thread/thread.h>
#else
#define thread_mutex_create(x) do{}while(0)
#define thread_mutex_destroy(x) do{}while(0)
<p><p>1.3 +1 -1 thread/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/thread/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 8 Mar 2003 00:46:58 -0000 1.2
+++ Makefile.am 9 Mar 2003 22:56:46 -0000 1.3
@@ -8,7 +8,7 @@
libicethread_la_SOURCES = thread.c
libicethread_la_CFLAGS = @XIPH_CFLAGS@
-INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../log
+INCLUDES = -I$(srcdir)/..
# SCCS stuff (for BitKeeper)
GET = true
<p><p>1.22 +3 -3 thread/thread.c
Index: thread.c
===================================================================
RCS file: /usr/local/cvsroot/thread/thread.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- thread.c 8 Mar 2003 16:05:38 -0000 1.21
+++ thread.c 9 Mar 2003 22:56:46 -0000 1.22
@@ -42,10 +42,10 @@
#include <signal.h>
-#include "thread.h"
-#include "avl.h"
+#include <thread/thread.h>
+#include <avl/avl.h>
#ifdef THREAD_DEBUG
-#include "log.h"
+#include <log/log.h>
#endif
#ifdef _WIN32
<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.
More information about the commits
mailing list