cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 01:36:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pull-628'

Browse Source 
* pull-628:
  Give priority to the build directory headers
  Do not ship evconfig-private.h in dist archive

Closes: #628
(cherry picked from commit a5f19422fdc91cf1e645fc318a174f33f132b9ac)
This commit is contained in:
Azat Khuzhin 2018-04-23 00:52:57 +03:00 committed by Azat Khuzhin
parent 3ffa3ca7f7
commit 7e56c8b2da
No known key found for this signature in database
GPG Key ID: B86086848EF8686D
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -229,7 +229,7 @@ MAYBE_CORE =
endif endif
AM_CFLAGS = $(LIBEVENT_CFLAGS) AM_CFLAGS = $(LIBEVENT_CFLAGS)
AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES) $(LIBEVENT_CPPFLAGS) AM_CPPFLAGS = -I$(srcdir)/compat -I./include -I$(srcdir)/include $(SYS_INCLUDES) $(LIBEVENT_CPPFLAGS)
AM_LDFLAGS = $(LIBEVENT_LDFLAGS) AM_LDFLAGS = $(LIBEVENT_LDFLAGS)
GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) $(AM_LDFLAGS) GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) $(AM_LDFLAGS)
@ -269,7 +269,6 @@ noinst_HEADERS += \
defer-internal.h \ defer-internal.h \
epolltable-internal.h \ epolltable-internal.h \
evbuffer-internal.h \ evbuffer-internal.h \
evconfig-private.h \
event-internal.h \ event-internal.h \
evmap-internal.h \ evmap-internal.h \
evrpc-internal.h \ evrpc-internal.h \