diff options
| author | JINMEI Tatuya <jinmei@isc.org> | 2010-07-20 20:52:01 +0200 |
|---|---|---|
| committer | JINMEI Tatuya <jinmei@isc.org> | 2010-07-20 20:52:01 +0200 |
| commit | 5fd8a22cee1c15cf696ad01e872ec2701494453c (patch) | |
| tree | 041c513cca53c91fc01de077fc0f2e6d8c2be9a2 /src/lib/exceptions | |
| parent | additioal review comment: explained the (x + 7) & ~7 idiom. (diff) | |
| parent | forgot to add a new test data file to EXTRA_DIST (diff) | |
| download | kea-5fd8a22cee1c15cf696ad01e872ec2701494453c.tar.xz kea-5fd8a22cee1c15cf696ad01e872ec2701494453c.zip | |
sync with trunk
git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac256@2547 e5f2f494-b856-4b98-b285-d166d9295462
Diffstat (limited to 'src/lib/exceptions')
| -rw-r--r-- | src/lib/exceptions/Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/exceptions/exceptions.cc | 2 | ||||
| -rw-r--r-- | src/lib/exceptions/exceptions_unittest.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/exceptions/Makefile.am b/src/lib/exceptions/Makefile.am index cc5158dd19..3b5310b2ac 100644 --- a/src/lib/exceptions/Makefile.am +++ b/src/lib/exceptions/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CXXFLAGS=$(B10_CXXFLAGS) lib_LTLIBRARIES = libexceptions.la @@ -10,7 +11,7 @@ if HAVE_GTEST TESTS += run_unittests run_unittests_SOURCES = run_unittests.cc run_unittests_SOURCES += exceptions_unittest.cc -run_unittests_CPPFLAGS = $(GTEST_INCLUDES) +run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(GTEST_LDFLAGS) run_unittests_LDADD = .libs/libexceptions.a $(GTEST_LDADD) endif diff --git a/src/lib/exceptions/exceptions.cc b/src/lib/exceptions/exceptions.cc index 1d5df24a4a..62d747de7d 100644 --- a/src/lib/exceptions/exceptions.cc +++ b/src/lib/exceptions/exceptions.cc @@ -16,7 +16,7 @@ #include <string> -#include "exceptions.h" +#include <exceptions/exceptions.h> using isc::Exception; diff --git a/src/lib/exceptions/exceptions_unittest.cc b/src/lib/exceptions/exceptions_unittest.cc index 96c205a0a5..7d5990cff7 100644 --- a/src/lib/exceptions/exceptions_unittest.cc +++ b/src/lib/exceptions/exceptions_unittest.cc @@ -17,7 +17,7 @@ #include <stdexcept> #include <string> -#include "exceptions.h" +#include <exceptions/exceptions.h> #include <gtest/gtest.h> |