diff options
| author | frsyuki <frsyuki@users.sourceforge.jp> | 2009-08-19 17:47:22 +0900 |
|---|---|---|
| committer | frsyuki <frsyuki@users.sourceforge.jp> | 2009-08-19 17:47:22 +0900 |
| commit | 3a39accb0b9e4fa6cebc1bafc5086366b5014778 (patch) | |
| tree | dec5688f387a4e95f354e844c09c1d817d7103a4 | |
| parent | 387eca6fbf8c18bf32f35eeb7dab53f2be670c33 (diff) | |
| download | msgpack-python-3a39accb0b9e4fa6cebc1bafc5086366b5014778.tar.gz | |
cpp: preprocess eruby templates on ./bootstrap; released package doesn't require erb
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rwxr-xr-x | bootstrap | 5 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | cpp/Makefile.am | 25 |
5 files changed, 2 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am index 3144972..be3d75f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ if ENABLE_CXX -export ERB SUBDIRS = c cpp else SUBDIRS = c @@ -8,9 +8,7 @@ Binary-based efficient data interchange format. MessagePack is only tested on Linux and Mac OS X, but it may run on other UNIX-like platforms. - Following programs are required to build: - - gcc >= 4.1 with C++ support - - ruby >= 1.8 (ruby is used as a preprocessor) + gcc >= 4.1 is required to build. *Installation @@ -31,11 +31,8 @@ if test x"$1" = x"--help"; then fi -#if [ -z "$NO_NEST" ];then -# cd c && ./bootstrap $@; cd .. -# cd cpp && ./bootstrap $@; cd .. -#fi mkdir -p ac +(cd cpp && ./preprocess.sh $@; cd ..) ACLOCAL="aclocal" diff --git a/configure.in b/configure.in index c241ecf..de71fc9 100644 --- a/configure.in +++ b/configure.in @@ -23,11 +23,6 @@ if test "$enable_cxx" != "no"; then if test "" = "$CXXFLAGS"; then CXXFLAGS="-g -O4" fi - - AC_CHECK_PROG(ERB, erb, erb) - if test "x$ERB" = x; then - AC_MSG_ERROR([cannot find erb. Ruby is needed to build.]) - fi fi # FIXME diff --git a/cpp/Makefile.am b/cpp/Makefile.am index f9d1fec..2c11535 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -27,31 +27,6 @@ nobase_include_HEADERS = \ msgpack/type/tuple.hpp \ msgpack/type/define.hpp -# FIXME -object.lo: msgpack/type/tuple.hpp msgpack/type/define.hpp msgpack/zone.hpp - -msgpack/type/tuple.hpp: msgpack/type/tuple.hpp.erb - $(ERB) $< > $@.tmp - mv $@.tmp $@ - -msgpack/type/define.hpp: msgpack/type/define.hpp.erb - $(ERB) $< > $@.tmp - mv $@.tmp $@ - -msgpack/zone.hpp: msgpack/zone.hpp.erb - $(ERB) $< > $@.tmp - mv $@.tmp $@ - -MOSTLYCLEANFILES = \ - msgpack/type/tuple.hpp \ - msgpack/type/define.hpp \ - msgpack/zone.hpp - -EXTRA_DIST = \ - msgpack/type/tuple.hpp.erb \ - msgpack/type/define.hpp.erb \ - msgpack/zone.hpp.erb - libmsgpack_la_LIBADD = -L../c -lmsgpackc # -version-info CURRENT:REVISION:AGE |