Update: Moved headers around so they can be used

Makefile.am

@@ -6,7 +6,16 @@ SUBDIRS = avl httpp log net thread timing
 
 lib_LTLIBRARIES = libigloo.la
 
-pkginclude_HEADERS = include/igloo.h
+pkginclude_HEADERS = \
+    include/igloo/avl.h \
+    include/igloo/encoding.h \
+    include/igloo/httpp.h \
+    include/igloo/igloo.h \
+    include/igloo/log.h \
+    include/igloo/resolver.h \
+    include/igloo/sock.h \
+    include/igloo/thread.h \
+    include/igloo/timing.h
 
 libigloo_la_SOURCES = src/libigloo.c
 libigloo_la_LIBADD = \

avl/Makefile.am

@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO avl.dsp test.c
 
 noinst_LTLIBRARIES = libiceavl.la
-pkginclude_HEADERS = avl.h
 
 libiceavl_la_SOURCES = avl.c
 

avl/avl.c

@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "avl.h"
+#include "../include/igloo/avl.h"
 
 igloo_avl_node *
 igloo_avl_node_new (void *        key,

avl/test.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "avl.h"
+#include "../include/igloo/avl.h"
 
 #ifdef _WIN32
 #define snprintf _snprintf

httpp/Makefile.am

@@ -3,7 +3,6 @@
 AUTOMAKE_OPTIONS = foreign
 
 noinst_LTLIBRARIES = libicehttpp.la
-pkginclude_HEADERS = httpp.h encoding.h
 
 libicehttpp_la_SOURCES = httpp.c encoding.c
 AM_CPPFLAGS = -I$(srcdir)/..

httpp/encoding.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "encoding.h"
+#include "../include/igloo/encoding.h"
 
 struct igloo_httpp_encoding_tag {
     size_t refc;

httpp/httpp.c

@@ -38,8 +38,8 @@
 #include <strings.h>
 #endif
 
-#include <avl/avl.h>
+#include "../include/igloo/avl.h"
-#include "httpp.h"
+#include "../include/igloo/httpp.h"
 
 #define MAX_HEADERS 32
 

httpp/test.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <avl/avl.h>
-#include "httpp.h"
+#include "../include/igloo/httpp.h"
 
 
 int main(int argc, char **argv)

include/igloo/avl.h

@@ -15,7 +15,7 @@ extern "C" {
 #define AVL_KEY_PRINTER_BUFLEN (256)
 
 #ifndef NO_THREAD
-#include "thread/thread.h"
+#include "thread.h"
 #else
 #define thread_rwlock_create(x) do{}while(0)
 #define igloo_thread_rwlock_destroy(x) do{}while(0)

include/igloo/httpp.h

@@ -27,7 +27,7 @@
 #ifndef _LIBIGLOO__HTTPP_H_
 #define _LIBIGLOO__HTTPP_H_
 
-#include <avl/avl.h>
+#include "avl.h"
 
 #define igloo_HTTPP_VAR_PROTOCOL "__protocol"
 #define igloo_HTTPP_VAR_VERSION "__version"

log/Makefile.am

@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = test.c
 
 noinst_LTLIBRARIES = libicelog.la
-pkginclude_HEADERS = log.h
 
 libicelog_la_SOURCES = log.c
 

log/log.c

@@ -51,7 +51,7 @@
 #include <windows.h>
 #endif
 
-#include "log.h"
+#include "../include/igloo/log.h"
 
 #define LOG_MAXLOGS 25
 #define LOG_MAXLINELEN 1024

log/test.c

@@ -1,4 +1,4 @@
-#include "log.h"
+#include "../include/igloo/log.h"
 
 #define CATMODULE "test"
 

net/Makefile.am

@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO test_resolver.c
 
 noinst_LTLIBRARIES = libicenet.la
-pkginclude_HEADERS = resolver.h sock.h
 
 libicenet_la_SOURCES = sock.c resolver.c
 

net/resolver.c

@@ -42,7 +42,7 @@
 #endif
 
 #ifndef NO_THREAD
-#include <thread/thread.h>
+#include "../include/igloo/thread.h"
 #else
 #define thread_mutex_create(x) do{}while(0)
 #define igloo_thread_mutex_destroy(x) do{}while(0)
@@ -50,8 +50,8 @@
 #define thread_mutex_unlock(x) do{}while(0)
 #endif
 
-#include "resolver.h"
+#include "../include/igloo/resolver.h"
-#include "sock.h"
+#include "../include/igloo/sock.h"
 
 /* internal function */
 

net/sock.c

@@ -56,8 +56,8 @@
 #include <winsock2.h>
 #endif
 
-#include "sock.h"
+#include "../include/igloo/sock.h"
-#include "resolver.h"
+#include "../include/igloo/resolver.h"
 
 /* for older C libraries */
 #ifndef AI_NUMERICSERV

net/test_resolver.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "resolver.h"
+#include "../include/igloo/resolver.h"
 
 int main()
 {

thread/Makefile.am

@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO
 
 noinst_LTLIBRARIES = libicethread.la
-pkginclude_HEADERS = thread.h
 
 libicethread_la_SOURCES = thread.c
 

thread/thread.c

@@ -47,10 +47,10 @@
 
 #include <signal.h>
 
-#include <thread/thread.h>
+#include "../include/igloo/thread.h"
-#include <avl/avl.h>
+#include "../include/igloo/avl.h"
 #ifdef THREAD_DEBUG
-#include <log/log.h>
+#include "../include/igloo/log.h"
 #endif
 
 #ifdef _WIN32

timing/Makefile.am

@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO
 
 noinst_LTLIBRARIES = libicetiming.la
-pkginclude_HEADERS = timing.h
 
 libicetiming_la_SOURCES = timing.c
 

timing/timing.c

@@ -59,7 +59,7 @@
 #include <sys/timeb.h>
 #endif
 
-#include "timing.h"
+#include "../include/igloo/timing.h"
 
 /* 
  * Returns milliseconds no matter what.