Move hpp files to a separate include directory.

asio/Makefile.am

@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = src
+SUBDIRS = include src
 
 MAINTAINERCLEANFILES = \
 	aclocal.m4 \

asio/configure.in

@@ -1,4 +1,4 @@
-AC_INIT(src/asio.hpp)
+AC_INIT(include/asio.hpp)
 AM_INIT_AUTOMAKE(asio, 0.1.2)
 
 AM_PROG_CC_C_O
@@ -22,7 +22,7 @@ AC_ARG_WITH(boost,
   fi
 ])
 
-AC_CHECK_HEADER([boost/thread.hpp],,
+AC_CHECK_HEADER([boost/noncopyable.hpp],,
 [
   echo "Can't find boost headers. Please check the location of the boost"
   echo "distribution and rerun configure using the --with-boost=DIR option."
@@ -38,4 +38,9 @@ AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN_FOUND = xyes)
 AC_CHECK_PROG(HAVE_DOT,dot,YES,NO)
 AC_SUBST(HAVE_DOT)
 
-AC_OUTPUT([Makefile src/Makefile src/doc/Makefile src/doc/asio.dox])
+AC_OUTPUT([
+  Makefile
+  include/Makefile
+  src/Makefile
+  src/doc/Makefile
+  src/doc/asio.dox])

asio/include/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

asio/include/Makefile.am

@@ -0,0 +1,61 @@
+nobase_include_HEADERS = \
+	asio.hpp \
+	asio/basic_demuxer.hpp \
+	asio/basic_dgram_socket.hpp \
+	asio/basic_socket_acceptor.hpp \
+	asio/basic_socket_connector.hpp \
+	asio/basic_stream_socket.hpp \
+	asio/basic_timer_queue.hpp \
+	asio/buffered_recv_stream.hpp \
+	asio/buffered_send_stream.hpp \
+	asio/buffered_stream.hpp \
+	asio/counting_completion_context.hpp \
+	asio/demuxer.hpp \
+	asio/detail/bind_handler.hpp \
+	asio/detail/event.hpp \
+	asio/detail/mutex.hpp \
+	asio/detail/pipe_select_interrupter.hpp \
+	asio/detail/pop_options.hpp \
+	asio/detail/pthread_event.hpp \
+	asio/detail/pthread_mutex.hpp \
+	asio/detail/pthread_thread.hpp \
+	asio/detail/pthread_tss_bool.hpp \
+	asio/detail/push_options.hpp \
+	asio/detail/reactive_dgram_socket_service.hpp \
+	asio/detail/reactive_socket_acceptor_service.hpp \
+	asio/detail/reactive_socket_connector_service.hpp \
+	asio/detail/reactive_stream_socket_service.hpp \
+	asio/detail/reactor_op_queue.hpp \
+	asio/detail/scoped_lock.hpp \
+	asio/detail/select_interrupter.hpp \
+	asio/detail/select_reactor.hpp \
+	asio/detail/service_registry.hpp \
+	asio/detail/signal_init.hpp \
+	asio/detail/socket_holder.hpp \
+	asio/detail/socket_ops.hpp \
+	asio/detail/socket_select_interrupter.hpp \
+	asio/detail/socket_types.hpp \
+	asio/detail/task_demuxer_service.hpp \
+	asio/detail/thread.hpp \
+	asio/detail/timer_queue_service.hpp \
+	asio/detail/tss_bool.hpp \
+	asio/detail/win_iocp_demuxer_service.hpp \
+	asio/detail/win_iocp_dgram_socket_service.hpp \
+	asio/detail/win_iocp_stream_socket_service.hpp \
+	asio/detail/win_event.hpp \
+	asio/detail/win_mutex.hpp \
+	asio/detail/win_thread.hpp \
+	asio/detail/win_tss_bool.hpp \
+	asio/detail/winsock_init.hpp \
+	asio/dgram_socket.hpp \
+	asio/inet_address_v4.hpp \
+	asio/null_completion_context.hpp \
+	asio/service_factory.hpp \
+	asio/socket_acceptor.hpp \
+	asio/socket_connector.hpp \
+	asio/socket_error.hpp \
+	asio/stream_socket.hpp \
+	asio/timer_queue.hpp
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

asio/src/Makefile.am

@@ -2,65 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = doc
 
-nobase_include_HEADERS = \
-	asio.hpp \
-	asio/basic_demuxer.hpp \
-	asio/basic_dgram_socket.hpp \
-	asio/basic_socket_acceptor.hpp \
-	asio/basic_socket_connector.hpp \
-	asio/basic_stream_socket.hpp \
-	asio/basic_timer_queue.hpp \
-	asio/buffered_recv_stream.hpp \
-	asio/buffered_send_stream.hpp \
-	asio/buffered_stream.hpp \
-	asio/counting_completion_context.hpp \
-	asio/demuxer.hpp \
-	asio/detail/bind_handler.hpp \
-	asio/detail/event.hpp \
-	asio/detail/mutex.hpp \
-	asio/detail/pipe_select_interrupter.hpp \
-	asio/detail/pop_options.hpp \
-	asio/detail/pthread_event.hpp \
-	asio/detail/pthread_mutex.hpp \
-	asio/detail/pthread_thread.hpp \
-	asio/detail/pthread_tss_bool.hpp \
-	asio/detail/push_options.hpp \
-	asio/detail/reactive_dgram_socket_service.hpp \
-	asio/detail/reactive_socket_acceptor_service.hpp \
-	asio/detail/reactive_socket_connector_service.hpp \
-	asio/detail/reactive_stream_socket_service.hpp \
-	asio/detail/reactor_op_queue.hpp \
-	asio/detail/scoped_lock.hpp \
-	asio/detail/select_interrupter.hpp \
-	asio/detail/select_reactor.hpp \
-	asio/detail/service_registry.hpp \
-	asio/detail/signal_init.hpp \
-	asio/detail/socket_holder.hpp \
-	asio/detail/socket_ops.hpp \
-	asio/detail/socket_select_interrupter.hpp \
-	asio/detail/socket_types.hpp \
-	asio/detail/task_demuxer_service.hpp \
-	asio/detail/thread.hpp \
-	asio/detail/timer_queue_service.hpp \
-	asio/detail/tss_bool.hpp \
-	asio/detail/win_iocp_demuxer_service.hpp \
-	asio/detail/win_iocp_dgram_socket_service.hpp \
-	asio/detail/win_iocp_stream_socket_service.hpp \
-	asio/detail/win_event.hpp \
-	asio/detail/win_mutex.hpp \
-	asio/detail/win_thread.hpp \
-	asio/detail/win_tss_bool.hpp \
-	asio/detail/winsock_init.hpp \
-	asio/dgram_socket.hpp \
-	asio/inet_address_v4.hpp \
-	asio/null_completion_context.hpp \
-	asio/service_factory.hpp \
-	asio/socket_acceptor.hpp \
-	asio/socket_connector.hpp \
-	asio/socket_error.hpp \
-	asio/stream_socket.hpp \
-	asio/timer_queue.hpp
-
 noinst_PROGRAMS = \
 	../bin/dispatcher_test \
 	../bin/dgram_echo_client_test \
@@ -74,6 +15,8 @@ noinst_PROGRAMS = \
 	../bin/timer_queue_test \
 	../bin/tpc_echo_server_test
 
+AM_CXXFLAGS = -I../include
+
 ___bin_dispatcher_test_SOURCES = tests/dispatcher_test.cpp
 ___bin_dispatcher_test_LDADD = -lpthread
 

asio/src/Makefile.bor

@@ -2,7 +2,7 @@
 BOOSTDIR = ../../boost_1_30_0
 !endif
 
-CXXFLAGS = -q -O2 -v -vi -y -a8 -b -Ve- -Vx- -tWM -tWR -tWC -w-inl -w-par -I$(BOOSTDIR)
+CXXFLAGS = -q -O2 -v -vi -y -a8 -b -Ve- -Vx- -tWM -tWR -tWC -w-inl -w-par -I../include -I$(BOOSTDIR)
 LDFLAGS = -q -O2 -v -vi -y -a8 -b -Ve- -Vx- -tWM -tWR -tWC -L$(BOOSTDIR)/libs/thread/build/bin-stage
 LIBS = ws2_32.lib boost_thread.lib
 

asio/src/Makefile.msc

@@ -4,7 +4,7 @@
 BOOSTDIR = ../../boost_1_30_0
 !endif
 
-CXXFLAGS = -nologo -O2 -GX -GR -Zi -w -MD -I. -I$(BOOSTDIR)
+CXXFLAGS = -nologo -O2 -GX -GR -Zi -w -MD -I. -I../include -I$(BOOSTDIR)
 LDFLAGS = -nologo -O2 -GX -GR -Zi -MD
 LIBS = $(BOOSTDIR)/libs/thread/build/bin-stage/boost_thread.lib ws2_32.lib
 

asio/src/asio/.cvsignore

@@ -1,2 +0,0 @@
-.deps
-.dirstamp

asio/src/asio/detail/.cvsignore

@@ -1,2 +0,0 @@
-.deps
-.dirstamp

asio/src/doc/asio.dox.in

@@ -357,7 +357,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../asio
+INPUT                  = ../../include ../../include/asio
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp