Move event-config.h to include/event2

This change means that all required include files are in event2, and all files not in event2/* are optional.
hejiajie1989 · Aug 7, 2010 · ec347b9 · ec347b9
1 parent 5fa30d2
commit ec347b9
Show file tree

Hide file tree

Showing 86 changed files with 100 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,8 @@ libevent.pc
 /missing
 /stamp-h1
 
+/include/event2/event-config.h
+
 /sample/dns-example
 /sample/event-test
 /sample/hello-world

diff --git a/Makefile.am b/Makefile.am
@@ -135,10 +135,11 @@ if SIGNAL_SUPPORT
 SYS_SRC += signal.c
 endif
 
-BUILT_SOURCES = event-config.h
+BUILT_SOURCES = ./include/event2/event-config.h
 
-event-config.h: config.h
-	echo '/* event-config.h' > $@
+./include/event2/event-config.h: config.h
+	@MKDIR_P@ ./include/event2
+	echo '/* event2/event-config.h' > $@
 	echo ' *' >> $@
 	echo ' * This file was generated by autoconf when libevent was built, and post-' >> $@
 	echo ' * processed by Libevent so that its macros would have a uniform prefix.' >> $@
@@ -147,8 +148,8 @@ event-config.h: config.h
 	echo ' *' >> $@
 	echo ' * Do not rely on macros in this file existing in later versions.'>> $@
 	echo ' */' >> $@
-	echo '#ifndef _EVENT_CONFIG_H_' >> $@
-	echo '#define _EVENT_CONFIG_H_' >> $@
+	echo '#ifndef _EVENT2_EVENT_CONFIG_H_' >> $@
+	echo '#define _EVENT2_EVENT_CONFIG_H_' >> $@
 
 	sed -e 's/#define /#define _EVENT_/' \
 	    -e 's/#undef /#undef _EVENT_/' \
@@ -201,20 +202,19 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
 	minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \
 	changelist-internal.h iocp-internal.h \
 	ratelim-internal.h \
-	WIN32-Code/event-config.h \
+	WIN32-Code/event2/event-config.h \
 	WIN32-Code/tree.h \
 	compat/sys/queue.h
 
 include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h
 
-nodist_include_HEADERS = event-config.h
-
-INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include $(SYS_INCLUDES)
+INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)
 
 verify: check
 
 doxygen: FORCE
 	doxygen $(srcdir)/Doxyfile
 FORCE:
 
-DISTCLEANFILES = *~ event-config.h libevent.pc
+DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h
+
diff --git a/WIN32-Code/event-config.h → WIN32-Code/event2/event-config.h b/WIN32-Code/event-config.h → WIN32-Code/event2/event-config.h
@@ -1,4 +1,4 @@
-/* event-config.h
+/* event2/event-config.h
  *
  * This file was generated by autoconf when libevent was built, and post-
  * processed by Libevent so that its macros would have a uniform prefix.

diff --git a/buffer.c b/buffer.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -82,7 +82,7 @@
 #include "event2/bufferevent_compat.h"
 #include "event2/bufferevent_struct.h"
 #include "event2/thread.h"
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "log-internal.h"
 #include "mm-internal.h"
 #include "util-internal.h"

diff --git a/buffer_iocp.c b/buffer_iocp.c
@@ -35,7 +35,7 @@
 #include "event2/buffer_compat.h"
 #include "event2/util.h"
 #include "event2/thread.h"
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "util-internal.h"
 #include "evthread-internal.h"
 #include "evbuffer-internal.h"

diff --git a/bufferevent-internal.h b/bufferevent-internal.h
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "evutil.h"
 #include "defer-internal.h"
 #include "evthread-internal.h"

diff --git a/bufferevent.c b/bufferevent.c
@@ -27,7 +27,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/bufferevent_async.c b/bufferevent_async.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/bufferevent_filter.c b/bufferevent_filter.c
@@ -28,7 +28,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/bufferevent_pair.c b/bufferevent_pair.c
@@ -30,7 +30,7 @@
 #include <winsock2.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include "event2/util.h"
 #include "event2/buffer.h"

diff --git a/bufferevent_sock.c b/bufferevent_sock.c
@@ -28,7 +28,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/configure.in b/configure.in
@@ -18,6 +18,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 AC_PROG_GCC_TRADITIONAL
 

diff --git a/defer-internal.h b/defer-internal.h
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <sys/queue.h>
 
 struct deferred_cb;

diff --git a/devpoll.c b/devpoll.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/resource.h>

diff --git a/epoll.c b/epoll.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <stdint.h>
 #include <sys/types.h>

diff --git a/evbuffer-internal.h b/evbuffer-internal.h
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "event2/util.h"
 #include "util-internal.h"
 #include "defer-internal.h"

diff --git a/evdns.c b/evdns.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/types.h>
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifndef _FORTIFY_SOURCE
 #define _FORTIFY_SOURCE 3

diff --git a/event-internal.h b/event-internal.h
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <sys/queue.h>
 #include "event2/event_struct.h"
 #include "minheap-internal.h"

diff --git a/event.c b/event.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>

diff --git a/event.h b/event.h
@@ -162,7 +162,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

diff --git a/event_rpcgen.py b/event_rpcgen.py
@@ -1574,7 +1574,7 @@ def BodyPreamble(self, name, header_file):
         pre += ( '#include <stdlib.h>\n'
                  '#include <string.h>\n'
                  '#include <assert.h>\n'
-                 '#include <event-config.h>\n'
+                 '#include <event2/event-config.h>\n'
                  '#include <event2/event.h>\n'
                  '#include <event2/buffer.h>\n'
                  '#include <event2/tag.h>\n\n'

diff --git a/event_tagging.c b/event_tagging.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/evmap.c b/evmap.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>

diff --git a/evport.c b/evport.c
@@ -50,7 +50,7 @@
  * As in the select(2) implementation, signals are handled by evsignal.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/time.h>
 #include <sys/queue.h>

diff --git a/evrpc.c b/evrpc.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN

diff --git a/evthread-internal.h b/evthread-internal.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 #include <event2/thread.h>
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "util-internal.h"
 
 struct event_base;

diff --git a/evthread.c b/evthread.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifndef _EVENT_DISABLE_THREAD_SUPPORT
 

diff --git a/evthread_pthread.c b/evthread_pthread.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 /* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE. */
 #define _GNU_SOURCE

diff --git a/evthread_win32.c b/evthread_win32.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>

diff --git a/evutil.c b/evutil.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #define _GNU_SOURCE
 

diff --git a/evutil_rand.c b/evutil_rand.c
@@ -32,7 +32,7 @@
  * so that other people can rip it out and use it for whatever.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include "util-internal.h"
 #include "evthread-internal.h"

diff --git a/http.c b/http.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_PARAM_H
 #include <sys/param.h>

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -27,5 +27,5 @@ EVENT2_EXPORT = \
 
 EXTRA_SRC = $(EVENT2_EXPORT)
 
-nobase_include_HEADERS = $(EVENT2_EXPORT)
+nobase_include_HEADERS = $(EVENT2_EXPORT) ./event2/event-config.h
 
diff --git a/include/event2/buffer.h b/include/event2/buffer.h
@@ -65,7 +65,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #include <stdarg.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/include/event2/bufferevent.h b/include/event2/bufferevent.h
@@ -54,7 +54,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

diff --git a/include/event2/bufferevent_ssl.h b/include/event2/bufferevent_ssl.h
@@ -31,7 +31,7 @@
     OpenSSL support for bufferevents.
  */
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #include <event2/bufferevent.h>
 #include <event2/util.h>
 

diff --git a/include/event2/bufferevent_struct.h b/include/event2/bufferevent_struct.h
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

diff --git a/include/event2/dns_compat.h b/include/event2/dns_compat.h
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif