From 2f060c5f23b849ca82571a823d3be71f42899aff Mon Sep 17 00:00:00 2001 From: stenn Date: Sun, 14 May 2017 06:22:11 -0400 Subject: [PATCH] Provide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS} This will allow a parent package to specify compiler, CPP, and linker flags to a libevent built as a sub-package. Picked-from: #506 Closes: #506 (cherry picked from commit 1a448088e3aef5b6baf161eb0f6d17e18a77313c) --- Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0c07d77e..9ec7ca2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -228,7 +228,11 @@ NO_UNDEFINED = MAYBE_CORE = endif -GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) +AM_CFLAGS = $(LIBEVENT_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES) $(LIBEVENT_CPPFLAGS) +AM_LDFLAGS = $(LIBEVENT_LDFLAGS) + +GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) $(AM_LDFLAGS) libevent_la_SOURCES = $(CORE_SRC) $(EXTRAS_SRC) libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) @@ -299,8 +303,6 @@ else noinst_HEADERS += $(EVENT1_HDRS) endif -AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES) - verify: check doxygen: FORCE