Commit df443176 authored by Karl Heyes's avatar Karl Heyes

reduce include file namespace clutter for libshout and the associated

smaller libs.

svn path=/trunk/avl/; revision=4456
parent 0d40f034
...@@ -8,7 +8,7 @@ noinst_HEADERS = avl.h ...@@ -8,7 +8,7 @@ noinst_HEADERS = avl.h
libiceavl_la_SOURCES = avl.c libiceavl_la_SOURCES = avl.c
libiceavl_la_CFLAGS = @XIPH_CFLAGS@ libiceavl_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../thread INCLUDES = -I$(srcdir)/..
# SCCS stuff (for BitKeeper) # SCCS stuff (for BitKeeper)
GET = true GET = true
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 1995 by Sam Rushing <rushing@nightmare.com> * Copyright (C) 1995 by Sam Rushing <rushing@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 #ifndef __AVL_H
#define __AVL_H #define __AVL_H
...@@ -12,7 +12,7 @@ extern "C" { ...@@ -12,7 +12,7 @@ extern "C" {
#endif #endif
#ifndef NO_THREAD #ifndef NO_THREAD
#include "thread.h" #include <thread/thread.h>
#else #else
#define thread_rwlock_create(x) do{}while(0) #define thread_rwlock_create(x) do{}while(0)
#define thread_rwlock_destroy(x) do{}while(0) #define thread_rwlock_destroy(x) do{}while(0)
......
...@@ -8,7 +8,7 @@ noinst_HEADERS = httpp.h ...@@ -8,7 +8,7 @@ noinst_HEADERS = httpp.h
libicehttpp_la_SOURCES = httpp.c libicehttpp_la_SOURCES = httpp.c
libicehttpp_la_CFLAGS = @XIPH_CFLAGS@ libicehttpp_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../thread INCLUDES = -I$(srcdir)/..
# SCCS stuff (for BitKeeper) # SCCS stuff (for BitKeeper)
GET = true GET = true
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "avl.h" #include <avl/avl.h>
#include "httpp.h" #include "httpp.h"
#ifdef _WIN32 #ifdef _WIN32
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __HTTPP_H #ifndef __HTTPP_H
#define __HTTPP_H #define __HTTPP_H
#include "avl.h" #include <avl/avl.h>
#define HTTPP_VAR_PROTOCOL "__protocol" #define HTTPP_VAR_PROTOCOL "__protocol"
#define HTTPP_VAR_VERSION "__version" #define HTTPP_VAR_VERSION "__version"
......
...@@ -8,7 +8,7 @@ noinst_HEADERS = resolver.h sock.h ...@@ -8,7 +8,7 @@ noinst_HEADERS = resolver.h sock.h
libicenet_la_SOURCES = sock.c resolver.c libicenet_la_SOURCES = sock.c resolver.c
libicenet_la_CFLAGS = @XIPH_CFLAGS@ libicenet_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../thread INCLUDES = -I$(srcdir)/..
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#endif #endif
#ifndef NO_THREAD #ifndef NO_THREAD
#include "thread.h" #include <thread/thread.h>
#else #else
#define thread_mutex_create(x) do{}while(0) #define thread_mutex_create(x) do{}while(0)
#define thread_mutex_destroy(x) do{}while(0) #define thread_mutex_destroy(x) do{}while(0)
......
...@@ -8,7 +8,7 @@ noinst_HEADERS = thread.h ...@@ -8,7 +8,7 @@ noinst_HEADERS = thread.h
libicethread_la_SOURCES = thread.c libicethread_la_SOURCES = thread.c
libicethread_la_CFLAGS = @XIPH_CFLAGS@ libicethread_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../log INCLUDES = -I$(srcdir)/..
# SCCS stuff (for BitKeeper) # SCCS stuff (for BitKeeper)
GET = true GET = true
......
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
#include <signal.h> #include <signal.h>
#include "thread.h" #include <thread/thread.h>
#include "avl.h" #include <avl/avl.h>
#ifdef THREAD_DEBUG #ifdef THREAD_DEBUG
#include "log.h" #include <log/log.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment