diff options
| author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2013-01-28 20:33:32 -0700 |
|---|---|---|
| committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2013-01-28 20:33:32 -0700 |
| commit | a248c93d8825a9ae02d50b95c80a41bc87194089 (patch) | |
| tree | 0ad17c30f763d272a659a5bc1b2565d635311aff | |
| parent | 9a9d939832ca8314ca2aefefaaa61a334b12c1cf (diff) | |
| download | yajl-a248c93d8825a9ae02d50b95c80a41bc87194089.tar.gz | |
rework partial inclusion of autotools - cmake build was broken, and typo in Makefile.am
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/yajl_version.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 0568a7f..07fb0f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ EXTRA_DIST = src/YAJL.dxy dist_doc_DATA = TODO README -lib_LTLIBRARIES = libyail.la +lib_LTLIBRARIES = libyajl.la pkginclude_HEADERS = src/yajl/yajl_parse.h \ src/yajl/yajl_gen.h \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71ba1a6..dc32229 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,7 @@ SET (SRCS yajl.c yajl_lex.c yajl_parser.c yajl_buf.c yajl_tree.c yajl_version.c ) SET (HDRS yajl_parser.h yajl_lex.h yajl_buf.h yajl_encode.h yajl_alloc.h) -SET (PUB_HDRS yajl/yajl_parse.h api/yajl_gen.h api/yajl_common.h api/yajl_tree.h) +SET (PUB_HDRS yajl/yajl_parse.h yajl/yajl_gen.h yajl/yajl_common.h yajl/yajl_tree.h) # useful when fixing lexer bugs. #ADD_DEFINITIONS(-DYAJL_LEXER_DEBUG) @@ -60,7 +60,7 @@ FILE(MAKE_DIRECTORY ${incDir}) # generate build-time source SET(dollar $) -CONFIGURE_FILE(yajl/yajl_version.h.cmake ${incDir}/yajl_version.h) +CONFIGURE_FILE(yajl/yajl_version.h.in ${incDir}/yajl_version.h) CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc) # copy public headers to output directory diff --git a/src/yajl_version.c b/src/yajl_version.c index cc7651e..5e0940d 100644 --- a/src/yajl_version.c +++ b/src/yajl_version.c @@ -1,4 +1,4 @@ -#include "yajl_version.h" +#include "yajl/yajl_version.h" int yajl_version(void) { |