diff options
| author | frsyuki <frsyuki@users.sourceforge.jp> | 2010-07-06 23:30:15 +0900 |
|---|---|---|
| committer | frsyuki <frsyuki@users.sourceforge.jp> | 2010-07-06 23:30:15 +0900 |
| commit | 167e2475d89cb867428b9e7b5aac7f269fd95ecb (patch) | |
| tree | 0a5ecc7811afc2bc9c3f67e990ceaab151f6864b /cpp | |
| parent | fe77251242f34e08f49f41fbbb2561e9278d8635 (diff) | |
| download | msgpack-python-167e2475d89cb867428b9e7b5aac7f269fd95ecb.tar.gz | |
cpp: generate version.h using AC_OUTPUT macro in ./configure
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.in | 5 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 9 | ||||
| -rw-r--r-- | cpp/src/msgpack/version.h.in | 6 |
3 files changed, 7 insertions, 13 deletions
diff --git a/cpp/configure.in b/cpp/configure.in index dd04ed4..ab29501 100644 --- a/cpp/configure.in +++ b/cpp/configure.in @@ -68,5 +68,8 @@ AC_SUBST(VERSION_MAJOR, $major) AC_SUBST(VERSION_MINOR, $minor) -AC_OUTPUT([Makefile src/Makefile test/Makefile]) +AC_OUTPUT([Makefile + src/Makefile + src/msgpack/version.h + test/Makefile]) diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index e12eb24..31096f0 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -82,15 +82,6 @@ EXTRA_DIST = \ msgpack/type/tuple.hpp.erb -msgpack/version.h: msgpack/version.h.in Makefile.in - sed -e s/VERSION_UNDEFINED/$(VERSION)/ \ - -e s/VERSION_MAJOR_UNDEFINED/$(VERSION_MAJOR)/ \ - -e s/VERSION_MINOR_UNDEFINED/$(VERSION_MINOR)/ \ - $< > $@ - -version.c: msgpack/version.h - - doxygen_c: cat ../Doxyfile > Doxyfile_c echo "FILE_PATTERNS = *.h" >> Doxyfile_c diff --git a/cpp/src/msgpack/version.h.in b/cpp/src/msgpack/version.h.in index af292d0..f1feb33 100644 --- a/cpp/src/msgpack/version.h.in +++ b/cpp/src/msgpack/version.h.in @@ -27,9 +27,9 @@ const char* msgpack_version(void); int msgpack_version_major(void); int msgpack_version_minor(void); -#define MSGPACK_VERSION "VERSION_UNDEFINED" -#define MSGPACK_VERSION_MAJOR VERSION_MAJOR_UNDEFINED -#define MSGPACK_VERSION_MINOR VERSION_MINOR_UNDEFINED +#define MSGPACK_VERSION "@VERSION@" +#define MSGPACK_VERSION_MAJOR @VERSION_MAJOR@ +#define MSGPACK_VERSION_MINOR @VERSION_MINOR@ #ifdef __cplusplus |