diff options
Diffstat (limited to 'cpp/lib')
| -rw-r--r-- | cpp/lib/broker/Makefile.am | 14 | ||||
| -rw-r--r-- | cpp/lib/client/Makefile.am | 14 | ||||
| -rw-r--r-- | cpp/lib/common/Makefile.am | 16 |
3 files changed, 22 insertions, 22 deletions
diff --git a/cpp/lib/broker/Makefile.am b/cpp/lib/broker/Makefile.am index fdf9953967..58da2e562c 100644 --- a/cpp/lib/broker/Makefile.am +++ b/cpp/lib/broker/Makefile.am @@ -1,10 +1,10 @@ -AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1 -INCLUDES = \ - -I$(shell apr-1-config --includedir) \ - -I$(top_srcdir)/gen \ - -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/common/sys \ - -I$(top_srcdir)/lib/common/framing +AM_CXXFLAGS = $(WARNING_CFLAGS) +INCLUDES = \ + -I$(top_srcdir)/gen \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/common/sys \ + -I$(top_srcdir)/lib/common/framing \ + $(APR_CXXFLAGS) lib_LTLIBRARIES = libbroker.la libbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) diff --git a/cpp/lib/client/Makefile.am b/cpp/lib/client/Makefile.am index fcc571a511..28b96d7844 100644 --- a/cpp/lib/client/Makefile.am +++ b/cpp/lib/client/Makefile.am @@ -1,10 +1,10 @@ -AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1 -INCLUDES = \ - -I$(shell apr-1-config --includedir) \ - -I$(top_srcdir)/gen \ - -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/common/sys \ - -I$(top_srcdir)/lib/common/framing +AM_CXXFLAGS = $(WARNING_CFLAGS) +INCLUDES = \ + -I$(top_srcdir)/gen \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/common/sys \ + -I$(top_srcdir)/lib/common/framing \ + $(APR_CXXFLAGS) lib_LTLIBRARIES = libclient.la libclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am index 829519eac6..ed2ccd61a8 100644 --- a/cpp/lib/common/Makefile.am +++ b/cpp/lib/common/Makefile.am @@ -1,11 +1,10 @@ -AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1 -LIBS = -lapr-1 +AM_CXXFLAGS = $(WARNING_CFLAGS) -INCLUDES = \ - -I$(shell apr-1-config --includedir) \ - -I$(top_srcdir)/gen \ - -I$(top_srcdir)/lib/common/sys \ - -I$(top_srcdir)/lib/common/framing +INCLUDES = \ + -I$(top_srcdir)/gen \ + -I$(top_srcdir)/lib/common/sys \ + -I$(top_srcdir)/lib/common/framing \ + $(APR_CXXFLAGS) apr = sys/apr apr_src = \ @@ -24,7 +23,7 @@ apr_src = \ $(apr)/Thread.cpp posix = sys/posix -posix_src = \ +posix_src = \ $(posix)/PosixAcceptor.cpp \ $(posix)/Socket.cpp \ $(posix)/Thread.cpp \ @@ -43,6 +42,7 @@ gen = $(srcdir)/../../gen lib_LTLIBRARIES = libcommon.la libcommon_la_LIBADD = \ + $(APR_LIBS) \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) |